[FFmpeg-devel,1/7] lavc/me_cmp: R-V V pix_abs

Message ID	CAEa-L+vs5ko-u_sR-2PKDz__Nt_2KoXCWKzycQhOWPK8q9ULUQ@mail.gmail.com
State	New
Headers	show Delivered-To: ffmpegpatchwork2@gmail.com 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; MIME-Version: 1.0 From: flow gg <hlefthleft@gmail.com> Date: Tue, 6 Feb 2024 23:55:32 +0800 Message-ID: <CAEa-L+vs5ko-u_sR-2PKDz__Nt_2KoXCWKzycQhOWPK8q9ULUQ@mail.gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: multipart/mixed; boundary="0000000000005784b60610b89c0a" Subject: [FFmpeg-devel] [PATCH 1/7] lavc/me_cmp: R-V V pix_abs Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Series	[FFmpeg-devel,1/7] lavc/me_cmp: R-V V pix_abs \| expand [FFmpeg-devel,1/7] lavc/me_cmp: R-V V pix_abs [FFmpeg-devel,2/7] lavc/me_cmp: R-V V pix_abs_x2 [FFmpeg-devel,3/7] lavc/me_cmp: R-V V pix_abs_y2 [FFmpeg-devel,4/7] lavc/me_cmp: R-V V sse [FFmpeg-devel,5/7] lavc/me_cmp: R-V V vsse vsad [FFmpeg-devel,6/7] lavc/me_cmp: R-V V vsse vsad intra [FFmpeg-devel,7/7] lavc/me_cmp: R-V V nsse

Context	Check	Description
yinshiyou/make_loongarch64	success	Make finished
yinshiyou/make_fate_loongarch64	success	Make fate finished
andriy/make_x86	success	Make finished
andriy/make_fate_x86	success	Make fate finished

From d4d6b3ea040f3f7997463b4452813bc75d1c9f9d Mon Sep 17 00:00:00 2001 From: sunyuechi <sunyuechi@iscas.ac.cn> Date: Sat, 3 Feb 2024 10:58:13 +0800 Subject: [PATCH 1/7] lavc/me_cmp: R-V V pix_abs C908: pix_abs_0_0_c: 534.0 pix_abs_0_0_rvv_i32: 136.2 pix_abs_1_0_c: 287.7 pix_abs_1_0_rvv_i32: 125.2 sad_0_c: 534.0 sad_0_rvv_i32: 136.2 sad_1_c: 287.7 sad_1_rvv_i32: 125.2 --- libavcodec/me_cmp.c | 2 + libavcodec/me_cmp.h | 1 + libavcodec/riscv/Makefile | 2 + libavcodec/riscv/me_cmp_init.c | 46 +++++++++++++++++++++++ libavcodec/riscv/me_cmp_rvv.S | 67 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 libavcodec/riscv/me_cmp_init.c create mode 100644 libavcodec/riscv/me_cmp_rvv.S diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index fecd70d723..8f4b3d0ad5 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -1136,6 +1136,8 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_me_cmp_init_arm(c, avctx); #elif ARCH_PPC ff_me_cmp_init_ppc(c, avctx); +#elif ARCH_RISCV + ff_me_cmp_init_riscv(c, avctx); #elif ARCH_X86 ff_me_cmp_init_x86(c, avctx); #elif ARCH_MIPS diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h index aefd32a7dc..fee0ecb28e 100644 --- a/libavcodec/me_cmp.h +++ b/libavcodec/me_cmp.h @@ -86,6 +86,7 @@ void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_alpha(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_arm(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_ppc(MECmpContext *c, AVCodecContext *avctx); +void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_mips(MECmpContext *c, AVCodecContext *avctx); diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 97067558d8..dff8784102 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -41,6 +41,8 @@ OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_init.o RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o OBJS-$(CONFIG_LPC) += riscv/lpc_init.o RVV-OBJS-$(CONFIG_LPC) += riscv/lpc_rvv.o +OBJS-$(CONFIG_ME_CMP) += riscv/me_cmp_init.o +RVV-OBJS-$(CONFIG_ME_CMP) += riscv/me_cmp_rvv.o OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c new file mode 100644 index 0000000000..9228f74cfd --- /dev/null +++ b/libavcodec/riscv/me_cmp_init.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" +#include "libavcodec/me_cmp.h" +#include "libavcodec/mpegvideo.h" + +int ff_pix_abs16_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_pix_abs8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); + +av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { + c->pix_abs[0][0] = ff_pix_abs16_rvv; + c->sad[0] = ff_pix_abs16_rvv; + c->pix_abs[1][0] = ff_pix_abs8_rvv; + c->sad[1] = ff_pix_abs8_rvv; + } +#endif +} diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S new file mode 100644 index 0000000000..8dadf39bc7 --- /dev/null +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/riscv/asm.S" + +.macro pix_abs_ret + vsetivli zero, 1, e32, m1, ta, ma + vmv.x.s a0, v0 + ret +.endm + +func ff_pix_abs16_rvv, zve32x + vsetivli zero, 1, e32, m1, ta, ma + vmv.s.x v0, zero +1: + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m2, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc + +func ff_pix_abs8_rvv, zve32x + vsetivli zero, 1, e32, m1, ta, ma + vmv.s.x v0, zero +1: + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m1, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc -- 2.43.0

[FFmpeg-devel,1/7] lavc/me_cmp: R-V V pix_abs

Checks

Commit Message

Comments

Patch