[FFmpeg-devel] [PATCH 1/4] lavu/riscv: allow requesting a second extension

[FFmpeg-devel] [PATCH 1/4] lavu/riscv: allow requesting a second extension

[Rémi Denis-Courmont]

---
 libavutil/riscv/asm.S | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavutil/riscv/asm.S b/libavutil/riscv/asm.S
index 0a9e2e0d3f..9d76ab5617 100644
--- a/libavutil/riscv/asm.S
+++ b/libavutil/riscv/asm.S
@@ -36,13 +36,16 @@
 #define HWD
 #endif
 
-        .macro func sym, ext=
+        .macro func sym, ext1=, ext2=
             .text
             .align 2
 
             .option push
-            .ifnb \ext
-            .option arch, +\ext
+            .ifnb \ext1
+            .option arch, +\ext1
+            .ifnb \ext2
+            .option arch, +\ext2
+            .endif
             .endif
 
             .global \sym
-- 
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] [PATCH 2/4] lavc/riscv: explicitly require Zbb for MIN

[Rémi Denis-Courmont]

---
 libavcodec/riscv/aacpsdsp_rvv.S | 2 +-
 libavcodec/riscv/opusdsp_rvv.S  | 2 +-
 libavcodec/riscv/sbrdsp_rvv.S   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index a79d7d7818..2d6858688a 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -207,7 +207,7 @@ func ff_ps_hybrid_synthesis_deint_rvv, zve64x
         ret
 endfunc
 
-func ff_ps_stereo_interpolate_rvv, zve32f
+func ff_ps_stereo_interpolate_rvv, zve32f, zbb
         vsetvli      t0, zero, e32, m2, ta, ma
         vid.v        v24
         flw          ft0,   (a2)
diff --git a/libavcodec/riscv/opusdsp_rvv.S b/libavcodec/riscv/opusdsp_rvv.S
index 9a8914c78d..42d845a370 100644
--- a/libavcodec/riscv/opusdsp_rvv.S
+++ b/libavcodec/riscv/opusdsp_rvv.S
@@ -20,7 +20,7 @@
 
 #include "libavutil/riscv/asm.S"
 
-func ff_opus_postfilter_rvv, zve32f
+func ff_opus_postfilter_rvv, zve32f, zbb
         flw     fa0, 0(a2) // g0
         slli    t1, a1, 2
         flw     fa1, 4(a2) // g1
diff --git a/libavcodec/riscv/sbrdsp_rvv.S b/libavcodec/riscv/sbrdsp_rvv.S
index 02feb6451e..918c37882f 100644
--- a/libavcodec/riscv/sbrdsp_rvv.S
+++ b/libavcodec/riscv/sbrdsp_rvv.S
@@ -290,16 +290,16 @@ endfunc
         ret
 .endm
 
-func ff_sbr_hf_apply_noise_0_rvv, zve32f
+func ff_sbr_hf_apply_noise_0_rvv, zve32f, zbb
         hf_apply_noise 0
 endfunc
 
-func ff_sbr_hf_apply_noise_3_rvv, zve32f
+func ff_sbr_hf_apply_noise_3_rvv, zve32f, zbb
        not     a4, a4 // invert parity of kx
        // fall through
 endfunc
 
-func ff_sbr_hf_apply_noise_1_rvv, zve32f
+func ff_sbr_hf_apply_noise_1_rvv, zve32f, zbb
         vsetvli t0, zero, e32, m4, ta, ma
         vid.v   v4
         vxor.vx v4, v4, a4
@@ -307,6 +307,6 @@ func ff_sbr_hf_apply_noise_1_rvv, zve32f
         hf_apply_noise 1
 endfunc
 
-func ff_sbr_hf_apply_noise_2_rvv, zve32f
+func ff_sbr_hf_apply_noise_2_rvv, zve32f, zbb
         hf_apply_noise 2
 endfunc
-- 
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] [PATCH 3/4] swscale/riscv: explicitly require Zbb for MIN

[Rémi Denis-Courmont]

---
 libswscale/riscv/rgb2rgb_rvv.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S
index 21e30ab8bb..19f7aaf67d 100644
--- a/libswscale/riscv/rgb2rgb_rvv.S
+++ b/libswscale/riscv/rgb2rgb_rvv.S
@@ -165,10 +165,10 @@ endfunc
         ret
 .endm
 
-func ff_uyvytoyuv422_rvv, zve32x
+func ff_uyvytoyuv422_rvv, zve32x, zbb
         yuy2_to_i422p v20, v16
 endfunc
 
-func ff_yuyvtoyuv422_rvv, zve32x
+func ff_yuyvtoyuv422_rvv, zve32x, zbb
         yuy2_to_i422p v16, v20
 endfunc
-- 
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] [PATCH 4/4] lavu/riscv: remove bespoke assembler for MIN

[Rémi Denis-Courmont]

This is no longer necessary as Zbb is now always explicitly required.
---
 libavutil/riscv/asm.S | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavutil/riscv/asm.S b/libavutil/riscv/asm.S
index 9d76ab5617..14be5055f5 100644
--- a/libavutil/riscv/asm.S
+++ b/libavutil/riscv/asm.S
@@ -95,11 +95,6 @@
         shnadd  3, \rd, \rs1, \rs2
         .endm
 #endif
-#if !defined (__riscv_zbb)
-        .macro  min rd, rs1, rs2
-        .insn r OP, 4, 5, \rd, \rs1, \rs2
-        .endm
-#endif
 
         /* Convenience macro to load a Vector type (vtype) as immediate */
         .macro  lvtypei rd, e, m=m1, tp=tu, mp=mu
-- 
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".