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 534414C5C2 for ; Tue, 30 Jul 2024 14:09:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7604468D775; Tue, 30 Jul 2024 17:08:58 +0300 (EEST) Received: from mailfish.xiph.org (mailfish.xiph.osuosl.org [140.211.166.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4883B68D65B for ; Tue, 30 Jul 2024 17:08:51 +0300 (EEST) Received: from localhost.localdomain (c-24-126-94-29.hsd1.va.comcast.net [24.126.94.29]) by mailfish.xiph.org (Postfix) with ESMTPSA id AFF049F81F; Tue, 30 Jul 2024 14:08:49 +0000 (UTC) From: "Nathan E. Egge" To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jul 2024 14:07:52 +0000 Message-ID: <20240730140751.5114-2-unlord@xiph.org> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/riscv: Fallback to getauxval() for cpu flags 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 Cc: "Nathan E. Egge" 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: Signed-off-by: Nathan E. Egge --- libavutil/riscv/cpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c index e035f4b024..13b939b9d9 100644 --- a/libavutil/riscv/cpu.c +++ b/libavutil/riscv/cpu.c @@ -90,7 +90,8 @@ int ff_get_cpu_flags_riscv(void) default: } } -#elif HAVE_GETAUXVAL +#endif +#if HAVE_GETAUXVAL { const unsigned long hwcap = getauxval(AT_HWCAP); @@ -100,14 +101,16 @@ int ff_get_cpu_flags_riscv(void) ret |= AV_CPU_FLAG_RVF; if (hwcap & HWCAP_RV('D')) ret |= AV_CPU_FLAG_RVD; - if (hwcap & HWCAP_RV('B')) - ret |= AV_CPU_FLAG_RVB_ADDR | AV_CPU_FLAG_RVB_BASIC | - AV_CPU_FLAG_RVB; /* The V extension implies all Zve* functional subsets */ if (hwcap & HWCAP_RV('V')) ret |= AV_CPU_FLAG_RVV_I32 | AV_CPU_FLAG_RVV_I64 | AV_CPU_FLAG_RVV_F32 | AV_CPU_FLAG_RVV_F64; + + /* The V extension implies Zb* on all existing hardware */ + if (hwcap & (HWCAP_RV('B') | HWCAP_RV('V'))) + ret |= AV_CPU_FLAG_RVB_ADDR | AV_CPU_FLAG_RVB_BASIC | + AV_CPU_FLAG_RVB; } #endif -- 2.45.1 _______________________________________________ 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".