[FFmpeg-devel] [PATCH] lavc/flacdsp: R-V Zvbb wasted33

[Rémi Denis-Courmont]

---
 libavcodec/riscv/Makefile       |  1 +
 libavcodec/riscv/flacdsp_init.c |  8 +++++++-
 libavcodec/riscv/flacdsp_rvvb.S | 35 +++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/riscv/flacdsp_rvvb.S

diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 590655f829..6c302b1a54 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -20,6 +20,7 @@ OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o
 RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o
 OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_init.o
 RVV-OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_rvv.o
+RVVB-OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_rvvb.o
 OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o
 RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o
 OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o
diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c
index 861276be28..49884b7d9f 100644
--- a/libavcodec/riscv/flacdsp_init.c
+++ b/libavcodec/riscv/flacdsp_init.c
@@ -35,6 +35,7 @@ void ff_flac_lpc33_rvv(int64_t *, const int32_t *, const int coeffs[32],
                        int pred_order, int qlevel, int len);
 void ff_flac_wasted32_rvv(int32_t *, int shift, int len);
 void ff_flac_wasted33_rvv(int64_t *, const int32_t *, int shift, int len);
+void ff_flac_wasted33_rvvb(int64_t *, const int32_t *, int shift, int len);
 void ff_flac_decorrelate_indep2_16_rvv(uint8_t **out, int32_t **in,
                                        int channels, int len, int shift);
 void ff_flac_decorrelate_indep4_16_rvv(uint8_t **out, int32_t **in,
@@ -89,8 +90,13 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt,
 
         c->wasted32 = ff_flac_wasted32_rvv;
 
-        if (flags & AV_CPU_FLAG_RVV_I64)
+        if (flags & AV_CPU_FLAG_RVV_I64) {
             c->wasted33 = ff_flac_wasted33_rvv;
+# if HAVE_RV_ZVBB
+            if (flags & AV_CPU_FLAG_RV_ZVBB)
+                c->wasted33 = ff_flac_wasted33_rvvb;
+# endif
+        }
 
 # if (__riscv_xlen >= 64)
         switch (fmt) {
diff --git a/libavcodec/riscv/flacdsp_rvvb.S b/libavcodec/riscv/flacdsp_rvvb.S
new file mode 100644
index 0000000000..09c37d8936
--- /dev/null
+++ b/libavcodec/riscv/flacdsp_rvvb.S
@@ -0,0 +1,35 @@
+/*
+ * 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_flac_wasted33_rvvb, zve64x, zvbb
+1:
+        vsetvli  t0, a3, e32, m4, ta, ma
+        vle32.v  v8, (a1)
+        sub      a3, a3, t0
+        vwsll.vx v16, v8, a2
+        sh2add   a1, t0, a1
+        vse64.v  v16, (a0)
+        sh3add   a0, t0, a0
+        bnez     a3, 1b
+
+        ret
+endfunc
-- 
2.45.1