From patchwork Tue Jul 2 17:13:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 50287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2595906vqv; Tue, 2 Jul 2024 10:24:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMVYzESR7tgY04bYmlWgh7TRxLbOhiy0zEsfxgeFlRJy74jUYTSoeg2IqthdkpyJTyKZWxezp2gtnrmPfMOMcZRXCJzJ/ZLt9HHA== X-Google-Smtp-Source: AGHT+IF3/JY8tbbvSD/PnRuX0wu/FpxZuMSx9gAbJr+gT5KL8rBUat4sAHSteEmfdLKUEos06O4k X-Received: by 2002:a05:6402:354c:b0:57c:a77d:a61e with SMTP id 4fb4d7f45d1cf-5879ede2779mr6694030a12.7.1719941046314; Tue, 02 Jul 2024 10:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719941046; cv=none; d=google.com; s=arc-20160816; b=bkjQZgyO5iuGtyIdy5XOm6G3BLdlLwIbo7Qc/+AfnfYp4HqOpoeJ7f7t1fv0JrCuGY ieyOCZjmM1aPOAszIU+TLBhTzkuaiwSzokajGSEZQVUhKhnRqgdi2nb8boZ6n/q8eLdm O818jBBUyqgPzLIxf6/UgfnHfYsDR9Ne0coXjvkR2SdavUTy1GZu1rfbxps+3CaqeAlt fxtEMbXS7xAaN5aOG7BkQuEjKYkXoaw+kIvQ9Fn7aj8q91vsLsDmlaAZ++ujyRzTtsoW dz153Ws8C41x2sjxPh95sQIDyGtvMb73gyiDnWYcr8g/iPXngGY9c+mKjq7eoOO7/cIc tdHw== 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 :delivered-to; bh=sW4QRh+7W2aHK/g1FPie8ckT9hQfgJ9gsz9yWNC+y1c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=TXSJ4S9amrwzbKc0UBXX7op7qVNIF5lCe5AStxBRgoZFoel+UH11JgcvEnD9O4u2ro d2JHsln7VPKRKtMCHZio0DGIliU+ADK14IXO2KUBRXSWwOfAvkoZSh7uFDzHFfKvPh/u BZ/tG7o5ya85YTdEVfsqAJBRwTo44GCk3wELS7LNvIfsCeTnE26yK2iGUk7MzWE5eZum cpzWzVZpwqWJJSb2K9MFiBBMXvyssPAWDbvl+n6VGpSQOitUZwIgLdrgL4DOliVhY3h4 iiVs+Ye3LUVlrxHKn4EEGRH4/8ERwo19cdXNY7Be1hpOqTZlVg8WIPJxnJ5rb/rra1Dt 5bkg==; 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 4fb4d7f45d1cf-58615b3d107si4854976a12.664.2024.07.02.10.24.05; Tue, 02 Jul 2024 10:24:06 -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 1B49968D92F; Tue, 2 Jul 2024 20:13:47 +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 A1FA568D903 for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id D980BC013A for ; Tue, 2 Jul 2024 20:13:36 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 20:13:33 +0300 Message-ID: <20240702171336.26390-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/h264dsp: R-V V 8-bit h264_idct_add16 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: buPVW6a1tMSM While this *tends* to be faster than plain C, the performance numbers are all over the place, presuambly due to the conditional character of the main loop. Some additional micro-optimisations should be feasible after the underlying h264_idct_add and h264_idct_dc_add functions are also implemented. Then it will no longer be necesseray to stricly abide by the C ABI. --- libavcodec/riscv/Makefile | 2 +- libavcodec/riscv/h264dsp_init.c | 6 ++ libavcodec/riscv/h264idct_rvv.S | 106 ++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/h264idct_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index a1510e8c6e..92e1544e76 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -31,7 +31,7 @@ RVV-OBJS-$(CONFIG_H263DSP) += riscv/h263dsp_rvv.o OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_init.o -RVV-OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_rvv.o +RVV-OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_rvv.o riscv/h264idct_rvv.o OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index ab412a9924..5f318e3f2b 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -34,6 +34,10 @@ 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_add16_8_rvv(uint8_t *dst, const int *blockoffset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]); + extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -52,6 +56,8 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_8_rvv; dsp->h264_h_loop_filter_luma_mbaff = ff_h264_h_loop_filter_luma_mbaff_8_rvv; + + dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S new file mode 100644 index 0000000000..74083f8221 --- /dev/null +++ b/libavcodec/riscv/h264idct_rvv.S @@ -0,0 +1,106 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "libavutil/riscv/asm.S" + +const ff_h264_scan8 + .byte 014, 015, 024, 025, 016, 017, 026, 027 + .byte 034, 035, 044, 045, 036, 037, 046, 047 +endconst + +#if (__riscv_xlen == 64) +.irp depth, 8 +func ff_h264_idct_add16_\depth\()_rvv, zve32x + addi sp, sp, -80 + lla t0, ff_h264_scan8 + sd s0, (sp) + li t1, 32 << (\depth > 8) + mv s0, sp + sd ra, 8(sp) + sd s1, 16(sp) + sd s2, 24(sp) + sd s3, 32(sp) + sd s4, 40(sp) + sd s5, 48(sp) + sd s6, 56(sp) + sd s7, 64(sp) + vsetivli zero, 16, e8, m1, ta, ma + vle8.v v8, (t0) + vlse16.v v16, (a2), t1 + vluxei8.v v12, (a4), v8 +.if \depth == 8 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e32, m4, ta, ma +.endif + vmsne.vi v1, v16, 0 + vsetvli zero, zero, e8, m1, ta, ma + vmseq.vi v2, v12, 1 + vmsne.vi v0, v12, 0 + vmand.mm v1, v1, v2 + vsetvli zero, zero, e16, m2, ta, ma + vmv.x.s s2, v0 + vmv.x.s s3, v1 + li s1, 16 + mv s4, a0 + mv s5, a1 + mv s6, a2 + mv s7, a3 +1: + andi t0, s2, 1 + addi s1, s1, -1 + srli s2, s2, 1 + beqz t0, 3f # if (nnz) + lw t2, (s5) # block_offset[i] + andi t1, s3, 1 + mv a1, s6 + mv a2, s7 + add a0, s4, t2 + beqz t1, 2f # if (nnz == 1 && block[i * 16]) + call ff_h264_idct_dc_add_\depth\()_c + j 3f +2: + call ff_h264_idct_add_\depth\()_c +3: + srli s3, s3, 1 + addi s5, s5, 4 + addi s6, s6, 16 * 2 << (\depth > 8) + bnez s1, 1b + + ld s7, 64(sp) + ld s6, 56(sp) + ld s5, 48(sp) + ld s4, 40(sp) + ld s3, 32(sp) + ld s2, 24(sp) + ld s1, 16(sp) + ld ra, 8(sp) + ld s0, 0(sp) + addi sp, sp, 80 + ret +endfunc +.endr +#endif From patchwork Tue Jul 2 17:13:34 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: 50286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2589767vqv; Tue, 2 Jul 2024 10:13:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVU2Tb55bBWQmTYwDi7nAwXW72JeapVQGKbq0J7R2Qo4sRNnzJqBCT9sXYwbj3y6wGKXc+7Xm3Jylr803P6egcwZaZOzMnhkawBOw== X-Google-Smtp-Source: AGHT+IFaAKDJwi3eHymyCOHfQTd917x6A8bOqHG9ZQmnjxgA2CpWHzjma87gfRdPpGPXoSXLefdw X-Received: by 2002:a05:6512:234b:b0:52c:dae5:af2f with SMTP id 2adb3069b0e04-52e825c82e2mr6216599e87.0.1719940428853; Tue, 02 Jul 2024 10:13:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719940428; cv=none; d=google.com; s=arc-20160816; b=GRfdFV8LAfjVD4SynCNfdM1RLDA91uHDRKMs6Ifiu+Qetdgtjcgc1HF1AX2S6Kvamf gG3LBU0k5N2QpNzvWeLpwfPkuDF4SN1UsbKUfFzAhiWz5lpwiME0m0uMdy0XihbMJKQ4 syU4w9B6T1VfTQxfy3/VUw4Gv1vtXGzEdAxw4+2SbwAQUVadZsrBlXE8kjZrrv0002Kp MiXW/kXMogOEqPgCSgSIm6khzSUnpAnWK0lTQWXGFquW0v+cgQgBkYn6DImD46JGvbKJ RN7gp9kkA58eDMXWUzeHYIPSwGGJIx/V3j1mMJe/mSCqnOkNE43EWiuXB+Yk7ZjIJxyI +8DA== 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=2hlTYS3s+i6I0mDONi8FFPuKdJqIvaRePoa+afteHWY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HffBY8uSRia6WyhXSlwNCvS7K90gJUs2wNkqjmXG+5dwQ+eEna726bDqWlxEdH/vUL 1OVu3878h/q7Avw3ItV3Ek26MpJCVrwoEUX+hynzcR1PMmOLqgkItewPUNpmgNerex0k 6FNEpzJzKr1fp1YsmimHQd3AqjhQk6gZ68mhYqOFLxch9wrmXuSc7u5R3TiQWIwhOIq4 F91Ea2yLHbmQN0q7DLFlZs5SgmOiP80PMaW0FE2IAD/SXHy5T09IoVvdufLcI/Sq8L0h 0I9liDjOxvBbB5O908Z/IjeFJvqfaSpE+HmK5zcfTVLb8biFAkEo1HaMtywXIryNuwJ3 sVeQ==; 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 2adb3069b0e04-52e7ab316d6si3106492e87.465.2024.07.02.10.13.48; Tue, 02 Jul 2024 10:13:48 -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 16B4768D926; Tue, 2 Jul 2024 20:13:45 +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 A06A468D699 for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 17FB4C018A for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 20:13:34 +0300 Message-ID: <20240702171336.26390-2-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 2/3] lavc/h264dsp: R-V V 8-bit h264_idct_add16intra 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: a8LGMaqdNnkg --- libavcodec/riscv/h264dsp_init.c | 4 ++ libavcodec/riscv/h264idct_rvv.S | 68 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 5f318e3f2b..7badb86e87 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -37,6 +37,9 @@ void ff_h264_h_loop_filter_luma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t 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]); +void ff_h264_idct_add16intra_8_rvv(uint8_t *dst, const int *blockoffset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -58,6 +61,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, ff_h264_h_loop_filter_luma_mbaff_8_rvv; dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; + dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index 74083f8221..42a29ba336 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -102,5 +102,73 @@ func ff_h264_idct_add16_\depth\()_rvv, zve32x addi sp, sp, 80 ret endfunc + +func ff_h264_idct_add16intra_\depth\()_rvv, zve32x + addi sp, sp, -80 + lla t0, ff_h264_scan8 + sd s0, (sp) + li t1, 32 << (\depth > 8) + mv s0, sp + sd ra, 8(sp) + sd s1, 16(sp) + sd s2, 24(sp) + sd s3, 32(sp) + sd s4, 40(sp) + sd s5, 48(sp) + sd s6, 56(sp) + sd s7, 64(sp) + vsetivli zero, 16, e8, m1, ta, ma + vle8.v v8, (t0) + vlse16.v v16, (a2), t1 + vluxei8.v v12, (a4), v8 +.if \depth == 8 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e32, m4, ta, ma +.endif + vmsne.vi v1, v16, 0 + vsetvli zero, zero, e8, m1, ta, ma + vmsne.vi v0, v12, 0 + vsetvli zero, zero, e16, m2, ta, ma + vmv.x.s s2, v0 + vmv.x.s s3, v1 + li s1, 16 + mv s4, a0 + mv s5, a1 + mv s6, a2 + mv s7, a3 +1: + andi t0, s2, 1 + addi s1, s1, -1 + srli s2, s2, 1 + lw t2, (s5) # block_offset[i] + andi t1, s3, 1 + mv a1, s6 + mv a2, s7 + add a0, s4, t2 + beqz t0, 2f # if (nnzc[scan8[i]]) + call ff_h264_idct_add_\depth\()_c + j 3f +2: + beqz t1, 3f # if (block[i * 16]) + call ff_h264_idct_dc_add_\depth\()_c +3: + srli s3, s3, 1 + addi s5, s5, 4 + addi s6, s6, 16 * 2 << (\depth > 8) + bnez s1, 1b + + ld s7, 64(sp) + ld s6, 56(sp) + ld s5, 48(sp) + ld s4, 40(sp) + ld s3, 32(sp) + ld s2, 24(sp) + ld s1, 16(sp) + ld ra, 8(sp) + ld s0, 0(sp) + addi sp, sp, 80 + ret +endfunc .endr #endif From patchwork Tue Jul 2 17:13:35 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: 50288 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2595911vqv; Tue, 2 Jul 2024 10:24:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWcMGIvpspCSsrfhgmME7583bafNnrZOFYithxkHCjDgGE8mM3WzUYD3AHYTkqLeiPxiTlRa9/bXfBqovMaGp9sFr5osgYeSRbW8w== X-Google-Smtp-Source: AGHT+IF7yUkUzlsz+XXVdR/PNOVhtNa/V0d6NqCAaJxU7oP/juWTe1F9hGBYmtdtGLClLhA3Rbsb X-Received: by 2002:a05:6402:1751:b0:57c:9cd3:4f96 with SMTP id 4fb4d7f45d1cf-587a12cf32fmr4526051a12.40.1719941047263; Tue, 02 Jul 2024 10:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719941047; cv=none; d=google.com; s=arc-20160816; b=mVb7GIG+MhUgQ9G+Q/pQ2tXPvTmiAxlMK3UukNg+0fBPDVIgn4J/jrQxDQOTZ9KQsr g41un06FB2aro+GUGB4U+ER/DBNih7Mt1qeE6X8kY1UoVseeFm4PInu0ywcAUJjNRTGo 70K9jThJ5HH30GyOq3ehunAHsPiUlCynLH6cV9uKG/IsyQq5Cu956MrQx+LXDkrE2OUo kCZvp2maZMvssSNR8KpSUkJliJXYh1d+l/MmwAOn8vy8VB6w1yhvBaC3frpgwVWjqCgQ Xe7v1cKVdwvqsO6zKoZEtaV1jAtMOJbX2pRg65jhfnJLtDPZTniqWy7RbL5biqK/jaOW oPkA== 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=f5zleCBLNm6mxMR78vzIPNz1a9YdfJ9+ZnGmD/eHtWY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=YCNiZo95VCujTHO+pftyP8EktCGew/Ifc8rFrCV9OIDRhWNE7M40LCP33oAIX+AXw+ v2FNBVlJDrHDbyfsmGqg2IVRh8wILuoAZUpnHaTo/Fbjecg9uJnlm5KIPm7Tk0lvD7Hl CjlTyuwLx5votAGIaOIxiWqILWURDmdC++h+8Fk7U3DQRCB8ZM6kCrEOlNYoNe4+hDpB 4uU5DowqFDX4+spXz/JeGmPiLaWR7i6kJ8yLt5xzPEgnjM5Mtm2gquo6cbJgJwUIj2ES qmUe2BlfCFr6u6gAXBfcE0BM/86ScJJRnQUt57lUk3bt82fkRl4A0544zMp0VEDkDS88 8zZA==; 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 4fb4d7f45d1cf-58615038a92si5008436a12.303.2024.07.02.10.24.06; Tue, 02 Jul 2024 10:24:07 -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 D30FF68D937; Tue, 2 Jul 2024 20:13:50 +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 CEFC568D903 for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 3EB2FC018B for ; Tue, 2 Jul 2024 20:13:37 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 20:13:35 +0300 Message-ID: <20240702171336.26390-3-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 3/3] lavc/h264dsp: R-V V 8-bit h264_idct8_add4 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: Z/SyZpvKocoR --- libavcodec/riscv/h264dsp_init.c | 4 ++ libavcodec/riscv/h264idct_rvv.S | 70 +++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 7badb86e87..5cf75f280e 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -40,6 +40,9 @@ void ff_h264_idct_add16_8_rvv(uint8_t *dst, const int *blockoffset, void ff_h264_idct_add16intra_8_rvv(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]); +void ff_h264_idct8_add4_8_rvv(uint8_t *dst, const int *blockoffset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -62,6 +65,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; + dsp->h264_idct8_add4 = ff_h264_idct8_add4_8_rvv; } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index 42a29ba336..7422942717 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -170,5 +170,75 @@ func ff_h264_idct_add16intra_\depth\()_rvv, zve32x addi sp, sp, 80 ret endfunc + +func ff_h264_idct8_add4_\depth\()_rvv, zve32x + addi sp, sp, -80 + lla t0, ff_h264_scan8 + sd s0, (sp) + li t1, 4 * 32 << (\depth > 8) + mv s0, sp + li t2, 4 + sd ra, 8(sp) + sd s1, 16(sp) + sd s2, 24(sp) + sd s3, 32(sp) + sd s4, 40(sp) + sd s5, 48(sp) + sd s6, 56(sp) + sd s7, 64(sp) + vsetivli zero, 4, e8, mf4, ta, ma + vlse8.v v8, (t0), t2 + vlse16.v v16, (a2), t1 + vluxei8.v v12, (a4), v8 +.if \depth == 8 + vsetvli zero, zero, e16, mf2, ta, ma +.else + vsetvli zero, zero, e32, m1, ta, ma +.endif + vmsne.vi v1, v16, 0 + vsetvli zero, zero, e8, mf4, ta, ma + vmseq.vi v2, v12, 1 + vmsne.vi v0, v12, 0 + vmand.mm v1, v1, v2 + vmv.x.s s2, v0 + vmv.x.s s3, v1 + li s1, 4 + mv s4, a0 + mv s5, a1 + mv s6, a2 + mv s7, a3 +1: + andi t0, s2, 1 + addi s1, s1, -1 + srli s2, s2, 1 + beqz t0, 3f # if (nnz) + lw t2, (s5) # block_offset[i] + andi t1, s3, 1 + mv a1, s6 + mv a2, s7 + add a0, s4, t2 + beqz t1, 2f # if (nnz == 1 && block[i * 16]) + call ff_h264_idct8_dc_add_\depth\()_c + j 3f +2: + call ff_h264_idct8_add_\depth\()_c +3: + srli s3, s3, 1 + addi s5, s5, 4 * 4 + addi s6, s6, 4 * 16 * 2 << (\depth > 8) + bnez s1, 1b + + ld s7, 64(sp) + ld s6, 56(sp) + ld s5, 48(sp) + ld s4, 40(sp) + ld s3, 32(sp) + ld s2, 24(sp) + ld s1, 16(sp) + ld ra, 8(sp) + ld s0, 0(sp) + addi sp, sp, 80 + ret +endfunc .endr #endif 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]) From patchwork Wed Jul 3 17:09:57 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: 50306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp3227267vqv; Wed, 3 Jul 2024 10:10:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUtCOPav7kEZ3DDTTu8iHHNN9qYvd9B8lyWDluUYAHRLtT463g2B1OsdiaOanZYZsdLAVKi2wO0P2JINhaa+sLu1evRXL/9DsShPg== X-Google-Smtp-Source: AGHT+IEKG1nWAwrbZ9ifudKllCzy9N6ZPOee0+1evpYNJ0hl5pF8S1xqpB+UQtJfOnmcabKvjyIz X-Received: by 2002:a17:906:dac4:b0:a77:aa6d:e0c7 with SMTP id a640c23a62f3a-a77aa6de154mr71929666b.30.1720026608917; Wed, 03 Jul 2024 10:10:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720026608; cv=none; d=google.com; s=arc-20160816; b=ip1I+S96anMy0iCUtbRPYROYsd6CgYe6RGyn0ZKm8l34Q3ASW0KecssJ5P+PPvA/26 jzhtMB6OJR3NL/JcbO+vgHkNu8qQU43bFYxThvOx8STXP0yBgHeNjkXjI7ZbnnlJFyal kXToT9v4FwnoBYZFKnwIQZ1cv2n0jx/I31Xyc1iMyS+iHJch3GuyLkGfltZ43RXuKj2h C55AA3AWbtiQLPnXBSvxPiOF6CYH++Z15qQCS7dN2sa53S+T+m6wM3f+Pb+mZiTYqczH qxjapXXsAz44/OmANVy7yjakQMvUmY0vFxB5qZslLe9CvIixton01rO+2IkrNK2XmKx4 oyKA== 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=pGQ+9vNUpMF3FQ0GiDQbRYFfVhGLOyLa1S/MPctm+KI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WzFR/vShLxK1+d1bE4+xdD/Vh5IodDOHnmNn5Ja0uh58bii+XmXPBs7oiDg61P+uYB CVB+/45jsiQ0rr3SSCxnDKsqEitfvh1MZuRVFNiO5nxzpG5O/hIgh16g2PjfyOCCv1Pt AhrLYOvlARRtCyrY+0gFff8RWtnw6KIRXWdgQgIcUYBR7ePwacTDHcnbglHqeV6P8XWf kRXJt87fK+pXLao5olzT+yGtclyMcNUQnYpXTnwM/NDaXm1lH2jaywoE1uZIQJWzXSlJ ACiE2wMAH4jnF3e8MhYU8ctsx259ppDwefUUP+ShwzSbnGSl8rAY5a5Z0q8GY11SIDXx mr7w==; 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-a72ab0753c4si568628566b.542.2024.07.03.10.10.08; Wed, 03 Jul 2024 10:10:08 -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 394AB68D991; Wed, 3 Jul 2024 20:10:05 +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 9BAB868D8D3 for ; Wed, 3 Jul 2024 20:09:58 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 02C10C0143 for ; Wed, 3 Jul 2024 20:09:57 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Jul 2024 20:09:57 +0300 Message-ID: <20240703170957.17063-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 5/5] lavc/h264dsp: R-V V 8-bit h264_idct8_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: ZLd35rkYs5wN T-Head C908 (cycles): h264_idct8_add_8bpp_c: 1072.0 h264_idct8_add_8bpp_rvv_i32: 318.5 --- libavcodec/riscv/h264dsp_init.c | 2 + libavcodec/riscv/h264idct_rvv.S | 137 +++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index f78ca3ea05..bf9743eb6b 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -35,6 +35,7 @@ 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_idct8_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]); @@ -65,6 +66,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, ff_h264_h_loop_filter_luma_mbaff_8_rvv; dsp->h264_idct_add = ff_h264_idct_add_8_rvv; + dsp->h264_idct8_add = ff_h264_idct8_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 b36a7f7572..5dd55085bc 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -103,6 +103,140 @@ func ff_h264_idct_add_8_rvv, zve32x ret endfunc + .variant_cc ff_h264_idct8_rvv +func ff_h264_idct8_rvv, zve32x + vsra.vi v9, v7, 1 + vsra.vi v11, v3, 1 + vsra.vi v12, v2, 1 + vsra.vi v13, v5, 1 + vsra.vi v14, v6, 1 + vsra.vi v15, v1, 1 + vadd.vv v9, v3, v9 + vsub.vv v11, v1, v11 + vsub.vv v13, v13, v1 + vadd.vv v15, v3, v15 + vsub.vv v9, v5, v9 + vadd.vv v11, v11, v7 + vadd.vv v13, v13, v7 + vadd.vv v15, v15, v5 + vadd.vv v8, v0, v4 # a0 + vsub.vv v9, v9, v7 # a1 + vsub.vv v10, v0, v4 # a2 + vsub.vv v11, v11, v3 # a3 + vsub.vv v12, v12, v6 # a4 + vadd.vv v13, v13, v5 # a5 + vadd.vv v14, v14, v2 # a6 + vadd.vv v15, v15, v1 # a7 +# 8-15 + vsra.vi v7, v9, 2 + vsra.vi v5, v11, 2 + vsra.vi v3, v13, 2 + vsra.vi v1, v15, 2 +# 1,3,5,7,8-15 free: 0,2,4,6 + vadd.vv v0, v8, v14 # b0 + vadd.vv v6, v10, v12 # b2 + vsub.vv v2, v10, v12 # b4 + vsub.vv v4, v8, v14 # b6 +# 0-7,9,11,13,15 free: 8,10,12,14 + vsub.vv v8, v15, v7 # b7 + vsub.vv v14, v5, v13 # b5 + vadd.vv v12, v1, v9 # b1 + vadd.vv v10, v11, v3 # b3 + vadd.vv v1, v6, v14 + vsub.vv v6, v6, v14 + vsub.vv v7, v0, v8 + vadd.vv v0, v0, v8 + vsub.vv v5, v2, v10 + vadd.vv v2, v2, v10 + vadd.vv v3, v4, v12 + vsub.vv v4, v4, v12 + jr t0 +endfunc + +func ff_h264_idct8_add_8_rvv, zve32x + csrwi vxrm, 0 +.Lidct8_add_8_rvv: + vsetivli zero, 8, e16, m1, ta, ma + addi t1, a1, 1 * 8 * 2 + vle16.v v0, (a1) + addi t2, a1, 2 * 8 * 2 + vle16.v v1, (t1) + addi t3, a1, 3 * 8 * 2 + vle16.v v2, (t2) + addi t4, a1, 4 * 8 * 2 + vle16.v v3, (t3) + addi t5, a1, 5 * 8 * 2 + vle16.v v4, (t4) + addi t6, a1, 6 * 8 * 2 + vle16.v v5, (t5) + addi a7, a1, 7 * 8 * 2 + vle16.v v6, (t6) + vle16.v v7, (a7) + jal t0, ff_h264_idct8_rvv + vse16.v v0, (a1) + vse16.v v1, (t1) + vse16.v v2, (t2) + vse16.v v3, (t3) + vse16.v v4, (t4) + vse16.v v5, (t5) + vse16.v v6, (t6) + vse16.v v7, (a7) + vlseg8e16.v v0, (a1) + .rept 1024 / __riscv_xlen + sx zero, ((__riscv_xlen / 8) * \+)(a1) + .endr + jal t0, ff_h264_idct8_rvv + add t1, a0, a2 + vle8.v v16, (a0) + add t2, t1, a2 + vle8.v v17, (t1) + add t3, t2, a2 + vle8.v v18, (t2) + add t4, t3, a2 + vle8.v v19, (t3) + add t5, t4, a2 + vle8.v v20, (t4) + add t6, t5, a2 + vle8.v v21, (t5) + add a7, t6, a2 + vle8.v v22, (t6) + vle8.v v23, (a7) + .irp n,0,1,2,3,4,5,6,7 + vssra.vi v\n, v\n, 6 + .endr + vsetvli zero, zero, e8, mf2, ta, ma + vwaddu.wv v0, v0, v16 + vwaddu.wv v1, v1, v17 + vwaddu.wv v2, v2, v18 + vwaddu.wv v3, v3, v19 + vwaddu.wv v4, v4, v20 + vwaddu.wv v5, v5, v21 + vwaddu.wv v6, v6, v22 + vwaddu.wv v7, v7, v23 + vsetvli zero, zero, e16, m1, ta, ma + .irp n,0,1,2,3,4,5,6,7 + vmax.vx v\n, v\n, zero + .endr + vsetvli zero, zero, e8, mf2, ta, ma + vnclipu.wi v16, v0, 0 + vnclipu.wi v17, v1, 0 + vnclipu.wi v18, v2, 0 + vnclipu.wi v19, v3, 0 + vnclipu.wi v20, v4, 0 + vnclipu.wi v21, v5, 0 + vnclipu.wi v22, v6, 0 + vnclipu.wi v23, v7, 0 + vse8.v v16, (a0) + vse8.v v17, (t1) + vse8.v v18, (t2) + vse8.v v19, (t3) + vse8.v v20, (t4) + vse8.v v21, (t5) + vse8.v v22, (t6) + vse8.v v23, (a7) + ret +endfunc + const ff_h264_scan8 .byte 014, 015, 024, 025, 016, 017, 026, 027 .byte 034, 035, 044, 045, 036, 037, 046, 047 @@ -251,6 +385,7 @@ func ff_h264_idct_add16intra_\depth\()_rvv, zve32x endfunc func ff_h264_idct8_add4_\depth\()_rvv, zve32x + csrwi vxrm, 0 addi sp, sp, -80 lla t0, ff_h264_scan8 sd s0, (sp) @@ -300,7 +435,7 @@ func ff_h264_idct8_add4_\depth\()_rvv, zve32x call ff_h264_idct8_dc_add_\depth\()_c j 3f 2: - call ff_h264_idct8_add_\depth\()_c + call .Lidct8_add_\depth\()_rvv 3: srli s3, s3, 1 addi s5, s5, 4 * 4