yeah, updated it in the reply Rémi Denis-Courmont <r...@remlab.net> 于2024年5月17日周五 23:11写道:
> Le maanantaina 13. toukokuuta 2024, 19.59.22 EEST u...@foxmail.com a > écrit : > > From: sunyuechi <sunyue...@iscas.ac.cn> > > > > C908: > > vp9_avg4_8bpp_c: 1.2 > > vp9_avg4_8bpp_rvv_i64: 1.0 > > vp9_avg8_8bpp_c: 3.7 > > vp9_avg8_8bpp_rvv_i64: 1.5 > > vp9_avg16_8bpp_c: 14.7 > > vp9_avg16_8bpp_rvv_i64: 3.5 > > vp9_avg32_8bpp_c: 57.7 > > vp9_avg32_8bpp_rvv_i64: 10.0 > > vp9_avg64_8bpp_c: 229.0 > > vp9_avg64_8bpp_rvv_i64: 31.7 > > --- > > libavcodec/riscv/Makefile | 3 +- > > libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++ > > libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++ > > 3 files changed, 78 insertions(+), 1 deletion(-) > > create mode 100644 libavcodec/riscv/vp9_mc_rvv.S > > > > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > > index 0cd900104f..1183357b37 100644 > > --- a/libavcodec/riscv/Makefile > > +++ b/libavcodec/riscv/Makefile > > @@ -64,6 +64,7 @@ RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o > > OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o > > RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \ > > riscv/vp9_mc_rvi.o > > -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o > > +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \ > > + riscv/vp9_mc_rvv.o > > OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o > > RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o > > diff --git a/libavcodec/riscv/vp9_mc_rvv.S > b/libavcodec/riscv/vp9_mc_rvv.S > > new file mode 100644 > > index 0000000000..5d917e7b98 > > --- /dev/null > > +++ b/libavcodec/riscv/vp9_mc_rvv.S > > @@ -0,0 +1,58 @@ > > +/* > > + * 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 vsetvlstatic8 len an maxlen mn=m4 > > +.if \len == 4 > > + vsetivli zero, \len, e8, mf4, ta, ma > > +.elseif \len == 8 > > + vsetivli zero, \len, e8, mf2, ta, ma > > +.elseif \len == 16 > > + vsetivli zero, \len, e8, m1, ta, ma > > +.elseif \len == 32 > > + li \an, \len > > + vsetvli zero, \an, e8, m2, ta, ma > > +.elseif \len == 64 > > + li \an, \maxlen > > + vsetvli zero, \an, e8, \mn, ta, ma > > +.endif > > +.endm > > + > > +.macro copy_avg len > > +func ff_avg\len\()_rvv, zve32x > > + csrwi vxrm, 0 > > + vsetvlstatic8 \len t0 64 > > +1: > > + addi a4, a4, -1 > > + vle8.v v8, (a2) > > + vle8.v v16, (a0) > > + vaaddu.vv v8, v8, v16 > > + vse8.v v8, (a0) > > + add a2, a2, a3 > > + add a0, a0, a1 > > + bnez a4, 1b > > + ret > > Doesn't this get slightly faster by interleaving scalar and vector > instructions? > > > +endfunc > > +.endm > > + > > +.irp len 64, 32, 16, 8, 4 > > + copy_avg \len > > +.endr > > diff --git a/libavcodec/riscv/vp9dsp_init.c > b/libavcodec/riscv/vp9dsp_init.c > > index 184fadbaf7..1922484a1d 100644 > > --- a/libavcodec/riscv/vp9dsp_init.c > > +++ b/libavcodec/riscv/vp9dsp_init.c > > @@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext > > *dsp, int bpp) } > > # endif > > > > +#if HAVE_RVV > > + if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && > ff_rv_vlen_least(128)) > > { + > > +#define init_fpel(idx1, sz) \ > > + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \ > > + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \ > > + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \ > > + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv > > + > > + init_fpel(0, 64); > > + init_fpel(1, 32); > > + init_fpel(2, 16); > > + init_fpel(3, 8); > > + init_fpel(4, 4); > > + > > +#undef init_fpel > > + } > > +#endif > > #endif > > } > > > -- > 雷米‧德尼-库尔蒙 > http://www.remlab.net/ > > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".