From patchwork Wed Sep 28 07:31:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 38395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp31276pzh; Wed, 28 Sep 2022 00:31:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7RrtNdmc8ICSc2GKHX3/8TpkLOTPuMzRmkcz6PY+1eZDnGshoz0MLpRP9Ya630nG0OrUaE X-Received: by 2002:a17:907:b09:b0:76f:99cc:81cd with SMTP id h9-20020a1709070b0900b0076f99cc81cdmr24921361ejl.530.1664350316660; Wed, 28 Sep 2022 00:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664350316; cv=none; d=google.com; s=arc-20160816; b=tYsMnaNSGurhR1Sco8kYCZtrIutblUWhHrRs9DzHapxO0MtMjcpfJcI0wYvgNl0XEl ueG5LO/sHdhyszkxKqIDCgORCvoDSw8uCPSUm6X8qjThoYv2IQTL+BRfhWJz4Ii3hPRQ M4SIl59f5qpjr68gNBx9rBpGtjPyP9x/C2MdbR1hbZaH5tWrh2ykeZKYU/UAFOkk64j8 n+nB0VZp5r36vSutxeLChQ9QtFORiDVPj+rTIN9l4Co/QN+bVyO1iCMkHFIyiTdxyfLs ReI1By6qqal13QC+Bxd0IeEOpzudx9lRWuq3tDFIGnq8dDngUGNw2bbQ3Wa5KO96bgWi a75Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=UjUQe7fTKYfUnu8SG+5Qjxrf+zf0vZ3IqtPSBS89moI=; b=Lx4XPsWWhGctxRePmiqisu9TWMIi8TDChq2B92+hGyKYBmFqFtJwI40giUaqmdr/tG rn0sBz5b4/xKNvW+DQ+IaKZPoFi9oBakt+PGvPkIE6MastVo1eh1oU0XxnGRA+U6K7An tQ/5HlkWkE90SiCtWLrSQ6x3BCOSLr9Hycxtr73TquZOvXSQJyXfXeWuZInvjuAh6RCv GqxpHys5KNeogAwxMKUCe7qKJWDivWCxPcmOQj9Q29/T2JKhLEkUGyngxL22MCS+pTaG gh5t6UnI63bUQk5NcZUpZrvKrBnvycZbgZNb+NslUfwJY1j8w1x/cY+k8Pa7Wm1zYPWF foLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=x04zqtNv; 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 du20-20020a17090772d400b00782fd14c6e3si3634745ejc.87.2022.09.28.00.31.56; Wed, 28 Sep 2022 00:31:56 -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.20210112.gappssmtp.com header.s=20210112 header.b=x04zqtNv; 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 20C4668BAFC; Wed, 28 Sep 2022 10:31:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FD8E68B263 for ; Wed, 28 Sep 2022 10:31:47 +0300 (EEST) Received: by mail-lj1-f171.google.com with SMTP id l12so13376695ljg.9 for ; Wed, 28 Sep 2022 00:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=1jNr+l4pqvg/KTEYCPEvTC+Steg9ZtM3fhvCVad802Q=; b=x04zqtNv9YNKxFRwcTPGVq2Fbt3q6aVkrctv4y4nO0J5VejdlyF7YghkxTjQHtvFRX TzUc7WIxXlMZqrslMc0JFDQCUSygmGq/IU34HZMt/bFd6z200idzcuYkx2dy6XFa8TC8 LPeBa+UkYdP4ugde7KzDMbKhzzXbHtc3ufmz5mreaoq5wlOrEHsQboDSihCjSmHvHUWx psLFBGi89DAn8nmqbM6Lfc4upWGv8SNhPfoWP5c1dFHDEgZYUjUs7k4H00AFvIafWVpT bmXP8v6xZWvDqyB1eYl6vtxMdP60hOLiJ/NHeM9aj/ZD43+eqQP8aVR6jMP3PCTDi7CL /9qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=1jNr+l4pqvg/KTEYCPEvTC+Steg9ZtM3fhvCVad802Q=; b=BUPMKXfSno8xwuf5U3buUBNogf9srxxm7eW3+g4DYGlRR3m+QTHDIcBz2lGM/+UOJh MnlbOnsPL5tC21bw2oUT9YpOrmvyejRrBoTwswt20Ja+DOIONHE6rincqXE2pSKoHbHf T8ku6RK/mfrRTaLF4vYPMTIcDf8HFl6pW804+Csaoiz0M2gsAE9GG77GqTMJQUt7gGG9 WE1Af4VmaVtnJ7p/dK5JyAkodPJ2Ii7wxSI2UfvvCVsRVjbOc9ns7PDHOpTcS0s/XBfR kdrSzeryMK8fPKvrNjn7pJZjDpL/rpMkFwhpmpwICysp4p/JJjOqeJTYrP1DvdTLmyM4 uW8A== X-Gm-Message-State: ACrzQf2CckOeAWK+HKs2tjEzx3wwXTQwfdp5I6TY45hqiVh2su0RKW9n jI5a8vvAlA0g/xO6M1kt7HWJ7YjQvLx9j9iB X-Received: by 2002:a05:651c:199f:b0:26c:4a66:aa4e with SMTP id bx31-20020a05651c199f00b0026c4a66aa4emr11936628ljb.321.1664350306277; Wed, 28 Sep 2022 00:31:46 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id c21-20020a196555000000b0048a757d1303sm395798lfj.217.2022.09.28.00.31.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 28 Sep 2022 00:31:45 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 10:31:45 +0300 Message-Id: <20220928073145.40268-1-martin@martin.st> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] arm: vc1dsp: Canonicalize the syntax for aligned NEON loads/stores X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: h+8GSOGJymFJ This hopefully should fix building with older toolchains, hopefully fixing the fate failures on http://fate.ffmpeg.org/history.cgi?slot=armel5tej-qemu-debian-gcc4.4. Signed-off-by: Martin Storsjö --- libavcodec/arm/vc1dsp_neon.S | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavcodec/arm/vc1dsp_neon.S b/libavcodec/arm/vc1dsp_neon.S index 96014fbebc..cdfb4a3f6c 100644 --- a/libavcodec/arm/vc1dsp_neon.S +++ b/libavcodec/arm/vc1dsp_neon.S @@ -1310,17 +1310,17 @@ endfunc function ff_vc1_v_loop_filter8_neon, export=1 sub r3, r0, r1, lsl #2 vldr d0, .Lcoeffs - vld1.32 {d1}, [r0 :64], r1 @ P5 - vld1.32 {d2}, [r3 :64], r1 @ P1 - vld1.32 {d3}, [r3 :64], r1 @ P2 - vld1.32 {d4}, [r0 :64], r1 @ P6 - vld1.32 {d5}, [r3 :64], r1 @ P3 - vld1.32 {d6}, [r0 :64], r1 @ P7 + vld1.32 {d1}, [r0, :64], r1 @ P5 + vld1.32 {d2}, [r3, :64], r1 @ P1 + vld1.32 {d3}, [r3, :64], r1 @ P2 + vld1.32 {d4}, [r0, :64], r1 @ P6 + vld1.32 {d5}, [r3, :64], r1 @ P3 + vld1.32 {d6}, [r0, :64], r1 @ P7 vshll.u8 q8, d1, #1 @ 2*P5 vshll.u8 q9, d2, #1 @ 2*P1 - vld1.32 {d7}, [r3 :64] @ P4 + vld1.32 {d7}, [r3, :64] @ P4 vmovl.u8 q1, d3 @ P2 - vld1.32 {d20}, [r0 :64] @ P8 + vld1.32 {d20}, [r0, :64] @ P8 vmovl.u8 q11, d4 @ P6 vdup.16 q12, r2 @ pq vmovl.u8 q13, d5 @ P3 @@ -1375,8 +1375,8 @@ function ff_vc1_v_loop_filter8_neon, export=1 vmla.i16 q1, q0, q2 @ invert d depending on clip_sign & a0_sign, or zero it if they match, and accumulate into P5 vqmovun.s16 d0, q3 vqmovun.s16 d1, q1 - vst1.32 {d0}, [r3 :64], r1 - vst1.32 {d1}, [r3 :64] + vst1.32 {d0}, [r3, :64], r1 + vst1.32 {d1}, [r3, :64] 1: bx lr endfunc @@ -1491,17 +1491,17 @@ function ff_vc1_v_loop_filter16_neon, export=1 vpush {d8-d15} sub r3, r0, r1, lsl #2 vldr d0, .Lcoeffs - vld1.64 {q1}, [r0 :128], r1 @ P5 - vld1.64 {q2}, [r3 :128], r1 @ P1 - vld1.64 {q3}, [r3 :128], r1 @ P2 - vld1.64 {q4}, [r0 :128], r1 @ P6 - vld1.64 {q5}, [r3 :128], r1 @ P3 - vld1.64 {q6}, [r0 :128], r1 @ P7 + vld1.64 {q1}, [r0, :128], r1 @ P5 + vld1.64 {q2}, [r3, :128], r1 @ P1 + vld1.64 {q3}, [r3, :128], r1 @ P2 + vld1.64 {q4}, [r0, :128], r1 @ P6 + vld1.64 {q5}, [r3, :128], r1 @ P3 + vld1.64 {q6}, [r0, :128], r1 @ P7 vshll.u8 q7, d2, #1 @ 2*P5[0..7] vshll.u8 q8, d4, #1 @ 2*P1[0..7] - vld1.64 {q9}, [r3 :128] @ P4 + vld1.64 {q9}, [r3, :128] @ P4 vmovl.u8 q10, d6 @ P2[0..7] - vld1.64 {q11}, [r0 :128] @ P8 + vld1.64 {q11}, [r0, :128] @ P8 vmovl.u8 q12, d8 @ P6[0..7] vdup.16 q13, r2 @ pq vshll.u8 q2, d5, #1 @ 2*P1[8..15] @@ -1611,8 +1611,8 @@ function ff_vc1_v_loop_filter16_neon, export=1 vqmovun.s16 d0, q6 vqmovun.s16 d5, q9 vqmovun.s16 d1, q1 - vst1.64 {q2}, [r3 :128], r1 - vst1.64 {q0}, [r3 :128] + vst1.64 {q2}, [r3, :128], r1 + vst1.64 {q0}, [r3, :128] 1: vpop {d8-d15} bx lr endfunc