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 D530445B4F for ; Thu, 20 Apr 2023 17:54:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C14568BEEC; Thu, 20 Apr 2023 20:54:08 +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 D02ED68BDFB 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 0C67AC01C7 for ; Thu, 20 Apr 2023 20:53:58 +0300 (EEST) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 20:53:57 +0300 Message-Id: <20230420175357.33836-2-remi@remlab.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] riscv/intmath: use builtins for counting ones 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: 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. --- 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 */ -- 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".