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 86C5646A42 for ; Sun, 2 Jul 2023 10:57:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9407368C213; Sun, 2 Jul 2023 13:57:17 +0300 (EEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E76068C191 for ; Sun, 2 Jul 2023 13:57:11 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-31427ddd3fbso1877032f8f.0 for ; Sun, 02 Jul 2023 03:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1688295431; x=1690887431; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=KYBwB5GYFcJPa5t1lVjjevLIYatg1YGO9xT0Omt2jFM=; b=bzikJD/AS+DN4otbs3sAtbwpMfGXwkUsKx+4rDIbb5Mk5PMcd3wFQsQlFCbM7Kunmt 5K184ZS8suEDogEX+GtQJjViTsdFDcP8VAh1wevb3JDoxDrL1242/XOmzYYq53ZSyBXw L81YWaHuffSvquH+i9+amuVmwi7YIrZ8av/Vak6c4N5QVBObOciyoFLoB39hCKHclUqf JE5yfNcA0sKVe5hZMxr6PoJgTuYKUKAm//xiyGLLbE4ERFVrQ3ym2f5/rjni6o5QHP2f lkbciwBj32wJzf4ChDQUzyU9hvIBZrwEvtLGsWvNINPqKtWnBWH8yiacUkXSapDiMw6K vaeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688295431; x=1690887431; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KYBwB5GYFcJPa5t1lVjjevLIYatg1YGO9xT0Omt2jFM=; b=TaU/swYcWaVqztU/9F7kLrhN2aSEU6QDlnFSnD9YSoIzO98ENtBqBv9bLtHVJ8BGOJ XO0rReY9Zt/2eLrM8gwKk5DuihNWyRV+62wDZ9oYSCLWp3E/mchQQaIfTKNqecQ3dRDP qyyCzqHtb1A/qKprcNYYobIq/OgUxdAHoDuvBnDsVPygFehWbiJbugtyEPA6GeHp2T9z L7QLdMjU48mE4FXO/4XRnjq76inzr0Ny83ecsJWCLno7xyYWPWGMjl35NcRdasQCHo9y Jy37BwpW9wBPQ6gNbp+1fUkX98tleL86q/CVhC2hSJc6bWW+LC6H+NJePM4iseKgfRfJ LQ3w== X-Gm-Message-State: ABy/qLaa3mbuZkuiAzWMb+rt5TbGctumZbCIp+hXJw/EGGBjqvIfvpFz ghxWMzCHgf51myozGLyXZ1vpoQ== X-Google-Smtp-Source: APBJJlFa5mQAi110Bu/ZfxAKCQhF+UHiqnoEXqFyHxeWE9RCuG1MNAHRyPdrzvGL66oWjEkA3m1LYw== X-Received: by 2002:adf:e4cd:0:b0:314:367f:15f3 with SMTP id v13-20020adfe4cd000000b00314367f15f3mr580773wrm.9.1688295430305; Sun, 02 Jul 2023 03:57:10 -0700 (PDT) Received: from CTHALPA.outer.uphall.net (cpc1-cmbg20-2-0-cust759.5-4.cable.virginm.net. [86.21.218.248]) by smtp.gmail.com with ESMTPSA id l1-20020adff481000000b003113ed02080sm22698932wro.95.2023.07.02.03.57.09 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 02 Jul 2023 03:57:10 -0700 (PDT) From: John Cox To: =?utf-8?Q?Martin_Storsj=C3=B6?= Date: Sun, 02 Jul 2023 11:57:09 +0100 Message-ID: References: <20230629175729.224383-1-jc@kynesim.co.uk> <20230629175729.224383-12-jc@kynesim.co.uk> In-Reply-To: User-Agent: ForteAgent/8.00.32.1272 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 11/15] avfilter/vf_bwdif: Add neon for filter_line 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, FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 2 Jul 2023 00:44:10 +0300 (EEST), you wrote: >On Thu, 29 Jun 2023, John Cox wrote: > >> Signed-off-by: John Cox >> --- >> libavfilter/aarch64/vf_bwdif_init_aarch64.c | 21 ++ >> libavfilter/aarch64/vf_bwdif_neon.S | 215 ++++++++++++++++++++ >> 2 files changed, 236 insertions(+) >> >> diff --git a/libavfilter/aarch64/vf_bwdif_init_aarch64.c b/libavfilter/aarch64/vf_bwdif_init_aarch64.c >> index e75cf2f204..21e67884ab 100644 >> --- a/libavfilter/aarch64/vf_bwdif_init_aarch64.c >> +++ b/libavfilter/aarch64/vf_bwdif_init_aarch64.c >> @@ -31,6 +31,26 @@ void ff_bwdif_filter_edge_neon(void *dst1, void *prev1, void *cur1, void *next1, >> 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); >> >> +void ff_bwdif_filter_line_neon(void *dst1, void *prev1, void *cur1, void *next1, >> + int w, int prefs, int mrefs, int prefs2, int mrefs2, >> + int prefs3, int mrefs3, int prefs4, int mrefs4, >> + int parity, int clip_max); >> + >> + >> +static void filter_line_helper(void *dst1, void *prev1, void *cur1, void *next1, >> + int w, int prefs, int mrefs, int prefs2, int mrefs2, >> + int prefs3, int mrefs3, int prefs4, int mrefs4, >> + int parity, int clip_max) >> +{ >> + const int w0 = clip_max != 255 ? 0 : w & ~15; >> + >> + ff_bwdif_filter_line_neon(dst1, prev1, cur1, next1, >> + w0, prefs, mrefs, prefs2, mrefs2, prefs3, mrefs3, prefs4, mrefs4, parity, clip_max); >> + >> + if (w0 < w) >> + ff_bwdif_filter_line_c((char *)dst1 + w0, (char *)prev1 + w0, (char *)cur1 + w0, (char *)next1 + w0, >> + w - w0, prefs, mrefs, prefs2, mrefs2, prefs3, mrefs3, prefs4, mrefs4, parity, clip_max); >> +} >> >> static void filter_edge_helper(void *dst1, void *prev1, void *cur1, void *next1, >> int w, int prefs, int mrefs, int prefs2, int mrefs2, >> @@ -71,6 +91,7 @@ ff_bwdif_init_aarch64(BWDIFContext *s, int bit_depth) >> return; >> >> s->filter_intra = filter_intra_helper; >> + s->filter_line = filter_line_helper; >> s->filter_edge = filter_edge_helper; >> } >> >> diff --git a/libavfilter/aarch64/vf_bwdif_neon.S b/libavfilter/aarch64/vf_bwdif_neon.S >> index a33b235882..675e97d966 100644 >> --- a/libavfilter/aarch64/vf_bwdif_neon.S >> +++ b/libavfilter/aarch64/vf_bwdif_neon.S >> @@ -128,6 +128,221 @@ 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 filter_line( >> +// void *dst1, // x0 >> +// void *prev1, // x1 >> +// void *cur1, // x2 >> +// void *next1, // x3 >> +// int w, // w4 >> +// int prefs, // w5 >> +// int mrefs, // w6 >> +// int prefs2, // w7 >> +// int mrefs2, // [sp, #0] >> +// int prefs3, // [sp, #8] >> +// int mrefs3, // [sp, #16] >> +// int prefs4, // [sp, #24] >> +// int mrefs4, // [sp, #32] >> +// int parity, // [sp, #40] >> +// int clip_max) // [sp, #48] >> + >> +function ff_bwdif_filter_line_neon, export=1 >> + // Sanity check w >> + cmp w4, #0 >> + ble 99f >> + >> + // Rearrange regs to be the same as line3 for ease of debug! >> + mov w10, w4 // w10 = loop count >> + mov w9, w6 // w9 = mref >> + mov w12, w7 // w12 = pref2 >> + mov w11, w5 // w11 = pref >> + ldr w8, [sp, #0] // w8 = mref2 >> + ldr w7, [sp, #16] // w7 = mref3 >> + ldr w6, [sp, #32] // w6 = mref4 >> + ldr w13, [sp, #8] // w13 = pref3 >> + ldr w14, [sp, #24] // w14 = pref4 > >Btw, remember that you can load two arguments from the stack at once with >ldp, e.g. "ldp x8, x13, [sp, #0]". If they're made intptr_t/ptrdiff_t, you >won't have an issue with garbage in the upper 32 bits either. Fair point - I was indeed worrying about garbage in the upper half (and this is not performance or size critical code). >> + >> + mov x4, x3 >> + mov x3, x2 >> + mov x2, x1 >> + >> +// #define prev2 cur >> +// const uint8_t * restrict next2 = parity ? prev : next; >> + ldr w17, [sp, #40] // parity >> + cmp w17, #0 >> + csel x17, x2, x4, ne >> + >> + // We want all the V registers - save all the ones we must >> + stp d14, d15, [sp, #-64]! >> + stp d8, d9, [sp, #48] >> + stp d10, d11, [sp, #32] >> + stp d12, d13, [sp, #16] > >The order looks a bit weird here even if they end up sequential on the >stack. If you'd fill it from the bottom up, e.g. > >stp d8, d9, [sp, #-64]! >stp d10, d11, [sp, #16] >stp d12, d13, [sp, #32] >stp d14, d15, [sp, #48] > >they're sequential both in code and on the stack. Sure I can tweak that. JC >// 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".