From patchwork Tue Jun 20 19:09:05 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: 4059 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1547589vsw; Tue, 20 Jun 2017 12:14:31 -0700 (PDT) X-Received: by 10.223.171.25 with SMTP id q25mr10764250wrc.89.1497986071383; Tue, 20 Jun 2017 12:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497986071; cv=none; d=google.com; s=arc-20160816; b=NHidYPluvCOD6UxDaoQLnr+X3RPM9/6v1kR1l9FQBdrBymaTO23VudKfw7Ai5OTQb/ taN4blOlC5VJ5cZ7dcRGZd8ZiTd6vFHYrR0WM5J2zff7047vKO8OInVfqav0gCYG/Hyu +Idt7It0flYr+zo91bb5uwR7OpnwSmXmPO7M6XHaSY5SC2jKxTxea0/2J5djD89SdfNf dYgVTlNnL3iqk8X/M6BO9ZI29IDte2SeC/CXs5N/JGZoHmFanMRb0A+anbSH9MhvrhEW aQg+nuEfIOnmbqSXk/jvvO1lCvKbZe8rCgajWiTm9CTmirZ55qhHjd1Iv4M3AHOc7gdP cQ0A== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=TV0/30aQeDz2mKVNTUDApphmGc2eH3qySNODQa3WsBM=; b=i/rMU3fvBmLbzv/AM2Idnroweg5smR9kebFN1UKKai+SO8xGC47v+K+7Uhj9oJOtdx /civpbPCjrX1w0Rt33uvwNAIeUqzbLKfNkoXJFvmwr0GsGXz7XR2vZi38psULIgrDjrO GcfwW9vXwHuJs0cZChrF0E1vJC4Prlg/IImUFU5lv8VHv0uc73B67AxoQaxAz9YpJRJT A3QcnKbHnosYB5GJsuEo0VVZhvYO9SatKRvOtlZqqjppJ/IizKIcb5Kkxy5po+GdQvS+ CTzaeEo2aSCrTluYPfYyYWT2foLA12gwJJ4YgPCl3KdEQ0zv6vLLoL8RZD2kIgoCWoh5 sw1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.b=XA/CTtik; 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 s11si13601251wmf.177.2017.06.20.12.14.30; Tue, 20 Jun 2017 12:14:31 -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=XA/CTtik; 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 1F93068A5BE; Tue, 20 Jun 2017 22:14:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD9EF68A4AD for ; Tue, 20 Jun 2017 22:14:14 +0300 (EEST) Received: by mail-lf0-f66.google.com with SMTP id x81so16867853lfb.3 for ; Tue, 20 Jun 2017 12:14:20 -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:in-reply-to:references; bh=0I7GPuwRGRB28V90AphVZEbNp3p0iKZzeLaLb/iZrSE=; b=XA/CTtikNuEh/Ih8Ghi+84qsL80kchx90ajY4lj++yxE2c49yMbJa3C8xTM4Jw7TEM Sw/IN2CxhCQZe2KUGCaSowqWViccI+hnPqMmM97GHhj401I+wlcWTq7Hd/eS6PVgZEuS acbXKkDOZ131Y2kVzUbh41BMv9OwWVlqs3kIETldFpwP0Ksbz8AzrZ33aS9mngJw2zCx mA/mikXAl2wz9I1GZ5e40lOPKzCKxB/IlumBmvCuN5pk83o/c9UuGDRv15caPv0v7pPb 4wNWPSZhr2N14L/6rp/uzz+4IZs93wvxu1mjca6j2FFql0QlYi42qLtgtxz64WkY9kem sYMQ== 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:in-reply-to :references; bh=0I7GPuwRGRB28V90AphVZEbNp3p0iKZzeLaLb/iZrSE=; b=MnkUHMvR8pO28KqQekshTaMPNMj7YADrEyVd8LQdC5tEbsYv39pRiZl0uITFSyyD6c FgOMVvceJyFehR2i0inDctb0TlPVwg8v8D+2pG7dlaKJ1H5cEvli+KVejsY2aoXRb2lg ROJ6h8mF9ut8pSToaj7zMq2vXqLY+/4jQW4JcR2AlZxtsEDrnr5i6UUGZ7D9A/wXXdFK qZytqp1oXBc2m0bxNrbKvKlqh59m92VeF9jmRre1OGPoY6tqv1VWBe0oNCd+zRwnoRkq 5GMMNfKrUC1Jl5+51dTj2Vh/yK0I0WqKCHIMpzIr9BauUhyxEy8MW83kDbBMpT4VpQzj T5Ng== X-Gm-Message-State: AKS2vOz2nQz7Op41H0glBz1PxOzUu3Z50/ow462S1jYjwtJYu481Ie1r F57H/sMiRKbnZkHnHO0= X-Received: by 10.46.22.66 with SMTP id 2mr9256882ljw.35.1497985749565; Tue, 20 Jun 2017 12:09:09 -0700 (PDT) Received: from localhost (host-104-34.parnet.fi. [77.234.104.34]) by smtp.gmail.com with ESMTPSA id x74sm4174066lfd.64.2017.06.20.12.09.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Jun 2017 12:09:09 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 22:09:05 +0300 Message-Id: <20170620190905.26038-2-martin@martin.st> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170620190905.26038-1-martin@martin.st> References: <20170620190905.26038-1-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 2/2] aarch64: vp9 16bpp: 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 form instead of the nonstandard form (which both gas and newer clang accept though), and expand the register lists that used a range (which the Xcode 6.2 clang, based on clang 3.5 svn, didn't support). --- libavcodec/aarch64/vp9itxfm_16bpp_neon.S | 8 ++++---- libavcodec/aarch64/vp9mc_16bpp_neon.S | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/aarch64/vp9itxfm_16bpp_neon.S b/libavcodec/aarch64/vp9itxfm_16bpp_neon.S index 0befe383df..68296d9c40 100644 --- a/libavcodec/aarch64/vp9itxfm_16bpp_neon.S +++ b/libavcodec/aarch64/vp9itxfm_16bpp_neon.S @@ -1925,8 +1925,8 @@ function vp9_idct_idct_32x32_add_16_neon 2: subs x1, x1, #1 .rept 4 - st1 {v16.4s-v19.4s}, [x0], #64 - st1 {v16.4s-v19.4s}, [x0], #64 + st1 {v16.4s,v17.4s,v18.4s,v19.4s}, [x0], #64 + st1 {v16.4s,v17.4s,v18.4s,v19.4s}, [x0], #64 .endr b.ne 2b 3: @@ -1991,8 +1991,8 @@ function idct32x32_\size\()_add_16_neon movi v19.4s, #0 .rept 4 - st1 {v16.4s-v19.4s}, [x0], #64 - st1 {v16.4s-v19.4s}, [x0], #64 + st1 {v16.4s,v17.4s,v18.4s,v19.4s}, [x0], #64 + st1 {v16.4s,v17.4s,v18.4s,v19.4s}, [x0], #64 .endr 3: diff --git a/libavcodec/aarch64/vp9mc_16bpp_neon.S b/libavcodec/aarch64/vp9mc_16bpp_neon.S index 98ffd2e8a7..cac6428709 100644 --- a/libavcodec/aarch64/vp9mc_16bpp_neon.S +++ b/libavcodec/aarch64/vp9mc_16bpp_neon.S @@ -275,7 +275,7 @@ function \type\()_8tap_\size\()h subs x9, x9, #32 st1 {v1.8h, v2.8h}, [x0], #32 st1 {v24.8h, v25.8h}, [x6], #32 - beq 3f + b.eq 3f mov v5.16b, v7.16b mov v16.16b, v18.16b ld1 {v6.8h, v7.8h}, [x2], #32