| Message ID | 20240809190725.22182-1-remi@remlab.net |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] lavc/mpegvideoencdsp: R-V V pix_sum | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
Le perjantaina 9. elokuuta 2024, 22.07.25 EEST Rémi Denis-Courmont a écrit : > T-Head C908: > pix_sum_c: 332.2 > pix_sum_rvv_i64: 91.2 > > SpacemiT X60: > pix_sum_c: 321.2 > pix_sum_rvv_i64: 60.9 > --- > libavcodec/mpegvideoencdsp.c | 2 ++ > libavcodec/mpegvideoencdsp.h | 2 ++ > libavcodec/riscv/Makefile | 2 ++ > libavcodec/riscv/mpegvideoencdsp_init.c | 37 ++++++++++++++++++++ > libavcodec/riscv/mpegvideoencdsp_rvv.S | 45 +++++++++++++++++++++++++ > 5 files changed, 88 insertions(+) > create mode 100644 libavcodec/riscv/mpegvideoencdsp_init.c > create mode 100644 libavcodec/riscv/mpegvideoencdsp_rvv.S > > diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c > index a96f0b6436..1091c94574 100644 > --- a/libavcodec/mpegvideoencdsp.c > +++ b/libavcodec/mpegvideoencdsp.c > @@ -251,6 +251,8 @@ av_cold void > ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, > ff_mpegvideoencdsp_init_arm(c, avctx); > #elif ARCH_PPC > ff_mpegvideoencdsp_init_ppc(c, avctx); > +#elif ARCH_RISCV > + ff_mpegvideoencdsp_init_riscv(c, avctx); > #elif ARCH_X86 > ff_mpegvideoencdsp_init_x86(c, avctx); > #elif ARCH_MIPS > diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h > index 63dbd39603..f437bc4e4e 100644 > --- a/libavcodec/mpegvideoencdsp.h > +++ b/libavcodec/mpegvideoencdsp.h > @@ -52,6 +52,8 @@ void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext > *c, AVCodecContext *avctx); > void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c, > AVCodecContext *avctx); > +void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, > + AVCodecContext *avctx); > void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c, > AVCodecContext *avctx); > void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c, > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > index b3a6b588c9..27befce929 100644 > --- a/libavcodec/riscv/Makefile > +++ b/libavcodec/riscv/Makefile > @@ -47,6 +47,8 @@ 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_MPEGVIDEOENC) += riscv/mpegvideoencdsp_init.o > +RVV-OBJS-$(CONFIG_MPEGVIDEOENC) += riscv/mpegvideoencdsp_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/mpegvideoencdsp_init.c > b/libavcodec/riscv/mpegvideoencdsp_init.c new file mode 100644 > index 0000000000..955348ca6b > --- /dev/null > +++ b/libavcodec/riscv/mpegvideoencdsp_init.c > @@ -0,0 +1,37 @@ > +/* > + * Copyright © 2024 Rémi Denis-Courmont. > + * > + * 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 <stdint.h> > + > +#include "libavutil/cpu.h" > +#include "libavcodec/mpegvideoencdsp.h" > + > +int ff_pix_sum_rvv(const uint8_t *pix, int line_size); > + > +av_cold void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, > + AVCodecContext *avctx) > +{ > +#if HAVE_RVV > + int flags = av_get_cpu_flags(); > + > + if ((flags & AV_CPU_FLAG_RVV_I64) && ff_rv_vlen_least(128)) > + c->pix_sum = ff_pix_sum_rvv; > +#endif > +} > diff --git a/libavcodec/riscv/mpegvideoencdsp_rvv.S > b/libavcodec/riscv/mpegvideoencdsp_rvv.S new file mode 100644 > index 0000000000..7ec42ce0de > --- /dev/null > +++ b/libavcodec/riscv/mpegvideoencdsp_rvv.S > @@ -0,0 +1,45 @@ > +/* > + * Copyright © 2024 Rémi Denis-Courmont. > + * > + * 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" > + > +func ff_pix_sum_rvv, zve64x, b Missing LPAD. > + vsetivli t0, 16, e16, m1, ta, ma > + slli t1, t0, 3 > + vlsseg2e64.v v8, (a0), a1 # poor man's vlse128.v > + li t2, 16 > + vmv.s.x v1, zero > + vsetvli zero, t1, e8, m4, ta, ma > + vwaddu.vv v16, v8, v12 > + beq t0, t2, 2f # VLEN >= 256 > +1: > + sh3add a0, a1, a0 > + vsetivli zero, 8, e16, m1, ta, ma > + vlsseg2e64.v v8, (a0), a1 > + vsetvli zero, t1, e8, m4, ta, ma > + vwaddu.wv v16, v16, v8 > + vwaddu.wv v16, v16, v12 > +2: > + vsetvli zero, zero, e16, m8, ta, ma > + vredsum.vs v1, v16, v1 > + vmv.x.s a0, v1 > + zext.h a0, a0 > + ret > +endfunc
Le perjantaina 9. elokuuta 2024, 22.23.43 EEST Rémi Denis-Courmont a écrit : > Le perjantaina 9. elokuuta 2024, 22.07.25 EEST Rémi Denis-Courmont a écrit : > > T-Head C908: > > pix_sum_c: 332.2 > > pix_sum_rvv_i64: 91.2 > > > > SpacemiT X60: > > pix_sum_c: 321.2 > > pix_sum_rvv_i64: 60.9 > > --- > > > > libavcodec/mpegvideoencdsp.c | 2 ++ > > libavcodec/mpegvideoencdsp.h | 2 ++ > > libavcodec/riscv/Makefile | 2 ++ > > libavcodec/riscv/mpegvideoencdsp_init.c | 37 ++++++++++++++++++++ > > libavcodec/riscv/mpegvideoencdsp_rvv.S | 45 +++++++++++++++++++++++++ > > 5 files changed, 88 insertions(+) > > create mode 100644 libavcodec/riscv/mpegvideoencdsp_init.c > > create mode 100644 libavcodec/riscv/mpegvideoencdsp_rvv.S > > > > diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c > > index a96f0b6436..1091c94574 100644 > > --- a/libavcodec/mpegvideoencdsp.c > > +++ b/libavcodec/mpegvideoencdsp.c > > @@ -251,6 +251,8 @@ av_cold void > > ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, > > ff_mpegvideoencdsp_init_arm(c, avctx); > > > > #elif ARCH_PPC > > > > ff_mpegvideoencdsp_init_ppc(c, avctx); > > > > +#elif ARCH_RISCV > > + ff_mpegvideoencdsp_init_riscv(c, avctx); > > > > #elif ARCH_X86 > > > > ff_mpegvideoencdsp_init_x86(c, avctx); > > > > #elif ARCH_MIPS > > > > diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h > > index 63dbd39603..f437bc4e4e 100644 > > --- a/libavcodec/mpegvideoencdsp.h > > +++ b/libavcodec/mpegvideoencdsp.h > > @@ -52,6 +52,8 @@ void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext > > *c, AVCodecContext *avctx); > > > > void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c, > > > > AVCodecContext *avctx); > > > > +void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, > > + AVCodecContext *avctx); > > > > void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c, > > > > AVCodecContext *avctx); > > > > void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c, > > > > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > > index b3a6b588c9..27befce929 100644 > > --- a/libavcodec/riscv/Makefile > > +++ b/libavcodec/riscv/Makefile > > @@ -47,6 +47,8 @@ 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_MPEGVIDEOENC) += riscv/mpegvideoencdsp_init.o > > +RVV-OBJS-$(CONFIG_MPEGVIDEOENC) += riscv/mpegvideoencdsp_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/mpegvideoencdsp_init.c > > b/libavcodec/riscv/mpegvideoencdsp_init.c new file mode 100644 > > index 0000000000..955348ca6b > > --- /dev/null > > +++ b/libavcodec/riscv/mpegvideoencdsp_init.c > > @@ -0,0 +1,37 @@ > > +/* > > + * Copyright © 2024 Rémi Denis-Courmont. > > + * > > + * 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 <stdint.h> > > + > > +#include "libavutil/cpu.h" > > +#include "libavcodec/mpegvideoencdsp.h" > > + > > +int ff_pix_sum_rvv(const uint8_t *pix, int line_size); > > + > > +av_cold void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, > > + AVCodecContext *avctx) > > +{ > > +#if HAVE_RVV > > + int flags = av_get_cpu_flags(); > > + > > + if ((flags & AV_CPU_FLAG_RVV_I64) && ff_rv_vlen_least(128)) > > + c->pix_sum = ff_pix_sum_rvv; > > +#endif > > +} > > diff --git a/libavcodec/riscv/mpegvideoencdsp_rvv.S > > b/libavcodec/riscv/mpegvideoencdsp_rvv.S new file mode 100644 > > index 0000000000..7ec42ce0de > > --- /dev/null > > +++ b/libavcodec/riscv/mpegvideoencdsp_rvv.S > > @@ -0,0 +1,45 @@ > > +/* > > + * Copyright © 2024 Rémi Denis-Courmont. > > + * > > + * 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" > > + > > +func ff_pix_sum_rvv, zve64x, b > > Missing LPAD. And uncommitted RVB check, will add manually.
diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c index a96f0b6436..1091c94574 100644 --- a/libavcodec/mpegvideoencdsp.c +++ b/libavcodec/mpegvideoencdsp.c @@ -251,6 +251,8 @@ av_cold void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, ff_mpegvideoencdsp_init_arm(c, avctx); #elif ARCH_PPC ff_mpegvideoencdsp_init_ppc(c, avctx); +#elif ARCH_RISCV + ff_mpegvideoencdsp_init_riscv(c, avctx); #elif ARCH_X86 ff_mpegvideoencdsp_init_x86(c, avctx); #elif ARCH_MIPS diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h index 63dbd39603..f437bc4e4e 100644 --- a/libavcodec/mpegvideoencdsp.h +++ b/libavcodec/mpegvideoencdsp.h @@ -52,6 +52,8 @@ void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c, AVCodecContext *avctx); void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c, AVCodecContext *avctx); +void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, + AVCodecContext *avctx); void ff_mpegvideoencdsp_init_x86(MpegvideoEncDSPContext *c, AVCodecContext *avctx); void ff_mpegvideoencdsp_init_mips(MpegvideoEncDSPContext *c, diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index b3a6b588c9..27befce929 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -47,6 +47,8 @@ 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_MPEGVIDEOENC) += riscv/mpegvideoencdsp_init.o +RVV-OBJS-$(CONFIG_MPEGVIDEOENC) += riscv/mpegvideoencdsp_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/mpegvideoencdsp_init.c b/libavcodec/riscv/mpegvideoencdsp_init.c new file mode 100644 index 0000000000..955348ca6b --- /dev/null +++ b/libavcodec/riscv/mpegvideoencdsp_init.c @@ -0,0 +1,37 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * 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 <stdint.h> + +#include "libavutil/cpu.h" +#include "libavcodec/mpegvideoencdsp.h" + +int ff_pix_sum_rvv(const uint8_t *pix, int line_size); + +av_cold void ff_mpegvideoencdsp_init_riscv(MpegvideoEncDSPContext *c, + AVCodecContext *avctx) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I64) && ff_rv_vlen_least(128)) + c->pix_sum = ff_pix_sum_rvv; +#endif +} diff --git a/libavcodec/riscv/mpegvideoencdsp_rvv.S b/libavcodec/riscv/mpegvideoencdsp_rvv.S new file mode 100644 index 0000000000..7ec42ce0de --- /dev/null +++ b/libavcodec/riscv/mpegvideoencdsp_rvv.S @@ -0,0 +1,45 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * 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" + +func ff_pix_sum_rvv, zve64x, b + vsetivli t0, 16, e16, m1, ta, ma + slli t1, t0, 3 + vlsseg2e64.v v8, (a0), a1 # poor man's vlse128.v + li t2, 16 + vmv.s.x v1, zero + vsetvli zero, t1, e8, m4, ta, ma + vwaddu.vv v16, v8, v12 + beq t0, t2, 2f # VLEN >= 256 +1: + sh3add a0, a1, a0 + vsetivli zero, 8, e16, m1, ta, ma + vlsseg2e64.v v8, (a0), a1 + vsetvli zero, t1, e8, m4, ta, ma + vwaddu.wv v16, v16, v8 + vwaddu.wv v16, v16, v12 +2: + vsetvli zero, zero, e16, m8, ta, ma + vredsum.vs v1, v16, v1 + vmv.x.s a0, v1 + zext.h a0, a0 + ret +endfunc