From patchwork Tue Jun 20 19:09:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 4060 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1548553vsw; Tue, 20 Jun 2017 12:17:11 -0700 (PDT) X-Received: by 10.223.128.200 with SMTP id 66mr19597428wrl.99.1497986231895; Tue, 20 Jun 2017 12:17:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497986231; cv=none; d=google.com; s=arc-20160816; b=XVADWYywtjw6d4mq3mfjFVorIMRVdPggbAnZx4ZqcpEBEyE1W2JmjIrtFUcR2bjNAD 3yxql1AFG6jOpMqAdIsQKjh3QP6axRHMpNfLV83D2VO1jlLpBBDcSXvrnr5Gx2Iwy5M9 GY891FwdDGjppgZa33ficeyQ01uYeYFx/MlkLxFgWATvpgXy++5UoV1HwpkxK5x+DQZH ValIMeYjPyd8aQKeE5IbyK66kDMQSVVDbsD9lsh1eDkN/5V5CCvA1zWMzPvlZe6Kpao3 +okQLsX+cinUH2JtP4d/brYc/w7yxMzh3XlMsarJqMoB4K0InC9Hg2qnLDGtaM4zhM8f YF5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=0QJ0Q+1XvsxiVz28DfL8D0lIsb7BvfToTNThDWbLH+4=; b=iO5E6ANnjhR1nK/1nELTBNJdguy8iWyvVOUWpALesy1DlUcjcT5umxri1lrh/sgoiy KjCJLxDPwCkwvaDxegGpjZxF7V+PH2b+4O2IS64JKPLMUoclIdTWda9lac+p54a0SGSj v/CH45N78AgnZ2/KGzx9cymYsioH7CfKlNW5yxCv6NCe8+O2eZZVu3D3uwBOvvrHcyuI SVkAqGYgLoLxOQ1HKA3NZN+/JlH404jLcVw7DERzK//0N+6xdUfFXT00nNtL4I4dXlUg rGykp9CsOv3IORGPB/IiDl81KiWLQle+Lk4SmRqjwtI7GXLbfCdYidY96uCsKDMEkvzI mSJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.b=U4+7Snye; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g57si14058422wrg.233.2017.06.20.12.17.11; Tue, 20 Jun 2017 12:17:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.b=U4+7Snye; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAC6568A679; Tue, 20 Jun 2017 22:17:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02DF168A5E1 for ; Tue, 20 Jun 2017 22:16:57 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id u62so16873726lfg.0 for ; Tue, 20 Jun 2017 12:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=W2OFX13Yu/jkp35YVDMgb7ec+e3ApoS8pBYilwu0OOA=; b=U4+7Snye1l6TSa82LsLXMwhESEaraU0CrXeO1LUVl6mlKU0nZHlVqvqXrMJzHpGGEG a1l9LzVs/8VF34R5xuEaLFDR7HbALRmVbavPHLEfgYG5YKbv4aZRjaeEfro0NV3oTZgX jdqpUKED6m7lOQCZodnWnaqlvqXYNRJ9Iuib9qRMurBEJW/qJzPF/lEM+bQyNA3YuM17 XBnAvKrawkDXwVUs3rtiZuJfW8BPU6OPXAGtlBdUs1x3rE1iYL//0piebMl/nzeXOahv DKFXcO3ox/kNA//8cWCG/VH5eQ4HtaPRnmJ5YaOf8ULWH4IACQJMQcwz/uCJW5C+bxe7 EjAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=W2OFX13Yu/jkp35YVDMgb7ec+e3ApoS8pBYilwu0OOA=; b=Bbe+4sW0FUa34hxWnIk7ZWijVBirn8Ew9/sep5E6RquntU5EtVWarfoR4NOwI3w9tN lxFSVkdj+s7sN91pyQ1xi57sj+bufFYfBVTk5HYidZsRq3M43PiYkFBLdCIhzUymRUG7 xxZjp/ipIAkXjziHHtiPObxfcCPfDWrGd5O0Idk98/adbfkJCxPwZR5FQpshj4rL2QG/ MsL9b0L40FH7d8ZuIwsNvQ7JUV5Dg8rYRmtwJ9EzbgX9YMvlG95L/YL4hKIcyA1CWPb7 +IAe/N9Jbxtl7/BBSs7f5YSdAXH+KyJXhtJZ0C9C3Q5+JUVjyUqNCX1tsFnQl8/OtcDJ 2Ngg== X-Gm-Message-State: AKS2vOx3DvlEZixkWAu02xATdqYfzaZM+gDxDcIocm/r4nVUCrR0u6Jo /6SjeS1+bzysAAfag6I= X-Received: by 10.25.193.146 with SMTP id r140mr10147225lff.171.1497985747927; Tue, 20 Jun 2017 12:09:07 -0700 (PDT) Received: from localhost (host-104-34.parnet.fi. [77.234.104.34]) by smtp.gmail.com with ESMTPSA id x7sm4188297lfi.49.2017.06.20.12.09.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Jun 2017 12:09:07 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 22:09:04 +0300 Message-Id: <20170620190905.26038-1-martin@martin.st> X-Mailer: git-send-email 2.11.0 (Apple Git-81) Subject: [FFmpeg-devel] [PATCH 1/2] aarch64: vp9: Fix assembling with Xcode 6.2 and older X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Memphiz Properly use the b.eq/b.ge forms instead of the nonstandard forms (which both gas and newer clang accept though), and expand the register list that used a range (which the Xcode 6.2 clang, based on clang 3.5 svn, didn't support). This is cherrypicked from libav commit a970f9de865c84ed5360dd0398baee7d48d04620. --- libavcodec/aarch64/vp9itxfm_neon.S | 2 +- libavcodec/aarch64/vp9mc_neon.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aarch64/vp9itxfm_neon.S b/libavcodec/aarch64/vp9itxfm_neon.S index b12890f0db..99413b0f70 100644 --- a/libavcodec/aarch64/vp9itxfm_neon.S +++ b/libavcodec/aarch64/vp9itxfm_neon.S @@ -1531,7 +1531,7 @@ function ff_vp9_idct_idct_32x32_add_neon, export=1 2: subs x1, x1, #1 .rept 4 - st1 {v16.8h-v19.8h}, [x0], #64 + st1 {v16.8h,v17.8h,v18.8h,v19.8h}, [x0], #64 .endr b.ne 2b 3: diff --git a/libavcodec/aarch64/vp9mc_neon.S b/libavcodec/aarch64/vp9mc_neon.S index 82a0f53133..f67624ca04 100644 --- a/libavcodec/aarch64/vp9mc_neon.S +++ b/libavcodec/aarch64/vp9mc_neon.S @@ -341,7 +341,7 @@ function \type\()_8tap_\size\()h_\idx1\idx2 subs x9, x9, #16 st1 {v1.16b}, [x0], #16 st1 {v24.16b}, [x6], #16 - beq 3f + b.eq 3f mov v4.16b, v6.16b mov v16.16b, v18.16b ld1 {v6.16b}, [x2], #16 @@ -388,10 +388,10 @@ function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1 add x9, x6, w5, uxtw #4 mov x5, #\size .if \size >= 16 - bge \type\()_8tap_16h_34 + b.ge \type\()_8tap_16h_34 b \type\()_8tap_16h_43 .else - bge \type\()_8tap_\size\()h_34 + b.ge \type\()_8tap_\size\()h_34 b \type\()_8tap_\size\()h_43 .endif endfunc