From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 28D0B46A0A for ; Sat, 1 Jul 2023 21:37:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E53768C194; Sun, 2 Jul 2023 00:37:42 +0300 (EEST) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1FB568B838 for ; Sun, 2 Jul 2023 00:37:35 +0300 (EEST) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 361LbZif012106-361LbZig012106; Sun, 2 Jul 2023 00:37:35 +0300 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id 253C1A146B; Sun, 2 Jul 2023 00:37:35 +0300 (EEST) Date: Sun, 2 Jul 2023 00:37:35 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20230629175729.224383-5-jc@kynesim.co.uk> Message-ID: References: <20230629175729.224383-1-jc@kynesim.co.uk> <20230629175729.224383-5-jc@kynesim.co.uk> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH 04/15] avfilter/vf_bwdif: Add neon for filter_intra 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 Cc: thomas.mundt@hr.de, John Cox Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 29 Jun 2023, John Cox wrote: > Signed-off-by: John Cox > --- > libavfilter/aarch64/vf_bwdif_init_aarch64.c | 17 +++++++ > libavfilter/aarch64/vf_bwdif_neon.S | 53 +++++++++++++++++++++ > 2 files changed, 70 insertions(+) > > diff --git a/libavfilter/aarch64/vf_bwdif_init_aarch64.c b/libavfilter/aarch64/vf_bwdif_init_aarch64.c > index 86d53b2ca1..3ffaa07ab3 100644 > --- a/libavfilter/aarch64/vf_bwdif_init_aarch64.c > +++ b/libavfilter/aarch64/vf_bwdif_init_aarch64.c > @@ -24,6 +24,22 @@ > #include "libavfilter/bwdif.h" > #include "libavutil/aarch64/cpu.h" > > +void ff_bwdif_filter_intra_neon(void *dst1, void *cur1, int w, int prefs, int mrefs, > + int prefs3, int mrefs3, int parity, int clip_max); > + > + > +static void filter_intra_helper(void *dst1, void *cur1, int w, int prefs, int mrefs, > + int prefs3, int mrefs3, int parity, int clip_max) > +{ > + const int w0 = clip_max != 255 ? 0 : w & ~15; > + > + ff_bwdif_filter_intra_neon(dst1, cur1, w0, prefs, mrefs, prefs3, mrefs3, parity, clip_max); > + > + if (w0 < w) > + ff_bwdif_filter_intra_c((char *)dst1 + w0, (char *)cur1 + w0, > + w - w0, prefs, mrefs, prefs3, mrefs3, parity, clip_max); > +} > + > void > ff_bwdif_init_aarch64(BWDIFContext *s, int bit_depth) > { > @@ -35,5 +51,6 @@ ff_bwdif_init_aarch64(BWDIFContext *s, int bit_depth) > if (!have_neon(cpu_flags)) > return; > > + s->filter_intra = filter_intra_helper; > } > > diff --git a/libavfilter/aarch64/vf_bwdif_neon.S b/libavfilter/aarch64/vf_bwdif_neon.S > index a8f0ed525a..b863b3447d 100644 > --- a/libavfilter/aarch64/vf_bwdif_neon.S > +++ b/libavfilter/aarch64/vf_bwdif_neon.S > @@ -69,3 +69,56 @@ coeffs: > .hword 5570, 3801, 1016, -3801 // hf[0] = v0.h[2], -hf[1] = v0.h[5] > .hword 5077, 981 // sp[0] = v0.h[6] > > +// ============================================================================ > +// > +// void ff_bwdif_filter_intra_neon( > +// void *dst1, // x0 > +// void *cur1, // x1 > +// int w, // w2 > +// int prefs, // w3 > +// int mrefs, // w4 > +// int prefs3, // w5 > +// int mrefs3, // w6 > +// int parity, // w7 unused > +// int clip_max) // [sp, #0] unused This bit is great to have > + > +function ff_bwdif_filter_intra_neon, export=1 > + cmp w2, #0 > + ble 99f > + > + ldr q0, coeffs > + > +// for (x = 0; x < w; x++) { > +10: > + > +// interpol = (coef_sp[0] * (cur[mrefs] + cur[prefs]) - coef_sp[1] * (cur[mrefs3] + cur[prefs3])) >> 13; I guess the style with intermixed C code is a bit uncommon in our assembly, but as long as it doesn't affect the overall code style I guess we can keep it. > + ldr q31, [x1, w4, SXTW] > + ldr q30, [x1, w3, SXTW] > + ldr q29, [x1, w6, SXTW] > + ldr q28, [x1, w5, SXTW] Don't use shouty uppercase SXTW here > + > + uaddl v20.8h, v31.8b, v30.8b > + uaddl2 v21.8h, v31.16b, v30.16b > + > + UMULL4K v2, v3, v4, v5, v20, v21, v0.h[6] > + > + uaddl v20.8h, v29.8b, v28.8b > + uaddl2 v21.8h, v29.16b, v28.16b > + > + UMLSL4K v2, v3, v4, v5, v20, v21, v0.h[7] > + > +// dst[0] = av_clip(interpol, 0, clip_max); > + SQSHRUNN v2, v2, v3, v4, v5, 13 > + str q2, [x0], #16 > + > +// dst++; > +// cur++; > +// } > + > + subs w2, w2, #16 > + add x1, x1, #16 For in-order cores, it might be good to update these variables sometime sooner, e.g. before the str instruction. But such scheduling breaks your mapping between neat C code and assembly. // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".