From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B961845F7B for ; Thu, 20 Apr 2023 17:54:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC894680463; Thu, 20 Apr 2023 20:54:05 +0300 (EEST) Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDF7D680463 for ; Thu, 20 Apr 2023 20:53:58 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id C6268C01C6 for ; Thu, 20 Apr 2023 20:53:57 +0300 (EEST) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 20:53:56 +0300 Message-Id: <20230420175357.33836-1-remi@remlab.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] riscv/bswap: use compiler builtins X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: av_bswapXX() are used in context that expect exact size types, notably variable arguments to av_log(). On Linux RV64, uint_fast32_t is an unsigned long, so the current inline assembler does not work properly. Since GCC and Clang gained their byte-swap built-ins before they supported RISC-V, we can simply defer to them. As an added bonus, the compiler can do instruction scheduling, which it couldn't with the Zbb inline assembler. --- libavutil/riscv/bswap.h | 52 ++++------------------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/libavutil/riscv/bswap.h b/libavutil/riscv/bswap.h index de1429c0f7..ce75de974e 100644 --- a/libavutil/riscv/bswap.h +++ b/libavutil/riscv/bswap.h @@ -23,52 +23,10 @@ #include "config.h" #include "libavutil/attributes.h" -#if defined (__riscv_zbb) && (__riscv_zbb > 0) && HAVE_INLINE_ASM +#if defined (__GNUC__) || defined (__clang__) +#define av_bswap16 __builtin_bswap16 +#define av_bswap32 __builtin_bswap32 +#define av_bswap64 __builtin_bswap64 +#endif -static av_always_inline av_const uintptr_t av_bswap_xlen(uintptr_t x) -{ - uintptr_t y; - - __asm__("rev8 %0, %1" : "=r" (y) : "r" (x)); - return y; -} - -#define av_bswap16 av_bswap16 - -static av_always_inline av_const uint_fast16_t av_bswap16(uint_fast16_t x) -{ - return av_bswap_xlen(x) >> (__riscv_xlen - 16); -} - -#if (__riscv_xlen == 32) -#define av_bswap32 av_bswap_xlen -#define av_bswap64 av_bswap64 - -static av_always_inline av_const uint64_t av_bswap64(uint64_t x) -{ - return (((uint64_t)av_bswap32(x)) << 32) | av_bswap32(x >> 32); -} - -#else -#define av_bswap32 av_bswap32 - -static av_always_inline av_const uint_fast32_t av_bswap32(uint_fast32_t x) -{ - return av_bswap_xlen(x) >> (__riscv_xlen - 32); -} - -#if (__riscv_xlen == 64) -#define av_bswap64 av_bswap_xlen - -#else -#define av_bswap64 av_bswap64 - -static av_always_inline av_const uint_fast64_t av_bswap64(uint_fast64_t x) -{ - return av_bswap_xlen(x) >> (__riscv_xlen - 64); -} - -#endif /* __riscv_xlen > 64 */ -#endif /* __riscv_xlen > 32 */ -#endif /* __riscv_zbb */ #endif /* AVUTIL_RISCV_BSWAP_H */ -- 2.40.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".