diff mbox series

[FFmpeg-devel] lavc/opusdsp: RISC-V F deemphasis

Message ID 20220929195159.22376-1-remi@remlab.net
State New
Headers show
Series [FFmpeg-devel] lavc/opusdsp: RISC-V F deemphasis | expand

Commit Message

Rémi Denis-Courmont Sept. 29, 2022, 7:51 p.m. UTC 
From: Rémi Denis-Courmont <remi@remlab.net>

This saves almost exactly 25% on SiFive U74.

deemphasis_c: 11536.2
deemphasis_rvf: 8654.2
---
 libavcodec/opusdsp.c            |  2 ++
 libavcodec/opusdsp.h            |  1 +
 libavcodec/riscv/Makefile       |  2 ++
 libavcodec/riscv/opusdsp_init.c | 36 +++++++++++++++++++++++++++++
 libavcodec/riscv/opusdsp_rvf.S  | 41 +++++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+)
 create mode 100644 libavcodec/riscv/opusdsp_init.c
 create mode 100644 libavcodec/riscv/opusdsp_rvf.S

Comments

Rémi Denis-Courmont Sept. 29, 2022, 8:12 p.m. UTC | #1 
Le torstaina 29. syyskuuta 2022, 22.51.59 EEST remi@remlab.net a écrit :
> From: Rémi Denis-Courmont <remi@remlab.net>
> 
> This saves almost exactly 25% on SiFive U74.
> 
> deemphasis_c: 11536.2
> deemphasis_rvf: 8654.2

So well, if you trust godbolt.org, some better compiler is able to optimise 
the C version correctly, just not Debian GCC 12.2.

I could still use a review on the AAC restrict qualification patch though.
Rémi Denis-Courmont Sept. 30, 2022, 2:42 p.m. UTC | #2 
Le torstaina 29. syyskuuta 2022, 22.51.59 EEST remi@remlab.net a écrit :
> From: Rémi Denis-Courmont <remi@remlab.net>
> 
> This saves almost exactly 25% on SiFive U74.
> 
> deemphasis_c: 11536.2
> deemphasis_rvf: 8654.2

One can get the same result with the C version using -ffast-math.
Forget this patch.
diff mbox series

Patch

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..ef7d1169fe 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 \
+                               riscv/opusdsp_rvf.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..dddf27affb
--- /dev/null
+++ b/libavcodec/riscv/opusdsp_init.c
@@ -0,0 +1,36 @@ 
+/*
+ * 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"
+
+float ff_opus_deemphasis_rvf(float *out, float *in, float c, int len);
+
+av_cold void ff_opus_dsp_init_riscv(OpusDSP *d)
+{
+    int flags = av_get_cpu_flags();
+
+    if (flags & AV_CPU_FLAG_RVF)
+        d->deemphasis = ff_opus_deemphasis_rvf;
+}
diff --git a/libavcodec/riscv/opusdsp_rvf.S b/libavcodec/riscv/opusdsp_rvf.S
new file mode 100644
index 0000000000..b1eaa35d92
--- /dev/null
+++ b/libavcodec/riscv/opusdsp_rvf.S
@@ -0,0 +1,41 @@ 
+/*
+ * 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_deemphasis_rvf, f
+NOHWF   fmv.w.x fa0, a2
+NOHWF   mv      a2, a3
+        slli    a2, a2, 2
+        li      t0, 0x3f599a00 // 0.85
+        add     a2, a1, a2
+        fmv.w.x ft0, t0
+1:
+        flw     ft1, (a1)
+        addi    a0, a0, 4
+        fmadd.s fa0, fa0, ft0, ft1
+        addi    a1, a1, 4
+        fsw     fa0, -4(a0)
+        bne     a1, a2, 1b
+
+NOHWF   fmv.x.w a0, fa0
+        ret
+endfunc