From patchwork Thu Apr 20 17:53:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 41285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp700811pzb; Thu, 20 Apr 2023 10:54:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Ycjb+tHKKh7OSnHaW2ahtzkOjQD5EP6FFXisbAJwDiJB51w4q/BUKIsu3kOi3uVYkYIxAu X-Received: by 2002:a17:906:129b:b0:94f:317f:6a58 with SMTP id k27-20020a170906129b00b0094f317f6a58mr2151108ejb.35.1682013260301; Thu, 20 Apr 2023 10:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682013260; cv=none; d=google.com; s=arc-20160816; b=YNv18kFDEG5l4H/HddXyTzD/H5G1ivJdpnNU11U7VPmcD+KQVjfCQTFi7NgKxiwwh+ xref+e+U3kn3WcDZ+MFajzDZPpB9DdgYkEC8NMkE2KvAENdxlhvKROkxWJQow9SQeCRE 3IVMTQMT157nwNG4pBh8LV+CK1bnC3Um2S2cWjFumKXAGjWXiIluPZhrmUMNpUyQB/RW PEMYUbiwltgCbxbzTKb/54Ulgu5VvzPPLTtgxBmNadmsVi/SS99BZj5GVLMWXct6VFBc dmJOKSZsb7trCdLFWXcsOm95p857w5d3QHNNQrHRVsj3puIeJ13JQlXVk5IqsHlVcJUU rUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=G/D0R2EwUlifmDgk2NxkkFKKnYekJ9GV1hUFabOLMMY=; b=TchoYybUvy9ASvCCeHCyn0Y8LEWHiderySkPkCYWQnLDpOSKVjSBRiBMC3hDDjOZmI qTR6QW5YojuSNTB/wbfB+X9DA4GcFvi2EQInAW6+MvBSkPcdoCwGNawmo44+6dpKWVYB tBf4tnqiR6ZgJMQbEVKvxKt9eFv5uygZabeg6qNxwTUPkhySlcgLxPXBGoXuBqXhuiwS Ly6cPjOwxPs+TbqZnwM1faClXrcFfWv6Xt9BlZERjXmt38Cx87Jm05HzpIAJsXly4WKj H4yQpMlibT4+GyRSLb6pyk3G+f+AvBttiPxPhiuXHMsKsrRQZllgT4A/n+LxO9xdm1lL hFTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id we21-20020a170907235500b009537be42c08si1924858ejb.798.2023.04.20.10.54.19; Thu, 20 Apr 2023 10:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABB8568BF01; Thu, 20 Apr 2023 20:54:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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_Denis-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: afQ0juCgosqd 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 */