From patchwork Sat Jul 13 13:01:52 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: 50518 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp1356465vqb; Sat, 13 Jul 2024 06:02:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuQIRvbROPNDObCb5cubFpxS4g9eK0XGOEAYiXrunROTNKT6fmCzZqfjQSJQR+0f8IBVcTGjq8TwyR6h9yzDPOiE6r7hfzIsFOuQ== X-Google-Smtp-Source: AGHT+IH4aKK71bF2NQIbHbuvySzZ8M5oSxn2AEU6U6YFkdYdcHrXWDoKPg4ooRxHGnluCVsW5VDk X-Received: by 2002:aa7:c648:0:b0:57c:749f:f5ef with SMTP id 4fb4d7f45d1cf-594bc7ca23fmr8970730a12.34.1720875737104; Sat, 13 Jul 2024 06:02:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720875737; cv=none; d=google.com; s=arc-20160816; b=tcMmSkgey0m+jwStbgsqoWx1rBwkuxh5NXxrkRNnSM/NTxroq6zQaZZkJhNx58l+02 c6ZkX24R0vWZBz4Q7L/kdvcd49Xxscmuo0SvdKrvodq9uaYFBDdR0buT1wH/wBLxVlZQ +6YmVyOo/Y9cntgdRY+68+d1E+Bi+UMZZ6IzAxPH8KWp0PAJtc6NQTgxUk6Oi9DJV9Xc 8fIUqZHjE77kGT1cRTYRk2qoxQRIbU4m4ezucaghEtw6i5+dNOxpghyY4xtLN9juGFZ0 vzcQoZML6xq5s7Gb4xco0MdenL788WtUZS9ga55bD87GdwJuMDcDHPeZzwqglwxSZoYo pDgw== 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=s62qzXqZSW/LjP8SzrEr264qk1H/uPPaJfZy0uqmBpc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=axj9eWkRguCJFsdkGVXvWQqOumRSH3gdVNs5rgBv570ctX9WKW8UzP7oDD4px0ehfM V9G1YZL0ciafebaazBAHVgv6htn4Y13fKe6IoF6LpmsLXM2zQ7xHwfOOzhiTgY73N+7f dmmmY/Zhm1GutwgWXPBj6yLJKLPNWUuEtSyVP2i7CdGzzukYOOXjLzOUExWxkMs7jxZu 6d5l+rHgCS9DjvYDmURi1bRZCphczbPzZtXOugGnij8tTtlopMonv0baPehIl6oouO8i SGCwnMottBwcZTrOvrK1AlY2q66GR1yvNvQ3zY5RBt2CVzfEVX8Hsu2SB35o8JVRdz6H 19vw==; 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-59b276288d6si581833a12.505.2024.07.13.06.02.16; Sat, 13 Jul 2024 06:02:17 -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 1234868DAB8; Sat, 13 Jul 2024 16:02:03 +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 97F8F68D9E0 for ; Sat, 13 Jul 2024 16:01:55 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id B3018C013E for ; Sat, 13 Jul 2024 16:01:54 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2024 16:01:52 +0300 Message-ID: <20240713130154.77672-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/h264dsp: R-V V add_pixels4 and 8-bit add_pixels8 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: NwAFYjcIQlBT --- libavcodec/riscv/Makefile | 3 +- libavcodec/riscv/h264addpx_rvv.S | 89 ++++++++++++++++++++++++++++++++ libavcodec/riscv/h264dsp_init.c | 11 ++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/h264addpx_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 92e1544e76..0bbdd38116 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -31,7 +31,8 @@ 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 riscv/h264idct_rvv.o +RVV-OBJS-$(CONFIG_H264DSP) += riscv/h264addpx_rvv.o 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/h264addpx_rvv.S b/libavcodec/riscv/h264addpx_rvv.S new file mode 100644 index 0000000000..fd36bd4896 --- /dev/null +++ b/libavcodec/riscv/h264addpx_rvv.S @@ -0,0 +1,89 @@ +/* + * 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" + + .macro sx rd, addr +#if (__riscv_xlen == 32) + sw \rd, \addr +#elif (__riscv_xlen == 64) + sd \rd, \addr +#else + sq \rd, \addr +#endif + .endm + +func ff_h264_add_pixels4_8_rvv, zve32x + vsetivli zero, 4, e8, mf4, ta, ma + vlse32.v v8, (a0), a2 + vsetivli zero, 4 * 4, e8, m1, ta, ma + vle16.v v16, (a1) + .equ offset, 0 + .rept 256 / __riscv_xlen + sx zero, offset(a1) + .equ offset, offset + (__riscv_xlen / 8) + .endr + vncvt.x.x.w v24, v16 + vadd.vv v8, v8, v24 + vsetivli zero, 4, e8, mf4, ta, ma + vsse32.v v8, (a0), a2 + ret +endfunc + +func ff_h264_add_pixels4_16_rvv, zve64x + vsetivli zero, 4, e16, mf2, ta, ma + vlse64.v v8, (a0), a2 + vsetivli zero, 4 * 4, e16, m2, ta, ma + vle32.v v16, (a1) + .equ offset, 0 + .rept 512 / __riscv_xlen + sx zero, offset(a1) + .equ offset, offset + (__riscv_xlen / 8) + .endr + vncvt.x.x.w v24, v16 + vadd.vv v8, v8, v24 + vsetivli zero, 4, e16, mf2, ta, ma + vsse64.v v8, (a0), a2 + ret +endfunc + +func ff_h264_add_pixels8_8_rvv, zve64x + li t0, 8 * 8 + vsetivli zero, 8, e8, mf2, ta, ma + vlse64.v v8, (a0), a2 + vsetvli zero, t0, e8, m4, ta, ma + vle16.v v16, (a1) + .equ offset, 0 + .rept 1024 / __riscv_xlen + sx zero, offset(a1) + .equ offset, offset + (__riscv_xlen / 8) + .endr + vncvt.x.x.w v24, v16 + vadd.vv v8, v8, v24 + vsetivli zero, 8, e8, mf2, ta, ma + vsse64.v v8, (a0), a2 + ret +endfunc diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 825f34443b..a6d06b3ac4 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -61,6 +61,10 @@ void ff_h264_idct8_add_12_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_add_14_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_add_14_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_add_pixels8_8_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_add_pixels4_8_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_add_pixels4_16_rvv(uint8_t *dst, int16_t *block, int stride); + extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -96,6 +100,9 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, # if __riscv_xlen == 64 dsp->h264_idct8_add4 = ff_h264_idct8_add4_8_rvv; # endif + if (flags & AV_CPU_FLAG_RVV_I64) + dsp->h264_add_pixels8_clear = ff_h264_add_pixels8_8_rvv; + dsp->h264_add_pixels4_clear = ff_h264_add_pixels4_8_rvv; } if (bit_depth == 9) { @@ -118,6 +125,10 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_idct_add = ff_h264_idct_add_14_rvv; dsp->h264_idct8_add = ff_h264_idct8_add_14_rvv; } + if (bit_depth > 8 && zvl128b) { + if (flags & AV_CPU_FLAG_RVV_I64) + dsp->h264_add_pixels4_clear = ff_h264_add_pixels4_16_rvv; + } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; } From patchwork Sat Jul 13 13:01:53 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: 50517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp1356369vqb; Sat, 13 Jul 2024 06:02:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3015NqQ5fEx54S7BOG8/3i3dIDZC7gPbrsGb/5/siL7A74igd6UR8zOOMk0Upv10d083hzzC4hb9Wspa/5SDFTvyZ11kG2cQhNw== X-Google-Smtp-Source: AGHT+IFQVohQAymu9aDksuaPk64NGVsOCn11p5wu6P7szL1bDVT2jEk+m6IArOnC4qA7k3OFRlFY X-Received: by 2002:a05:6512:118e:b0:52c:d753:2829 with SMTP id 2adb3069b0e04-52eb99915eemr10467893e87.19.1720875727727; Sat, 13 Jul 2024 06:02:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720875727; cv=none; d=google.com; s=arc-20160816; b=Z9DH03ZTVheSqs8ys3fDmr+pR9p+2AwcQiExMRyCKh5tz/lSxvjpZ9JHHiEjS+LUtT rtsO3D1nchn0wJxHmHvO/o1T+kDTy9m3MZRzeYW38LDs/dw6vy0UrIH7mhMH/RU0XFx/ +FLWWeI+LuZQBJTaY7VE21lcX19YUQNizgELhwdKi5OmZz8QMMYQNDal5fVSNYUWgD8d QDO4isQ3cZ4T0qs3Bd0e76S+mn6w2IkOePVOSOAMawfsaTXBuuSdqPrIsHr7iWkkNvS/ J7xXfwi/+SwnQ3ZaXJekF6uVqMf19evPXLJ5BD8JKNcWVFKi2ZSmrG0K0EELZiPscXRv 1w1Q== 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=kgScDRghSvVSetO2bSeGYecMOXxSBac8xfNu4KyDJWE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=e1qslvDWXM3zLQWd5VUVFMBMErjH7eEha94bViclSRiYLv2+7meS5VrcXhpwS6joud +E8ptNlTf19bIZFG2dMvwkFQRFmLfJfWQrt15zX/wQn5NjASgY/in03SKvXWgaQBf84t 5/tylLy0141FUruCbVnX8umu0SGdo35RV6/AQYYTqZN/8If6Y5sTZP7IM8OkauUuBAvw ctgeWRLarATPZMGNeTO59wr8ufT8QHNzulqUjFE4ySA5lcsGG6v4klqEgbsLZZPkwuW5 ts3aMD2EGJnyd6d2mWynERklCaJSgoxeP2kPmUTWySOY9cEZvEka5I+TnVuTcCKf2WYG r+Ow==; 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-52ed256869esi341946e87.431.2024.07.13.06.02.06; Sat, 13 Jul 2024 06:02: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 F032468DA86; Sat, 13 Jul 2024 16:02:01 +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 9391D68D866 for ; Sat, 13 Jul 2024 16:01:55 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id E5E0DC01A1 for ; Sat, 13 Jul 2024 16:01:54 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2024 16:01:53 +0300 Message-ID: <20240713130154.77672-2-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240713130154.77672-1-remi@remlab.net> References: <20240713130154.77672-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/h264dsp: R-V V high-depth add_pixels8 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: ggfihUErINeJ --- libavcodec/riscv/h264addpx_rvv.S | 22 ++++++++++++++++++++++ libavcodec/riscv/h264dsp_init.c | 2 ++ 2 files changed, 24 insertions(+) diff --git a/libavcodec/riscv/h264addpx_rvv.S b/libavcodec/riscv/h264addpx_rvv.S index fd36bd4896..3d307b2cb8 100644 --- a/libavcodec/riscv/h264addpx_rvv.S +++ b/libavcodec/riscv/h264addpx_rvv.S @@ -87,3 +87,25 @@ func ff_h264_add_pixels8_8_rvv, zve64x vsse64.v v8, (a0), a2 ret endfunc + +func ff_h264_add_pixels8_16_rvv, zve32x + li t0, 8 + vsetivli zero, 8, e16, m1, ta, ma +1: + vle32.v v16, (a1) + addi t0, t0, -1 + vle16.v v8, (a0) + addi a1, a1, 8 * 4 + vncvt.x.x.w v24, v16 + .equ offset, 0 + .rept 256 / __riscv_xlen + sx zero, offset(a1) + .equ offset, offset + (__riscv_xlen / 8) + .endr + vadd.vv v8, v8, v24 + vse16.v v8, (a0) + add a0, a0, a2 + bnez t0, 1b + + ret +endfunc diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index a6d06b3ac4..ea89314952 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -63,6 +63,7 @@ void ff_h264_idct8_add_14_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_add_pixels8_8_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_add_pixels4_8_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_add_pixels8_16_rvv(uint8_t *dst, int16_t *block, int stride); void ff_h264_add_pixels4_16_rvv(uint8_t *dst, int16_t *block, int stride); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); @@ -126,6 +127,7 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_idct8_add = ff_h264_idct8_add_14_rvv; } if (bit_depth > 8 && zvl128b) { + dsp->h264_add_pixels8_clear = ff_h264_add_pixels8_16_rvv; if (flags & AV_CPU_FLAG_RVV_I64) dsp->h264_add_pixels4_clear = ff_h264_add_pixels4_16_rvv; }