From patchwork Fri May 3 17:15:19 2024 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: 48476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e687:b0:1af:836d:81b3 with SMTP id mz7csp740050pzb; Fri, 3 May 2024 10:15:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq+Vwfm/c68PR8l1cbvETdFsoTqUfXnm6Wac3hV08LlCkzidzNxt7zGYTZTACm6aDIPmGDlTff68hm0g47gyXeo7GMvl+sEryt2w== X-Google-Smtp-Source: AGHT+IGBqolCDOES0AHEqnnvRO6QMuJjiVg+76kHVPVSUU+HggMQUyk7LLTP+ZkIK/KoF+fKwzfO X-Received: by 2002:a05:6402:f1c:b0:572:58d3:a6bf with SMTP id i28-20020a0564020f1c00b0057258d3a6bfmr2603038eda.2.1714756541146; Fri, 03 May 2024 10:15:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714756541; cv=none; d=google.com; s=arc-20160816; b=C2z3Wv3/DecPr73LC3bzKhBS1QrSwl3MvFNbFlT3CWFMq446AV50tHsO0nKjj2vYKE ZCxNQ86oFGOmxxyWrnRcHrPMaiT/kjq6yX1ehU4uD4g5d+Cx+MBSuHDs43beEeSRiwKo lH+imNMvpFkXFVHzupK4ufduabco4dL86ut4+gSpk8euRGKppD1uZzuSQyQm14bUGLFJ TgEcFcDDNjmEnAVnoRXRyDJ36scVeCtmN0hTu7HzwJe3fBGC9R/R/UVXAeafKq/J2dDo VcuB5pqetATEk94Md93jqvcaQ7rlO/BhwoGOgeYVenIWO46Bak3rsALfTpogFAommIQQ /y7w== 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=SJ2u3nKyw3oVjbrIC+WYsENwbPzxlJX41J3QeHCKbNY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ooshxlM8BZiDIxxsK4mbJ1vFzyV0eudeAfYYcr+yX0fIFc1/Xnds3sITM3bN/dCJ4x 4++UYwvTm8mM0vwDdAg1JqaU2R7oaeEuli4f0v9lkUWlQjopcJUf60Wq2TeG4qoc6zqo ZV7tyzEbbmatSECzg2omvD7UCQzHmePnGsVFm5sDf8bH6Jux00anBaf1sc7lXTeU6mEO INhgORxHLkObiFnuapW4Kbkte0I5EWF/y68p6pk9cF7O2DxK4XW5CcE3ViN/hij5ebEq /AJlUPXGOqNQu58hFFyUQ/W6I7YtZKiXnWIJgFBnYlrzkRhCsmn56meWfhu0tzQegt/g 7asw==; dara=google.com 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 bl21-20020a056402211500b0056e6a7b3ad4si445342edb.129.2024.05.03.10.15.40; Fri, 03 May 2024 10:15:41 -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 ADAA968D6EB; Fri, 3 May 2024 20:15:28 +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 7A8B868D6C9 for ; Fri, 3 May 2024 20:15:21 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 59DB8C00AE for ; Fri, 3 May 2024 20:15:20 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 May 2024 20:15:19 +0300 Message-ID: <20240503171520.27795-1-remi@remlab.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavu/riscv: indent code 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: zipyhZuCjhxc This reindents code to prepare for the next changeset. No functional changes. --- libavutil/riscv/cpu.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c index 460d3e9f91..984293aef0 100644 --- a/libavutil/riscv/cpu.c +++ b/libavutil/riscv/cpu.c @@ -32,21 +32,23 @@ int ff_get_cpu_flags_riscv(void) { int ret = 0; #if HAVE_GETAUXVAL - const unsigned long hwcap = getauxval(AT_HWCAP); + { + const unsigned long hwcap = getauxval(AT_HWCAP); - if (hwcap & HWCAP_RV('I')) - ret |= AV_CPU_FLAG_RVI; - if (hwcap & HWCAP_RV('F')) - 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; + if (hwcap & HWCAP_RV('I')) + ret |= AV_CPU_FLAG_RVI; + if (hwcap & HWCAP_RV('F')) + 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; - /* 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 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; + } #endif #ifdef __riscv_i From patchwork Fri May 3 17:15:20 2024 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: 48475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e687:b0:1af:836d:81b3 with SMTP id mz7csp739945pzb; Fri, 3 May 2024 10:15:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZsfWV95oRrPPYgHtm9jJixfQqNM9M8ZOHMpcj3Mggdl1degq9VrW/SdsToTQ9HqcakT7sobrYp9uqk8SyvXR5/Fk3tIehxUvDmg== X-Google-Smtp-Source: AGHT+IG7D4hIdIcCq3i3poAXLN6wqA61xUXuNXY1m165QS50dySmmX+qbtMnt1PzCdwVGNAzQIm6 X-Received: by 2002:a50:a6ce:0:b0:572:b83e:e062 with SMTP id f14-20020a50a6ce000000b00572b83ee062mr5798753edc.3.1714756531682; Fri, 03 May 2024 10:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714756531; cv=none; d=google.com; s=arc-20160816; b=xjCQ7+ZlDLKdT6I62EMDzDZG2me6Er7hpKulpfV+i5+apJzgTWt7wCSSBqIbdZwJFV uuu5E/NqiIAiyVfelEeQPgQTFREEDPY1iC4sN+I4Xg4pQzgorapefpPM7Y3M0Crle6gp NFKgT63yhAQkoUHah+zVmG5WMymICO0dNXc4Ba+SL0buUpit0PEMWG/Gf1LjluvhTYpo inPsYo4QPzGQr0x/d2uY8Oc3Ub3YSnf5xB0+sRc+kEcXN+SRoOZZBPx5S8GzXcxqZdV+ IgoA1HklXRR5dawckzHIGZuOLlZnxdgjcwNGcUyX204X6xYMqYqSlBQlfCyFVNpJbEct 776g== 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=1AtLXQq4EXGR1dIr5YcHVghL+DKoDkkMcjQxX3ZNJq0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=g19MnJh/KjJ1XH/YEsi50Nx83Iji9m6wBvYaMMcbSv7zHpxZSyuopAw5M61xs2JVR/ 92QjPrAeL9pKPcmG5Sht1mD7InGjSMXGYAfLkz3hV9Dvt8wchJmMbvMIZ3x5Fn0+R7mR WdBoHSOEEDEO3guqVCxJpivNQ0ysHok3etmkYDvrujT5Y+MKdp51P+IjdvEOS6XAuIp0 JI6HBZtsNrzCpzQYaWhCQNQLUU99RmeJOgYJ8f/Umxo6KKDcR4r2ocYBqPxGB8rsOG0d mXFsXAWvwvnDkxtiN3+jZTipUILExsmfKEuzD4tJn0fTsLSylaA/MryYgXpxccg5LtrJ AVrg==; dara=google.com 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 w11-20020a05640234cb00b0056e03d5663esi396740edc.545.2024.05.03.10.15.31; Fri, 03 May 2024 10:15:31 -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 A17C868D6C9; Fri, 3 May 2024 20:15:27 +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 7B0C968D6CB for ; Fri, 3 May 2024 20:15:21 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 8D371C00BF for ; Fri, 3 May 2024 20:15:20 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 May 2024 20:15:20 +0300 Message-ID: <20240503171520.27795-2-remi@remlab.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavu/riscv: add hwprobe() for CPU detection 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: zM8eKzyXE+KL This adds the Linux-specific function call to detect CPU features. Unlike the more portable auxillary vector, this supports extensions other than single lettered ones. At this point, FFmpeg already needs this to detect Zba and Zbb at run-time, and probably will need it for Zvbb in the near future. Support will be available in glibc 2.40 onward. --- configure | 3 +++ libavutil/riscv/cpu.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/configure b/configure index ed74583a6f..bc8f40ed85 100755 --- a/configure +++ b/configure @@ -2298,6 +2298,7 @@ HEADERS_LIST=" OpenGL_gl3_h poll_h pthread_np_h + sys_hwprobe_h sys_param_h sys_resource_h sys_select_h @@ -5537,6 +5538,8 @@ elif enabled ppc; then elif enabled riscv; then + check_headers sys/hwprobe.h + if test_cpp_condition stddef.h "__riscv_zbb"; then enable fast_clz fi diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c index 984293aef0..c3683b06d0 100644 --- a/libavutil/riscv/cpu.c +++ b/libavutil/riscv/cpu.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _GNU_SOURCE #include "libavutil/cpu.h" #include "libavutil/cpu_internal.h" +#include "libavutil/macros.h" #include "libavutil/log.h" #include "config.h" @@ -27,10 +29,33 @@ #include #define HWCAP_RV(letter) (1ul << ((letter) - 'A')) #endif +#ifdef HAVE_SYS_HWPROBE_H +#include +#endif int ff_get_cpu_flags_riscv(void) { int ret = 0; +#ifdef HAVE_SYS_HWPROBE_H + struct riscv_hwprobe pairs[] = { + { RISCV_HWPROBE_KEY_BASE_BEHAVIOR, 0 }, + { RISCV_HWPROBE_KEY_IMA_EXT_0, 0 }, + }; + + if (__riscv_hwprobe(pairs, FF_ARRAY_ELEMS(pairs), 0, NULL, 0) == 0) { + if (pairs[0].value & RISCV_HWPROBE_BASE_BEHAVIOR_IMA) + ret |= AV_CPU_FLAG_RVI; + if (pairs[1].value & RISCV_HWPROBE_IMA_FD) + ret |= AV_CPU_FLAG_RVF | AV_CPU_FLAG_RVD; + if (pairs[1].value & RISCV_HWPROBE_IMA_V) + ret |= AV_CPU_FLAG_RVV_I32 | AV_CPU_FLAG_RVV_I64 + | AV_CPU_FLAG_RVV_F32 | AV_CPU_FLAG_RVV_F64; + if (pairs[1].value & RISCV_HWPROBE_EXT_ZBA) + ret |= AV_CPU_FLAG_RVB_ADDR; + if (pairs[1].value & RISCV_HWPROBE_EXT_ZBB) + ret |= AV_CPU_FLAG_RVB_BASIC; + } else +#endif #if HAVE_GETAUXVAL { const unsigned long hwcap = getauxval(AT_HWCAP);