| Message ID | 20221001123239.33042-1-remi@remlab.net |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V V Opus post-filter | expand |
Oct 1, 2022, 14:32 by remi@remlab.net: > From: Rémi Denis-Courmont <remi@remlab.net> > > This is optimised for a vector size of 128-bit. Or maybe it would be > more accurate to state that this is not properly optimised for larger > vector sizes, as they would work just fine with a smaller vector group > multiplier. > --- > libavcodec/opusdsp.c | 2 ++ > libavcodec/opusdsp.h | 1 + > libavcodec/riscv/Makefile | 2 ++ > libavcodec/riscv/opusdsp_init.c | 38 ++++++++++++++++++++++++ > libavcodec/riscv/opusdsp_rvv.S | 51 +++++++++++++++++++++++++++++++++ > 5 files changed, 94 insertions(+) > create mode 100644 libavcodec/riscv/opusdsp_init.c > create mode 100644 libavcodec/riscv/opusdsp_rvv.S > > diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c > index badcfcc884..0764d712e4 100644 > --- a/libavcodec/opusdsp.c > +++ b/libavcodec/opusdsp.c > @@ -58,6 +58,8 @@ av_cold void ff_opus_dsp_init(OpusDSP *ctx) > > #if ARCH_AARCH64 > ff_opus_dsp_init_aarch64(ctx); > +#elif ARCH_RISCV > + ff_opus_dsp_init_riscv(ctx); > #elif ARCH_X86 > ff_opus_dsp_init_x86(ctx); > #endif > diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h > index 3ea3d14bf0..c2a301e832 100644 > --- a/libavcodec/opusdsp.h > +++ b/libavcodec/opusdsp.h > @@ -30,5 +30,6 @@ void ff_opus_dsp_init(OpusDSP *ctx); > > void ff_opus_dsp_init_x86(OpusDSP *ctx); > void ff_opus_dsp_init_aarch64(OpusDSP *ctx); > +void ff_opus_dsp_init_riscv(OpusDSP *ctx); > > #endif /* AVCODEC_OPUSDSP_H */ > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile > index 0fb2c81c75..1edfa76ea5 100644 > --- a/libavcodec/riscv/Makefile > +++ b/libavcodec/riscv/Makefile > @@ -7,6 +7,8 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o > RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o > OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o > RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_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 \ > riscv/pixblockdsp_rvi.o > RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o > diff --git a/libavcodec/riscv/opusdsp_init.c b/libavcodec/riscv/opusdsp_init.c > new file mode 100644 > index 0000000000..18d3892329 > --- /dev/null > +++ b/libavcodec/riscv/opusdsp_init.c > @@ -0,0 +1,38 @@ > +/* > + * Copyright © 2022 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 "config.h" > + > +#include "libavutil/attributes.h" > +#include "libavutil/cpu.h" > +#include "libavutil/riscv/cpu.h" > +#include "libavcodec/opusdsp.h" > + > +void ff_opus_postfilter_rvv(float *data, int period, float *gains, int len); > + > +av_cold void ff_opus_dsp_init_riscv(OpusDSP *d) > +{ > +#if HAVE_RVV > + int flags = av_get_cpu_flags(); > + > + if ((flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) > + d->postfilter = ff_opus_postfilter_rvv; > +#endif > Function doesn't use RVV_I32 but zve32f.
diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index badcfcc884..0764d712e4 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -58,6 +58,8 @@ av_cold void ff_opus_dsp_init(OpusDSP *ctx) #if ARCH_AARCH64 ff_opus_dsp_init_aarch64(ctx); +#elif ARCH_RISCV + ff_opus_dsp_init_riscv(ctx); #elif ARCH_X86 ff_opus_dsp_init_x86(ctx); #endif diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index 3ea3d14bf0..c2a301e832 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -30,5 +30,6 @@ void ff_opus_dsp_init(OpusDSP *ctx); void ff_opus_dsp_init_x86(OpusDSP *ctx); void ff_opus_dsp_init_aarch64(OpusDSP *ctx); +void ff_opus_dsp_init_riscv(OpusDSP *ctx); #endif /* AVCODEC_OPUSDSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 0fb2c81c75..1edfa76ea5 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -7,6 +7,8 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_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 \ riscv/pixblockdsp_rvi.o RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o diff --git a/libavcodec/riscv/opusdsp_init.c b/libavcodec/riscv/opusdsp_init.c new file mode 100644 index 0000000000..18d3892329 --- /dev/null +++ b/libavcodec/riscv/opusdsp_init.c @@ -0,0 +1,38 @@ +/* + * Copyright © 2022 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 "config.h" + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" +#include "libavcodec/opusdsp.h" + +void ff_opus_postfilter_rvv(float *data, int period, float *gains, int len); + +av_cold void ff_opus_dsp_init_riscv(OpusDSP *d) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) + d->postfilter = ff_opus_postfilter_rvv; +#endif +} diff --git a/libavcodec/riscv/opusdsp_rvv.S b/libavcodec/riscv/opusdsp_rvv.S new file mode 100644 index 0000000000..f42a9c36c5 --- /dev/null +++ b/libavcodec/riscv/opusdsp_rvv.S @@ -0,0 +1,51 @@ +/* + * Copyright © 2022 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 "config.h" +#include "libavutil/riscv/asm.S" + +func ff_opus_postfilter_rvv, zve32f + addi a1, a1, 2 + slli a1, a1, 2 + sh2add a3, a3, a0 + sub t0, a0, a1 + vsetivli zero, 3, e32, m2, ta, ma + vle32.v v24, (a2) + lw t1, 4(a2) + vsetivli zero, 5, e32, m2, ta, ma + vslide1up.vx v8, v24, t1 + lw t2, 8(a2) + vle32.v v16, (t0) + vslide1up.vx v24, v8, t2 +2: + lw t1, (a0) + vfmul.vv v8, v24, v16 + addi a0, a0, 4 + vmv.s.x v0, t1 + lw t2, 20(t0) + vfredusum.vs v0, v8, v0 + addi t0, t0, 4 + vslide1down.vx v16, v16, t2 + vmv.x.s t1, v0 + sw t1, -4(a0) + bne a0, a3, 2b + + ret +endfunc
From: Rémi Denis-Courmont <remi@remlab.net> This is optimised for a vector size of 128-bit. Or maybe it would be more accurate to state that this is not properly optimised for larger vector sizes, as they would work just fine with a smaller vector group multiplier. --- libavcodec/opusdsp.c | 2 ++ libavcodec/opusdsp.h | 1 + libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/opusdsp_init.c | 38 ++++++++++++++++++++++++ libavcodec/riscv/opusdsp_rvv.S | 51 +++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 libavcodec/riscv/opusdsp_init.c create mode 100644 libavcodec/riscv/opusdsp_rvv.S