Message ID | tencent_C61355190BC4A18062CEB94DAC9430161E07@qq.com |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,v2,1/9] lavc/vp9dsp: R-V ipred vert | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Fixed issues similar to vp8 <uk7b@foxmail.com> 于2024年5月7日周二 15:36写道: > From: sunyuechi <sunyuechi@iscas.ac.cn> > > C908: > vp9_vert_8x8_8bpp_c: 22.0 > vp9_vert_8x8_8bpp_rvi: 15.7 > vp9_vert_16x16_8bpp_c: 71.2 > vp9_vert_16x16_8bpp_rvi: 39.0 > vp9_vert_32x32_8bpp_c: 300.2 > vp9_vert_32x32_8bpp_rvi: 135.2 > --- > libavcodec/riscv/Makefile | 1 + > libavcodec/riscv/vp9_intra_rvi.S | 61 ++++++++++++++++++++++++++++++++ > libavcodec/riscv/vp9dsp.h | 6 ++++ > libavcodec/riscv/vp9dsp_init.c | 15 ++++++-- > 4 files changed, 80 insertions(+), 3 deletions(-) > create mode 100644 libavcodec/riscv/vp9_intra_rvi.S > > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > index 050c08ee61..65dd0d656a 100644 > --- a/libavcodec/riscv/Makefile > +++ b/libavcodec/riscv/Makefile > @@ -63,6 +63,7 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o > OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o > 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 > RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_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_intra_rvi.S > b/libavcodec/riscv/vp9_intra_rvi.S > new file mode 100644 > index 0000000000..617f9f55a2 > --- /dev/null > +++ b/libavcodec/riscv/vp9_intra_rvi.S > @@ -0,0 +1,61 @@ > +/* > + * 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" > + > +#if __riscv_xlen >= 64 > +func ff_v_32x32_rvi > + ld t0, (a3) > + ld t1, 8(a3) > + ld t2, 16(a3) > + ld t3, 24(a3) > + .rept 32 > + sd t0, (a0) > + sd t1, 8(a0) > + sd t2, 16(a0) > + sd t3, 24(a0) > + add a0, a0, a1 > + .endr > + > + ret > +endfunc > + > +func ff_v_16x16_rvi > + ld t0, (a3) > + ld t1, 8(a3) > + .rept 16 > + sd t0, (a0) > + sd t1, 8(a0) > + add a0, a0, a1 > + .endr > + > + ret > +endfunc > + > +func ff_v_8x8_rvi > + ld t0, (a3) > + .rept 8 > + sd t0, (a0) > + add a0, a0, a1 > + .endr > + > + ret > +endfunc > +#endif > diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h > index 25047ed507..f8bc6563a5 100644 > --- a/libavcodec/riscv/vp9dsp.h > +++ b/libavcodec/riscv/vp9dsp.h > @@ -60,6 +60,12 @@ void ff_dc_129_16x16_rvv(uint8_t *dst, ptrdiff_t > stride, const uint8_t *l, > const uint8_t *a); > void ff_dc_129_8x8_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > const uint8_t *a); > +void ff_v_32x32_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > +void ff_v_16x16_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > +void ff_v_8x8_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > > #define VP9_8TAP_RISCV_RVV_FUNC(SIZE, type, type_idx) > \ > void ff_put_8tap_##type##_##SIZE##h_rvv(uint8_t *dst, ptrdiff_t > dststride, \ > diff --git a/libavcodec/riscv/vp9dsp_init.c > b/libavcodec/riscv/vp9dsp_init.c > index 69ab39004c..d249dd71b2 100644 > --- a/libavcodec/riscv/vp9dsp_init.c > +++ b/libavcodec/riscv/vp9dsp_init.c > @@ -24,11 +24,19 @@ > #include "libavcodec/vp9dsp.h" > #include "vp9dsp.h" > > -static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) > +static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int > bpp) > { > - #if HAVE_RVV > + #if HAVE_RV > int flags = av_get_cpu_flags(); > > + if (bpp == 8 && flags & AV_CPU_FLAG_RVI) { > +# if __riscv_xlen >= 64 > + dsp->intra_pred[TX_32X32][VERT_PRED] = ff_v_32x32_rvi; > + dsp->intra_pred[TX_16X16][VERT_PRED] = ff_v_16x16_rvi; > + dsp->intra_pred[TX_8X8][VERT_PRED] = ff_v_8x8_rvi; > +# endif > + } > + #if HAVE_RVV > if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() > >= 16) { > dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; > dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; > @@ -53,9 +61,10 @@ static av_cold void > vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) > dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; > } > #endif > + #endif > } > > av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int > bitexact) > { > - vp9dsp_intrapred_init_rvv(dsp, bpp); > + vp9dsp_intrapred_init_riscv(dsp, bpp); > } > -- > 2.45.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
Le tiistaina 7. toukokuuta 2024, 10.36.05 EEST uk7b@foxmail.com a écrit : > From: sunyuechi <sunyuechi@iscas.ac.cn> > > C908: > vp9_vert_8x8_8bpp_c: 22.0 > vp9_vert_8x8_8bpp_rvi: 15.7 > vp9_vert_16x16_8bpp_c: 71.2 > vp9_vert_16x16_8bpp_rvi: 39.0 > vp9_vert_32x32_8bpp_c: 300.2 > vp9_vert_32x32_8bpp_rvi: 135.2 > --- > libavcodec/riscv/Makefile | 1 + > libavcodec/riscv/vp9_intra_rvi.S | 61 ++++++++++++++++++++++++++++++++ > libavcodec/riscv/vp9dsp.h | 6 ++++ > libavcodec/riscv/vp9dsp_init.c | 15 ++++++-- > 4 files changed, 80 insertions(+), 3 deletions(-) > create mode 100644 libavcodec/riscv/vp9_intra_rvi.S > > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > index 050c08ee61..65dd0d656a 100644 > --- a/libavcodec/riscv/Makefile > +++ b/libavcodec/riscv/Makefile > @@ -63,6 +63,7 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o > OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o > 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 > RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_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_intra_rvi.S > b/libavcodec/riscv/vp9_intra_rvi.S new file mode 100644 > index 0000000000..617f9f55a2 > --- /dev/null > +++ b/libavcodec/riscv/vp9_intra_rvi.S > @@ -0,0 +1,61 @@ > +/* > + * 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" > + > +#if __riscv_xlen >= 64 > +func ff_v_32x32_rvi > + ld t0, (a3) > + ld t1, 8(a3) > + ld t2, 16(a3) > + ld t3, 24(a3) > + .rept 32 > + sd t0, (a0) > + sd t1, 8(a0) > + sd t2, 16(a0) > + sd t3, 24(a0) > + add a0, a0, a1 It should be possible to improve ordering to avoid immediate dependency from ADD to SD. Ditto below. > + .endr > + > + ret > +endfunc > + > +func ff_v_16x16_rvi > + ld t0, (a3) > + ld t1, 8(a3) > + .rept 16 > + sd t0, (a0) > + sd t1, 8(a0) > + add a0, a0, a1 > + .endr > + > + ret > +endfunc > + > +func ff_v_8x8_rvi > + ld t0, (a3) > + .rept 8 > + sd t0, (a0) > + add a0, a0, a1 > + .endr > + > + ret > +endfunc > +#endif > diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h > index 25047ed507..f8bc6563a5 100644 > --- a/libavcodec/riscv/vp9dsp.h > +++ b/libavcodec/riscv/vp9dsp.h > @@ -60,6 +60,12 @@ void ff_dc_129_16x16_rvv(uint8_t *dst, ptrdiff_t stride, > const uint8_t *l, const uint8_t *a); > void ff_dc_129_8x8_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > const uint8_t *a); > +void ff_v_32x32_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > +void ff_v_16x16_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > +void ff_v_8x8_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, > + const uint8_t *a); > > #define VP9_8TAP_RISCV_RVV_FUNC(SIZE, type, type_idx) > \ void ff_put_8tap_##type##_##SIZE##h_rvv(uint8_t *dst, ptrdiff_t > dststride, \ diff --git a/libavcodec/riscv/vp9dsp_init.c > b/libavcodec/riscv/vp9dsp_init.c index 69ab39004c..d249dd71b2 100644 > --- a/libavcodec/riscv/vp9dsp_init.c > +++ b/libavcodec/riscv/vp9dsp_init.c > @@ -24,11 +24,19 @@ > #include "libavcodec/vp9dsp.h" > #include "vp9dsp.h" > > -static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) > +static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int > bpp) { > - #if HAVE_RVV > + #if HAVE_RV > int flags = av_get_cpu_flags(); > > + if (bpp == 8 && flags & AV_CPU_FLAG_RVI) { > +# if __riscv_xlen >= 64 > + dsp->intra_pred[TX_32X32][VERT_PRED] = ff_v_32x32_rvi; > + dsp->intra_pred[TX_16X16][VERT_PRED] = ff_v_16x16_rvi; > + dsp->intra_pred[TX_8X8][VERT_PRED] = ff_v_8x8_rvi; > +# endif > + } > + #if HAVE_RVV > if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= > 16) { dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; > dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; > @@ -53,9 +61,10 @@ static av_cold void > vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) > dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; } > #endif > + #endif > } > > av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int > bitexact) { > - vp9dsp_intrapred_init_rvv(dsp, bpp); > + vp9dsp_intrapred_init_riscv(dsp, bpp); > }
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 050c08ee61..65dd0d656a 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -63,6 +63,7 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o 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 RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_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_intra_rvi.S b/libavcodec/riscv/vp9_intra_rvi.S new file mode 100644 index 0000000000..617f9f55a2 --- /dev/null +++ b/libavcodec/riscv/vp9_intra_rvi.S @@ -0,0 +1,61 @@ +/* + * 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" + +#if __riscv_xlen >= 64 +func ff_v_32x32_rvi + ld t0, (a3) + ld t1, 8(a3) + ld t2, 16(a3) + ld t3, 24(a3) + .rept 32 + sd t0, (a0) + sd t1, 8(a0) + sd t2, 16(a0) + sd t3, 24(a0) + add a0, a0, a1 + .endr + + ret +endfunc + +func ff_v_16x16_rvi + ld t0, (a3) + ld t1, 8(a3) + .rept 16 + sd t0, (a0) + sd t1, 8(a0) + add a0, a0, a1 + .endr + + ret +endfunc + +func ff_v_8x8_rvi + ld t0, (a3) + .rept 8 + sd t0, (a0) + add a0, a0, a1 + .endr + + ret +endfunc +#endif diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h index 25047ed507..f8bc6563a5 100644 --- a/libavcodec/riscv/vp9dsp.h +++ b/libavcodec/riscv/vp9dsp.h @@ -60,6 +60,12 @@ void ff_dc_129_16x16_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a); void ff_dc_129_8x8_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a); +void ff_v_32x32_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); +void ff_v_16x16_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); +void ff_v_8x8_rvi(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); #define VP9_8TAP_RISCV_RVV_FUNC(SIZE, type, type_idx) \ void ff_put_8tap_##type##_##SIZE##h_rvv(uint8_t *dst, ptrdiff_t dststride, \ diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 69ab39004c..d249dd71b2 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -24,11 +24,19 @@ #include "libavcodec/vp9dsp.h" #include "vp9dsp.h" -static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) +static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp) { - #if HAVE_RVV + #if HAVE_RV int flags = av_get_cpu_flags(); + if (bpp == 8 && flags & AV_CPU_FLAG_RVI) { +# if __riscv_xlen >= 64 + dsp->intra_pred[TX_32X32][VERT_PRED] = ff_v_32x32_rvi; + dsp->intra_pred[TX_16X16][VERT_PRED] = ff_v_16x16_rvi; + dsp->intra_pred[TX_8X8][VERT_PRED] = ff_v_8x8_rvi; +# endif + } + #if HAVE_RVV if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) { dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; @@ -53,9 +61,10 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; } #endif + #endif } av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact) { - vp9dsp_intrapred_init_rvv(dsp, bpp); + vp9dsp_intrapred_init_riscv(dsp, bpp); }
From: sunyuechi <sunyuechi@iscas.ac.cn> C908: vp9_vert_8x8_8bpp_c: 22.0 vp9_vert_8x8_8bpp_rvi: 15.7 vp9_vert_16x16_8bpp_c: 71.2 vp9_vert_16x16_8bpp_rvi: 39.0 vp9_vert_32x32_8bpp_c: 300.2 vp9_vert_32x32_8bpp_rvi: 135.2 --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/vp9_intra_rvi.S | 61 ++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp.h | 6 ++++ libavcodec/riscv/vp9dsp_init.c | 15 ++++++-- 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 libavcodec/riscv/vp9_intra_rvi.S