diff options
author | Rémi Denis-Courmont <remi@remlab.net> | 2023-11-12 21:56:32 +0200 |
---|---|---|
committer | Rémi Denis-Courmont <remi@remlab.net> | 2023-11-16 16:53:44 +0200 |
commit | 45d0eb3f70feae559d6a164a02ed4c565077909f (patch) | |
tree | a18b98c2e571eabfd9311d8554f2ed7797ffbc09 | |
parent | 6720a509a77f1a077c4716f331049259cb242830 (diff) | |
download | ffmpeg-45d0eb3f70feae559d6a164a02ed4c565077909f.tar.gz |
lavc/llauddsp: R-V V scalarproduct_and_madd_int16
scalarproduct_and_madd_int16_c: 10355.7
scalarproduct_and_madd_int16_rvv_i32: 1480.0
-rw-r--r-- | libavcodec/lossless_audiodsp.c | 2 | ||||
-rw-r--r-- | libavcodec/lossless_audiodsp.h | 1 | ||||
-rw-r--r-- | libavcodec/riscv/Makefile | 2 | ||||
-rw-r--r-- | libavcodec/riscv/llauddsp_init.c | 40 | ||||
-rw-r--r-- | libavcodec/riscv/llauddsp_rvv.S | 45 |
5 files changed, 90 insertions, 0 deletions
diff --git a/libavcodec/lossless_audiodsp.c b/libavcodec/lossless_audiodsp.c index 1daf2e4c12..b0d64cf5b3 100644 --- a/libavcodec/lossless_audiodsp.c +++ b/libavcodec/lossless_audiodsp.c @@ -63,6 +63,8 @@ av_cold void ff_llauddsp_init(LLAudDSPContext *c) ff_llauddsp_init_arm(c); #elif ARCH_PPC ff_llauddsp_init_ppc(c); +#elif ARCH_RISCV + ff_llauddsp_init_riscv(c); #elif ARCH_X86 ff_llauddsp_init_x86(c); #endif diff --git a/libavcodec/lossless_audiodsp.h b/libavcodec/lossless_audiodsp.h index eea5d49fa9..cf2d43d7c9 100644 --- a/libavcodec/lossless_audiodsp.h +++ b/libavcodec/lossless_audiodsp.h @@ -46,6 +46,7 @@ typedef struct LLAudDSPContext { void ff_llauddsp_init(LLAudDSPContext *c); void ff_llauddsp_init_arm(LLAudDSPContext *c); void ff_llauddsp_init_ppc(LLAudDSPContext *c); +void ff_llauddsp_init_riscv(LLAudDSPContext *c); void ff_llauddsp_init_x86(LLAudDSPContext *c); #endif /* AVCODEC_LOSSLESS_AUDIODSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 2c9af16782..57c1708dbb 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -24,6 +24,8 @@ OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_rvv.o +OBJS-$(CONFIG_LLAUDDSP) += riscv/llauddsp_init.o +RVV-OBJS-$(CONFIG_LLAUDDSP) += riscv/llauddsp_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/llauddsp_init.c b/libavcodec/riscv/llauddsp_init.c new file mode 100644 index 0000000000..ea023f73e6 --- /dev/null +++ b/libavcodec/riscv/llauddsp_init.c @@ -0,0 +1,40 @@ +/* + * Copyright © 2023 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 "libavcodec/lossless_audiodsp.h" + +int32_t ff_scalarproduct_and_madd_int16_rvv(int16_t *v1, const int16_t *v2, + const int16_t *v3, int len, + int mul); + +av_cold void ff_llauddsp_init_riscv(LLAudDSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_rvv; + } +#endif +} diff --git a/libavcodec/riscv/llauddsp_rvv.S b/libavcodec/riscv/llauddsp_rvv.S new file mode 100644 index 0000000000..74adb338a9 --- /dev/null +++ b/libavcodec/riscv/llauddsp_rvv.S @@ -0,0 +1,45 @@ +/* + * Copyright © 2023 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_scalarproduct_and_madd_int16_rvv, zve32x + vsetvli t0, zero, e32, m8, ta, ma + vmv.v.x v0, zero +1: + vsetvli t0, a3, e16, m4, tu, ma + vle16.v v8, (a0) + sub a3, a3, t0 + vle16.v v16, (a1) + sh1add a1, t0, a1 + vwmacc.vv v0, v8, v16 + vle16.v v24, (a2) + sh1add a2, t0, a2 + vmacc.vx v8, a4, v24 + vse16.v v8, (a0) + sh1add a0, t0, a0 + bnez a3, 1b + + vsetvli t0, zero, e32, m8, ta, ma + vmv.s.x v8, zero + vredsum.vs v0, v0, v8 + vmv.x.s a0, v0 + ret +endfunc |