har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riscv/intmath: use builtins for counting ones

Browse Source 
As with the earlier bswap change, all versions of GCC and Clang that
support RISC-V support the popcount built-ins, so we can just use them
instead of inline assembler.
This commit is contained in:
Rémi Denis-Courmont 2023-04-20 20:53:57 +03:00 committed by Lynne
parent 7dcb5e1ab0
commit 0e580806d8
1 changed files with 4 additions and 26 deletions

30
libavutil/riscv/intmath.h

@ -69,35 +69,13 @@ static av_always_inline av_const int av_clip_intp2_rvi(int a, int p)
return b; return b;
} }
#if defined (__riscv_zbb) && (__riscv_zbb > 0) && HAVE_INLINE_ASM #if defined (__GNUC__) || defined (__clang__)
#define av_popcount __builtin_popcount
#define av_popcount av_popcount_rvb
static av_always_inline av_const int av_popcount_rvb(uint32_t x)
{
int ret;
#if (__riscv_xlen >= 64) #if (__riscv_xlen >= 64)
__asm__ ("cpopw %0, %1\n" : "=r" (ret) : "r" (x)); #define av_popcount64 __builtin_popcountl
#else #else
__asm__ ("cpop %0, %1\n" : "=r" (ret) : "r" (x)); #define av_popcount64 __builtin_popcountll
#endif #endif
return ret;
}
#if (__riscv_xlen >= 64)
#define av_popcount64 av_popcount64_rvb
static av_always_inline av_const int av_popcount64_rvb(uint64_t x)
{
int ret;
#if (__riscv_xlen >= 128)
__asm__ ("cpopd %0, %1\n" : "=r" (ret) : "r" (x));
#else
__asm__ ("cpop %0, %1\n" : "=r" (ret) : "r" (x));
#endif #endif
return ret;
}
#endif /* __riscv_xlen >= 64 */
#endif /* __riscv_zbb */
#endif /* AVUTIL_RISCV_INTMATH_H */ #endif /* AVUTIL_RISCV_INTMATH_H */