virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

lavu/riscv: count bytes rather than words for bswap32

Browse Source 
This removes the dependency on Zba at essentially zero cost.
This commit is contained in:
Rémi Denis-Courmont
2024-07-27 14:55:04 +03:00
parent 5171baa228
commit bd0c3edb13
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/riscv/bswapdsp_init.c
View File

@@ -33,15 +33,15 @@ av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c)
#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)
c->bswap_buf = ff_bswap32_buf_rvb;
if (flags & AV_CPU_FLAG_RVB_BASIC)
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
}

3
libavcodec/riscv/bswapdsp_rvb.S
View File

@@ -23,8 +23,9 @@
#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

10
libavutil/riscv/bswap_rvb.S
View File

@@ -20,21 +20,21 @@
#if (__riscv_xlen >= 64)
.macro bswap32_rvb out, in, count
andi t0, \count, 4
andi t0, \count, 1
beqz t0, 1f
/* Align input to 64-bit */
lwu t0, (\in)
addi \out, \out, 4
rev8 t0, t0
addi \count, \count, -1
addi \count, \count, -4
srli t0, t0, __riscv_xlen - 32
addi \in, \in, 4
sw t0, -4(\out)
1:
andi t3, \count, -2
sh2add \count, \count, \out
andi t3, \count, -8
add \count, \count, \out
beqz t3, 3f
sh2add t3, t3, \out
add t3, t3, \out
2: /* 2 elements (64 bits) at a time on a 64-bit boundary */
ld t0, (\in)
addi \out, \out, 8

2
libswscale/riscv/rgb2rgb.c
View File

@@ -46,7 +46,7 @@ av_cold void rgb2rgb_init_riscv(void)
int flags = av_get_cpu_flags();
#if (__riscv_xlen == 64)
if ((flags & AV_CPU_FLAG_RVB_BASIC) && (flags & AV_CPU_FLAG_RVB_ADDR))
if (flags & AV_CPU_FLAG_RVB_BASIC)
shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb;
#endif
#if HAVE_RVV

3
libswscale/riscv/rgb2rgb_rvb.S
View File

@@ -23,9 +23,8 @@
#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