[FFmpeg-devel] [PATCHv3 1/2] lavc/flacdsp: R-V V flac_wasted32

[FFmpeg-devel] [PATCHv3 1/2] lavc/flacdsp: R-V V flac_wasted32

[Rémi Denis-Courmont]

T-Head C908:
flac_wasted_32_c:       949.0
flac_wasted_32_rvv_i32: 278.7
---
 libavcodec/riscv/flacdsp_init.c |  7 ++++++-
 libavcodec/riscv/flacdsp_rvv.S  | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c
index 66eb062620..454787470b 100644
--- a/libavcodec/riscv/flacdsp_init.c
+++ b/libavcodec/riscv/flacdsp_init.c
@@ -31,6 +31,7 @@ void ff_flac_lpc32_rvv(int32_t *decoded, const int coeffs[32],
                        int pred_order, int qlevel, int len);
 void ff_flac_lpc32_rvv_simple(int32_t *decoded, 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_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,
@@ -79,7 +80,11 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt,
             else
                 c->lpc32 = ff_flac_lpc32_rvv;
         }
+# endif
+
+        c->wasted32 = ff_flac_wasted32_rvv;
 
+# if (__riscv_xlen >= 64)
         switch (fmt) {
         case AV_SAMPLE_FMT_S16:
             switch (channels) {
@@ -119,8 +124,8 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt,
             c->decorrelate[2] = ff_flac_decorrelate_rs_32_rvv;
             c->decorrelate[3] = ff_flac_decorrelate_ms_32_rvv;
             break;
-# endif
         }
+# endif
     }
 #endif
 }
diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S
index 25803f00f8..d7009cdec2 100644
--- a/libavcodec/riscv/flacdsp_rvv.S
+++ b/libavcodec/riscv/flacdsp_rvv.S
@@ -100,7 +100,22 @@ func ff_flac_lpc32_rvv_simple, zve64x
 
         ret
 endfunc
+#endif
+
+func ff_flac_wasted32_rvv, zve32x
+1:
+        vsetvli t0, a2, e32, m8, ta, ma
+        vle32.v v8, (a0)
+        sub     a2, a2, t0
+        vsll.vx v8, v8, a1
+        vse32.v v8, (a0)
+        sh2add  a0, t0, a0
+        bnez    a2, 1b
 
+        ret
+endfunc
+
+#if (__riscv_xlen == 64)
 func ff_flac_decorrelate_indep2_16_rvv, zve32x
         ld      a0,  (a0)
         ld      a2, 8(a1)
-- 
2.43.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] [PATCHv3 2/2] lavc/flacdsp: R-V V flac_wasted33

[Rémi Denis-Courmont]

T-Head C908:
flac_wasted_33_c:       786.2
flac_wasted_33_rvv_i64: 486.5
---
 libavcodec/riscv/flacdsp_init.c |  4 ++++
 libavcodec/riscv/flacdsp_rvv.S  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c
index 454787470b..4f1652dbe7 100644
--- a/libavcodec/riscv/flacdsp_init.c
+++ b/libavcodec/riscv/flacdsp_init.c
@@ -32,6 +32,7 @@ void ff_flac_lpc32_rvv(int32_t *decoded, const int coeffs[32],
 void ff_flac_lpc32_rvv_simple(int32_t *decoded, 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_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,
@@ -84,6 +85,9 @@ 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)
+            c->wasted33 = ff_flac_wasted33_rvv;
+
 # if (__riscv_xlen >= 64)
         switch (fmt) {
         case AV_SAMPLE_FMT_S16:
diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S
index d7009cdec2..6287faa260 100644
--- a/libavcodec/riscv/flacdsp_rvv.S
+++ b/libavcodec/riscv/flacdsp_rvv.S
@@ -115,6 +115,38 @@ func ff_flac_wasted32_rvv, zve32x
         ret
 endfunc
 
+func ff_flac_wasted33_rvv, zve64x
+        srli         t0, a2, 5
+        li           t1, 1
+        bnez         t0, 2f
+        sll          a2, t1, a2
+1:
+        vsetvli      t0, a3, e32, m4, ta, ma
+        vle32.v      v8, (a1)
+        sub          a3, a3, t0
+        vwmulsu.vx   v16, v8, a2
+        sh2add       a1, t0, a1
+        vse64.v      v16, (a0)
+        sh3add       a0, t0, a0
+        bnez         a3, 1b
+
+        ret
+
+2:      // Pessimistic case: wasted >= 32
+        vsetvli      t0, a3, e32, m4, ta, ma
+        vle32.v      v8, (a1)
+        sub          a3, a3, t0
+        vwcvtu.x.x.v v16, v8
+        sh2add       a1, t0, a1
+        vsetvli      zero, zero, e64, m8, ta, ma
+        vsll.vx      v16, v16, a2
+        vse64.v      v16, (a0)
+        sh3add       a0, t0, a0
+        bnez         a3, 2b
+
+        ret
+endfunc
+
 #if (__riscv_xlen == 64)
 func ff_flac_decorrelate_indep2_16_rvv, zve32x
         ld      a0,  (a0)
-- 
2.43.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".