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 CBC534CB96 for ; Wed, 14 Aug 2024 17:19:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A745868DB12; Wed, 14 Aug 2024 20:19:03 +0300 (EEST) Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8258568DA36 for ; Wed, 14 Aug 2024 20:18:57 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id DF9B4C0143 for ; Wed, 14 Aug 2024 20:18:56 +0300 (EEST) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Aug 2024 20:18:55 +0300 Message-ID: <20240814171856.6360-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/mpegvideoencdsp: R-V V try_8x8basis 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 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: T-Head C908: try_8x8basis_c: 922.5 try_8x8basis_rvv_i32: 135.3 SpacemiT X60: try_8x8basis_c: 926.1 try_8x8basis_rvv_i32: 103.1 --- libavcodec/riscv/mpegvideoencdsp_init.c | 15 ++++++++--- libavcodec/riscv/mpegvideoencdsp_rvv.S | 35 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libavcodec/riscv/mpegvideoencdsp_init.c b/libavcodec/riscv/mpegvideoencdsp_init.c index eb5c8a5aed..4c156c1cf2 100644 --- a/libavcodec/riscv/mpegvideoencdsp_init.c +++ b/libavcodec/riscv/mpegvideoencdsp_init.c @@ -23,6 +23,8 @@ #include "libavutil/cpu.h" #include "libavcodec/mpegvideoencdsp.h" +int ff_try_8x8basis_rvv(const int16_t rem[64], const int16_t weight[64], + const int16_t basis[16], int scale); int ff_pix_sum_rvv(const uint8_t *pix, int line_size); int ff_pix_norm1_rvv(const uint8_t *pix, int line_size); @@ -32,10 +34,15 @@ av_cold void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, #if HAVE_RVV int flags = av_get_cpu_flags(); - if (flags & AV_CPU_FLAG_RVV_I64) { - if ((flags & AV_CPU_FLAG_RVB) && ff_rv_vlen_least(128)) - c->pix_sum = ff_pix_sum_rvv; - c->pix_norm1 = ff_pix_norm1_rvv; + if (flags & AV_CPU_FLAG_RVV_I32) { + if (flags & AV_CPU_FLAG_RVB) + c->try_8x8basis = ff_try_8x8basis_rvv; + + if (flags & AV_CPU_FLAG_RVV_I64) { + if ((flags & AV_CPU_FLAG_RVB) && ff_rv_vlen_least(128)) + c->pix_sum = ff_pix_sum_rvv; + c->pix_norm1 = ff_pix_norm1_rvv; + } } #endif } diff --git a/libavcodec/riscv/mpegvideoencdsp_rvv.S b/libavcodec/riscv/mpegvideoencdsp_rvv.S index 2f25b00eb2..9408de47c8 100644 --- a/libavcodec/riscv/mpegvideoencdsp_rvv.S +++ b/libavcodec/riscv/mpegvideoencdsp_rvv.S @@ -20,6 +20,41 @@ #include "libavutil/riscv/asm.S" +.equ BASIS_SHIFT, 16 +.equ RECON_SHIFT, 6 + +func ff_try_8x8basis_rvv, zve32x, b + li t1, 64 + csrwi vxrm, 0 + vsetvli t0, t1, e32, m8, ta, ma + vmv.v.x v24, zero + vmv.s.x v1, zero +1: + vsetvli zero, zero, e16, m4, ta, ma + vle16.v v4, (a2) + sub t1, t1, t0 + vwmul.vx v16, v4, a3 + sh1add a2, t0, a2 + vle16.v v8, (a0) + sh1add a0, t0, a0 + vnclip.wi v4, v16, BASIS_SHIFT - RECON_SHIFT + vle16.v v12, (a1) + sh1add a1, t0, a1 + vadd.vv v4, v8, v4 + vsra.vi v4, v4, RECON_SHIFT + vwmul.vv v16, v12, v4 + vsetvli zero, zero, e32, m8, ta, ma + vmul.vv v16, v16, v16 + vsra.vi v16, v16, 4 + vadd.vv v24, v24, v16 + bnez t1, 1b + + vredsum.vs v1, v24, v1 + vmv.x.s a0, v1 + srai a0, a0, 2 + ret +endfunc + func ff_pix_sum_rvv, zve64x, b lpad 0 vsetivli t0, 16, e16, m1, ta, ma -- 2.45.2 _______________________________________________ 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".