From patchwork Tue Jul 2 19:22:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 50291 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2655745vqv; Tue, 2 Jul 2024 12:22:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUlfWtwJ24Sc9hbKwiaJg+jUZr3Hv+SsxrJHLS/vq1IfhOiMqYqARwLcqy43vS48V9YBjux2aIgJ/+7VpdUk+H49VP9LcCaUDB7A== X-Google-Smtp-Source: AGHT+IGdzrymjy0OpCTpDUefWZzaifVH5ot0jI7e4gpggm8zQuzml+wCZp9zL5GYOsf4Pu1ZZmw0 X-Received: by 2002:a17:906:264f:b0:a6f:4804:d41a with SMTP id a640c23a62f3a-a7514513850mr556106366b.55.1719948132458; Tue, 02 Jul 2024 12:22:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719948132; cv=none; d=google.com; s=arc-20160816; b=PWgc/g3vMxM1hwPNdftffz3EoN6L4XmQGPCOesXmGzVi4BIljyCO9+t7XR6cC+HFul BSDVdj8+amuc67L6Op8g+y/PLQFmKjrjuIXfEqqbWEbKv5TXZCBqLGzKyGCd0n44TQe9 B8KNb3SgGtCOPJWXYu1+1FjcpoqAZmWTsNODdBdvYxdn0tJmSiQ8SIuCx9RWp1X32Py5 qXnoVr38Rnb4BfG/f+p7c9OCblx+/q3w2m80AlOUSMlEtAGJbsdKA7k1Z/O6GoQUQxh+ JQTNsusF3/bKpwNfu7hOglMe99L9SGLHXFO+utXyrO0ZV5ADsAvDAeJa0H072bCdSzqi xB8Q== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=NEmLdtN3lHki+r3bNS5EDIyAnV5JJAHMPBuGHho9CWA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LqBxex3s/COfPC8leCFT7d36PCABmzfBdy59GnRgVs3oCUjKyGk0WqBVVxPjgMhdp3 3vf1XAOdTkDlEbrjWlhVUIzapuX8DGIE1ygKVtpASt8mWzDCt8RHMnMfgbfAcXnUgH3e gxMYtKj2rcDVptdJDsXpL9pZBrIcfHBLazAV+YFetCOEqslB5D8y0P8gg3J0hxmbLkKn A7mMmm1B9VBGVgwfhjE4Ju4Cxzx7nHnToBQRcfs8BN1kvbJBbY+LStQ+IUAvpwG7yepV 1JUz6MfDmixBkpNLBcNkKzvgOp34zB7m9RFYtTF88fS9IdzCTSR/NUh+ybb+7xUmlMig 7lZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 a640c23a62f3a-a72ab074235si491551966b.533.2024.07.02.12.22.11; Tue, 02 Jul 2024 12:22:12 -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; 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 DFE0068D95B; Tue, 2 Jul 2024 22:22:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13F5B68D95B for ; Tue, 2 Jul 2024 22:22:01 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 8CD4BC013A for ; Tue, 2 Jul 2024 22:22:00 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 22:22:00 +0300 Message-ID: <20240702192200.33791-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702171336.26390-1-remi@remlab.net> References: <20240702171336.26390-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/h264dsp: R-V V 8-bit h264_idct_add 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: Wg/ILLfXaicQ T-Head C908 (cycles): h264_idct4_add_8bpp_c: 271.5 h264_idct4_add_8bpp_rvv_i32: 91.5 --- libavcodec/riscv/h264dsp_init.c | 2 + libavcodec/riscv/h264idct_rvv.S | 83 ++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 6b9ffe1c9f..f78ca3ea05 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -34,6 +34,7 @@ void ff_h264_h_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, void ff_h264_h_loop_filter_luma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); +void ff_h264_idct_add_8_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_add16_8_rvv(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]); @@ -63,6 +64,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_h_loop_filter_luma_mbaff = ff_h264_h_loop_filter_luma_mbaff_8_rvv; + dsp->h264_idct_add = ff_h264_idct_add_8_rvv; # if __riscv_xlen == 64 dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index 7422942717..b36a7f7572 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -26,6 +26,83 @@ #include "libavutil/riscv/asm.S" + .macro sx rd, addr +#if (__riscv_xlen == 32) + sw \rd, \addr +#elif (__riscv_xlen == 64) + sd \rd, \addr +#else + sq \rd, \addr +#endif + .endm + + .variant_cc ff_h264_idct4_rvv +func ff_h264_idct4_rvv, zve32x + vsra.vi v5, v1, 1 + vsra.vi v7, v3, 1 + vadd.vv v8, v0, v2 # z0 + vsub.vv v9, v0, v2 # z1 + vsub.vv v10, v5, v3 # z2 + vadd.vv v11, v1, v7 # z3 + vadd.vv v1, v9, v10 + vsub.vv v2, v9, v10 + vadd.vv v0, v8, v11 + vsub.vv v3, v8, v11 + jr t0 +endfunc + +func ff_h264_idct_add_8_rvv, zve32x + csrwi vxrm, 0 +.Lidct_add4_8_rvv: + vsetivli zero, 4, e16, mf2, ta, ma + addi t1, a1, 1 * 4 * 2 + vle16.v v0, (a1) + addi t2, a1, 2 * 4 * 2 + vle16.v v1, (t1) + addi t3, a1, 3 * 4 * 2 + vle16.v v2, (t2) + vle16.v v3, (t3) + jal t0, ff_h264_idct4_rvv + vse16.v v0, (a1) + vse16.v v1, (t1) + vse16.v v2, (t2) + vse16.v v3, (t3) + vlseg4e16.v v0, (a1) + .rept 256 / __riscv_xlen + sx zero, ((__riscv_xlen / 8) * \+)(a1) + .endr + jal t0, ff_h264_idct4_rvv + add t1, a0, a2 + vle8.v v4, (a0) + add t2, t1, a2 + vle8.v v5, (t1) + add t3, t2, a2 + vle8.v v6, (t2) + vle8.v v7, (t3) + .irp n,0,1,2,3 + vssra.vi v\n, v\n, 6 + .endr + vsetvli zero, zero, e8, mf4, ta, ma + vwaddu.wv v0, v0, v4 + vwaddu.wv v1, v1, v5 + vwaddu.wv v2, v2, v6 + vwaddu.wv v3, v3, v7 + vsetvli zero, zero, e16, mf2, ta, ma + .irp n,0,1,2,3 + vmax.vx v\n, v\n, zero + .endr + vsetvli zero, zero, e8, mf4, ta, ma + vnclipu.wi v4, v0, 0 + vnclipu.wi v5, v1, 0 + vnclipu.wi v6, v2, 0 + vnclipu.wi v7, v3, 0 + vse8.v v4, (a0) + vse8.v v5, (t1) + vse8.v v6, (t2) + vse8.v v7, (t3) + ret +endfunc + const ff_h264_scan8 .byte 014, 015, 024, 025, 016, 017, 026, 027 .byte 034, 035, 044, 045, 036, 037, 046, 047 @@ -34,6 +111,7 @@ endconst #if (__riscv_xlen == 64) .irp depth, 8 func ff_h264_idct_add16_\depth\()_rvv, zve32x + csrwi vxrm, 0 addi sp, sp, -80 lla t0, ff_h264_scan8 sd s0, (sp) @@ -83,7 +161,7 @@ func ff_h264_idct_add16_\depth\()_rvv, zve32x call ff_h264_idct_dc_add_\depth\()_c j 3f 2: - call ff_h264_idct_add_\depth\()_c + call .Lidct_add4_\depth\()_rvv 3: srli s3, s3, 1 addi s5, s5, 4 @@ -104,6 +182,7 @@ func ff_h264_idct_add16_\depth\()_rvv, zve32x endfunc func ff_h264_idct_add16intra_\depth\()_rvv, zve32x + csrwi vxrm, 0 addi sp, sp, -80 lla t0, ff_h264_scan8 sd s0, (sp) @@ -147,7 +226,7 @@ func ff_h264_idct_add16intra_\depth\()_rvv, zve32x mv a2, s7 add a0, s4, t2 beqz t0, 2f # if (nnzc[scan8[i]]) - call ff_h264_idct_add_\depth\()_c + call .Lidct_add4_\depth\()_rvv j 3f 2: beqz t1, 3f # if (block[i * 16])