[FFmpeg-cvslog] riscv/intmath: use builtins for counting ones
Rémi Denis-Courmont
git at videolan.org
Tue May 2 23:09:18 EEST 2023
ffmpeg | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr 20 20:53:57 2023 +0300| [0e580806d8f11ec494d74e32ff17d0068c50e1ff] | committer: Lynne
riscv/intmath: use builtins for counting ones
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e580806d8f11ec494d74e32ff17d0068c50e1ff
---
libavutil/riscv/intmath.h | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/libavutil/riscv/intmath.h b/libavutil/riscv/intmath.h
index 45bce9a0e7..ae9ee7775b 100644
--- a/libavutil/riscv/intmath.h
+++ b/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;
}
-#if defined (__riscv_zbb) && (__riscv_zbb > 0) && HAVE_INLINE_ASM
-
-#define av_popcount av_popcount_rvb
-static av_always_inline av_const int av_popcount_rvb(uint32_t x)
-{
- int ret;
-
+#if defined (__GNUC__) || defined (__clang__)
+#define av_popcount __builtin_popcount
#if (__riscv_xlen >= 64)
- __asm__ ("cpopw %0, %1\n" : "=r" (ret) : "r" (x));
+#define av_popcount64 __builtin_popcountl
#else
- __asm__ ("cpop %0, %1\n" : "=r" (ret) : "r" (x));
+#define av_popcount64 __builtin_popcountll
#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
- return ret;
-}
-#endif /* __riscv_xlen >= 64 */
-#endif /* __riscv_zbb */
#endif /* AVUTIL_RISCV_INTMATH_H */
More information about the ffmpeg-cvslog
mailing list