[FFmpeg-devel] [PATCH 1/3] lavc/sbrdsp: R-V V sum64x5

[FFmpeg-devel] [PATCH 1/3] lavc/sbrdsp: R-V V sum64x5

[Rémi Denis-Courmont]

sum64x5_c:       385.0
sum64x5_rvv_f32: 116.0
---
 libavcodec/riscv/Makefile      |  4 +--
 libavcodec/riscv/sbrdsp_init.c | 37 +++++++++++++++++++++++++
 libavcodec/riscv/sbrdsp_rvv.S  | 50 ++++++++++++++++++++++++++++++++++
 libavcodec/sbrdsp.h            |  1 +
 libavcodec/sbrdsp_template.c   |  2 ++
 5 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 libavcodec/riscv/sbrdsp_init.c
 create mode 100644 libavcodec/riscv/sbrdsp_rvv.S

diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 06815d3170..2c9af16782 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,5 +1,5 @@
-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o
-RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o
+OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o
+RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o
 OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \
                          riscv/ac3dsp_rvb.o
 OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o
diff --git a/libavcodec/riscv/sbrdsp_init.c b/libavcodec/riscv/sbrdsp_init.c
new file mode 100644
index 0000000000..837f24e1e0
--- /dev/null
+++ b/libavcodec/riscv/sbrdsp_init.c
@@ -0,0 +1,37 @@
+/*
+ * 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/sbrdsp.h"
+
+void ff_sbr_sum64x5_rvv(float *z);
+
+av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c)
+{
+#if HAVE_RVV
+    int flags = av_get_cpu_flags();
+
+    if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
+        c->sum64x5 = ff_sbr_sum64x5_rvv;
+    }
+#endif
+}
diff --git a/libavcodec/riscv/sbrdsp_rvv.S b/libavcodec/riscv/sbrdsp_rvv.S
new file mode 100644
index 0000000000..e1d548b41b
--- /dev/null
+++ b/libavcodec/riscv/sbrdsp_rvv.S
@@ -0,0 +1,50 @@
+/*
+ * 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_sbr_sum64x5_rvv, zve32f
+        li      a5, 64
+        addi    a1, a0, 64 * 4
+        addi    a2, a0, 128 * 4
+        addi    a3, a0, 192 * 4
+        addi    a4, a0, 256 * 4
+1:
+        vsetvli t0, a5, e32, m8, ta, ma
+        sub     a5, a5, t0
+        vle32.v v0, (a0)
+        vle32.v v8, (a1)
+        sh2add  a1, t0, a1
+        vle32.v v16, (a2)
+        vfadd.vv v0, v0, v8
+        sh2add  a2, t0, a2
+        vle32.v v24, (a3)
+        vfadd.vv v0, v0, v16
+        sh2add  a3, t0, a3
+        vle32.v v8, (a4)
+        vfadd.vv v0, v0, v24
+        sh2add  a4, t0, a4
+        vfadd.vv v0, v0, v8
+        vse32.v v0, (a0)
+        sh2add  a0, t0, a0
+        bnez    a5, 1b
+
+        ret
+endfunc
diff --git a/libavcodec/sbrdsp.h b/libavcodec/sbrdsp.h
index 8513c423af..49782202a7 100644
--- a/libavcodec/sbrdsp.h
+++ b/libavcodec/sbrdsp.h
@@ -48,6 +48,7 @@ extern const INTFLOAT AAC_RENAME(ff_sbr_noise_table)[][2];
 void AAC_RENAME(ff_sbrdsp_init)(SBRDSPContext *s);
 void ff_sbrdsp_init_arm(SBRDSPContext *s);
 void ff_sbrdsp_init_aarch64(SBRDSPContext *s);
+void ff_sbrdsp_init_riscv(SBRDSPContext *s);
 void ff_sbrdsp_init_x86(SBRDSPContext *s);
 void ff_sbrdsp_init_mips(SBRDSPContext *s);
 
diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/sbrdsp_template.c
index 89e389d9a0..79cd2156d9 100644
--- a/libavcodec/sbrdsp_template.c
+++ b/libavcodec/sbrdsp_template.c
@@ -98,6 +98,8 @@ av_cold void AAC_RENAME(ff_sbrdsp_init)(SBRDSPContext *s)
     ff_sbrdsp_init_arm(s);
 #elif ARCH_AARCH64
     ff_sbrdsp_init_aarch64(s);
+#elif ARCH_RISCV
+    ff_sbrdsp_init_riscv(s);
 #elif ARCH_X86
     ff_sbrdsp_init_x86(s);
 #elif ARCH_MIPS
-- 
2.42.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".

[FFmpeg-devel] [PATCH 2/3] lavc/sbrdsp: R-V V sum_square

[Rémi Denis-Courmont]

sum_square_c:       803.5
sum_square_rvv_f32: 283.2
---
 libavcodec/riscv/sbrdsp_init.c |  2 ++
 libavcodec/riscv/sbrdsp_rvv.S  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/libavcodec/riscv/sbrdsp_init.c b/libavcodec/riscv/sbrdsp_init.c
index 837f24e1e0..e0e62278b0 100644
--- a/libavcodec/riscv/sbrdsp_init.c
+++ b/libavcodec/riscv/sbrdsp_init.c
@@ -24,6 +24,7 @@
 #include "libavcodec/sbrdsp.h"
 
 void ff_sbr_sum64x5_rvv(float *z);
+float ff_sbr_sum_square_rvv(float (*x)[2], int n);
 
 av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c)
 {
@@ -32,6 +33,7 @@ av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c)
 
     if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
         c->sum64x5 = ff_sbr_sum64x5_rvv;
+        c->sum_square = ff_sbr_sum_square_rvv;
     }
 #endif
 }
diff --git a/libavcodec/riscv/sbrdsp_rvv.S b/libavcodec/riscv/sbrdsp_rvv.S
index e1d548b41b..4684630953 100644
--- a/libavcodec/riscv/sbrdsp_rvv.S
+++ b/libavcodec/riscv/sbrdsp_rvv.S
@@ -48,3 +48,22 @@ func ff_sbr_sum64x5_rvv, zve32f
 
         ret
 endfunc
+
+func ff_sbr_sum_square_rvv, zve32f
+        vsetvli t0, zero, e32, m8, ta, ma
+        slli    a1, a1, 1
+        vmv.v.x v8, zero
+        vmv.s.x v0, zero
+1:
+        vsetvli t0, a1, e32, m8, tu, ma
+        vle32.v v16, (a0)
+        sub     a1, a1, t0
+        vfmacc.vv v8, v16, v16
+        sh2add  a0, t0, a0
+        bnez    a1, 1b
+
+        vfredusum.vs v0, v8, v0
+        vfmv.f.s fa0, v0
+NOHWF   fmv.x.w  a0, fa0
+        ret
+endfunc
-- 
2.42.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".

[FFmpeg-devel] [PATCH 3/3] lavc/sbrdsp: R-V V neg_odd_64

[Rémi Denis-Courmont]

With 128-bit vectors, this is mostly pointless but also harmless.
Performance gains should be more noticeable with larger vector sizes.

neg_odd_64_c:       76.2
neg_odd_64_rvv_i64: 74.7
---
 libavcodec/riscv/sbrdsp_init.c |  5 +++++
 libavcodec/riscv/sbrdsp_rvv.S  | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/libavcodec/riscv/sbrdsp_init.c b/libavcodec/riscv/sbrdsp_init.c
index e0e62278b0..1b85b2cae9 100644
--- a/libavcodec/riscv/sbrdsp_init.c
+++ b/libavcodec/riscv/sbrdsp_init.c
@@ -25,6 +25,7 @@
 
 void ff_sbr_sum64x5_rvv(float *z);
 float ff_sbr_sum_square_rvv(float (*x)[2], int n);
+void ff_sbr_neg_odd_64_rvv(float *x);
 
 av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c)
 {
@@ -35,5 +36,9 @@ av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c)
         c->sum64x5 = ff_sbr_sum64x5_rvv;
         c->sum_square = ff_sbr_sum_square_rvv;
     }
+#if __riscv_xlen >= 64
+    if ((flags & AV_CPU_FLAG_RVV_I64) && (flags & AV_CPU_FLAG_RVB_ADDR))
+        c->neg_odd_64 = ff_sbr_neg_odd_64_rvv;
+#endif
 #endif
 }
diff --git a/libavcodec/riscv/sbrdsp_rvv.S b/libavcodec/riscv/sbrdsp_rvv.S
index 4684630953..b510190b15 100644
--- a/libavcodec/riscv/sbrdsp_rvv.S
+++ b/libavcodec/riscv/sbrdsp_rvv.S
@@ -67,3 +67,20 @@ func ff_sbr_sum_square_rvv, zve32f
 NOHWF   fmv.x.w  a0, fa0
         ret
 endfunc
+
+#if __riscv_xlen >= 64
+func ff_sbr_neg_odd_64_rvv, zve64x
+        li      a1, 32
+        li      t1, 1 << 63
+1:
+        vsetvli t0, a1, e64, m8, ta, ma
+        vle64.v v8, (a0)
+        sub     a1, a1, t0
+        vxor.vx v8, v8, t1
+        vse64.v v8, (a0)
+        sh3add  a0, t0, a0
+        bnez    t0, 1b
+
+        ret
+endfunc
+#endif
-- 
2.42.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".