lavu/riscv: count bytes rather than words for bswap32

This removes the dependency on Zba at essentially zero cost.

Rémi Denis-Courmont committed 2 years ago

Commit bd0c3ed1 parent 5171baa5 files · +13 −13Browse files

Unified · Split

5 files

 #if HAVE_RV
     int flags = av_get_cpu_flags();
-    if (flags & AV_CPU_FLAG_RVB_ADDR) {
 #if (__riscv_xlen >= 64)
-        if (flags & AV_CPU_FLAG_RVB_BASIC)
+    if (flags & AV_CPU_FLAG_RVB_BASIC)
-            c->bswap_buf = ff_bswap32_buf_rvb;
+        c->bswap_buf = ff_bswap32_buf_rvb;
 #endif
 #if HAVE_RVV
+    if (flags & AV_CPU_FLAG_RVB_ADDR) {
         if (flags & AV_CPU_FLAG_RVV_I32)
             c->bswap16_buf = ff_bswap16_buf_rvv;
-#endif
     }
 #endif
+#endif
 }

 #include "libavutil/riscv/bswap_rvb.S"
 #if (__riscv_xlen >= 64)
-func ff_bswap32_buf_rvb, zba, zbb
+func ff_bswap32_buf_rvb, zbb
         lpad    0
+        slli    a2, a2, 2
         bswap32_rvb a0, a1, a2
 endfunc
 #endif

@@ -20,21 +20,21 @@ · 19 unmodified lines
20		20
21	#if (__riscv_xlen >= 64)	21	#if (__riscv_xlen >= 64)
22	.macro bswap32_rvb out, in, count	22	.macro bswap32_rvb out, in, count
23	andi t0, \count, 4	23	andi t0, \count, 1
24	beqz t0, 1f	24	beqz t0, 1f
25	/* Align input to 64-bit */	25	/* Align input to 64-bit */
26	lwu t0, (\in)	26	lwu t0, (\in)
27	addi \out, \out, 4	27	addi \out, \out, 4
28	rev8 t0, t0	28	rev8 t0, t0
29	addi \count, \count, -1	29	addi \count, \count, -4
30	srli t0, t0, __riscv_xlen - 32	30	srli t0, t0, __riscv_xlen - 32
31	addi \in, \in, 4	31	addi \in, \in, 4
32	sw t0, -4(\out)	32	sw t0, -4(\out)
33	1:	33	1:
34	andi t3, \count, -2	34	andi t3, \count, -8
35	sh2add \count, \count, \out	35	add \count, \count, \out
36	beqz t3, 3f	36	beqz t3, 3f
37	sh2add t3, t3, \out	37	add t3, t3, \out
38	2: /* 2 elements (64 bits) at a time on a 64-bit boundary */	38	2: /* 2 elements (64 bits) at a time on a 64-bit boundary */
39	ld t0, (\in)	39	ld t0, (\in)
40	addi \out, \out, 8	40	addi \out, \out, 8

@@ -46,7 +46,7 @@ av_cold void rgb2rgb_init_riscv(void) · 45 unmodified lines
46	int flags = av_get_cpu_flags();	46	int flags = av_get_cpu_flags();
47		47
48	#if (__riscv_xlen == 64)	48	#if (__riscv_xlen == 64)
49	if ((flags & AV_CPU_FLAG_RVB_BASIC) && (flags & AV_CPU_FLAG_RVB_ADDR))	49	if (flags & AV_CPU_FLAG_RVB_BASIC)
50	shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;	50	shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;
51	#endif	51	#endif
52	#if HAVE_RVV	52	#if HAVE_RVV

 #include "libavutil/riscv/bswap_rvb.S"
 #if (__riscv_xlen >= 64)
-func ff_shuffle_bytes_3210_rvb, zba, zbb
+func ff_shuffle_bytes_3210_rvb, zbb
         lpad    0
-        srli    a2, a2, 2
         bswap32_rvb a1, a0, a2
 endfunc
 #endif

Keyboard shortcuts