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 902F94666E for ; Tue, 30 May 2023 12:31:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A27668C222; Tue, 30 May 2023 15:30:54 +0300 (EEST) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EAAB68C1B8 for ; Tue, 30 May 2023 15:30:46 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-4f4b80bf93aso4813306e87.0 for ; Tue, 30 May 2023 05:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20221208.gappssmtp.com; s=20221208; t=1685449846; x=1688041846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CnfuONt0/CI6Q761wBnwtw9ynoX0vT8WN3wE6akqhE4=; b=aFXN3u61GJEKJBDSTrf3rYw/OMOggZ6QSDIWVSEAF0BPpbgDlgYhKbqxg6PhWxrriY LoXTmCVCsPLLWsXhd+99TFlC9DXd7tiRMmCyaJWpggPTD76gmQCPha1e2Zpo6LsY3yXQ ZoJotDlYWCWoAg6ZDUwCaGA6IW6rdO2BsHA/GPYsNHskoSXZvunHvyIMOwupqw9yoq7p 3x7dvhsnZv7obkoNzHw18ZZtIpaX7NMmV8tf2YAvvBiUy355EmOWD7f9yi+iF/zWDQgD 4qdjYnFaIY0oazX/4qtaeHO+tqUm1+msT352e7buHWS9s23YCi8nhSdqIEnIO5Fth4+z ahjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685449846; x=1688041846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CnfuONt0/CI6Q761wBnwtw9ynoX0vT8WN3wE6akqhE4=; b=Vx39DCf5xSMAZu8tyoscEeYoDhxpo+lN/xDBej8eXfnYr65Aur5X0GqvC4QiC1NHul 5/dh0kHmc9ks9b3lnApFu0ZrV+YefxFFjd0aJ2uinPXE9F+t37KHLBz1GzBXNsgNAMIX 5YqsaSIka+k5mdpVKOZxS2XtRVDPhte/WAYkJ/xyWfD7PZ3wQ9Yw4Ei0VYzRvidl5KpW 4k0MlrizERM671vVwpWu32KnBH2/yRAmLQC7/oV9oaFssQ9PLTU5UymJpuXkxs108gp0 LpNRcnzUttk6GdlpXl+YtZkaONiTS/58WPTrzzub4VSZ04ZPqPvxMsvjqsWSPE1OAzwg X3jQ== X-Gm-Message-State: AC+VfDza0YxTyxtCw1Kwte/4saqR18JVPv3YPPudpa601Q3X7iOGlO7c U8QBCuH/ekchbSV44ls8UFt0Hujwird/JLSGy+GNEA== X-Google-Smtp-Source: ACHHUZ7xpBcAEqxCuDrNJuwdc45BlODbKcH1HpBhZVhBo//yn1+Tpx5Gz72EQvevOc/QosOdt9pZdA== X-Received: by 2002:ac2:4d1a:0:b0:4f3:94b5:3272 with SMTP id r26-20020ac24d1a000000b004f394b53272mr604484lfi.11.1685449845834; Tue, 30 May 2023 05:30:45 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id c20-20020ac24154000000b004eb12850c40sm335078lfi.14.2023.05.30.05.30.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 30 May 2023 05:30:45 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2023 15:30:41 +0300 Message-Id: <20230530123043.52940-3-martin@martin.st> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230530123043.52940-1-martin@martin.st> References: <20230530123043.52940-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] aarch64: Add Linux runtime cpu feature detection using getauxval(AT_HWCAP) 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: Based partially on code by Janne Grunau. --- Updated to use both the direct HWCAP* macros and HWCAP_CPUID. A not unreasonably old distribution like Ubuntu 20.04 does have HWCAP_CPUID but not HWCAP2_I8MM in the distribution provided headers. Alternatively I guess we could carry our own fallback hardcoded values for the HWCAP* values we use and skip HWCAP_CPUID. --- configure | 2 ++ libavutil/aarch64/cpu.c | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/configure b/configure index 50eb27ba0e..b39de74de5 100755 --- a/configure +++ b/configure @@ -2209,6 +2209,7 @@ HAVE_LIST_PUB=" HEADERS_LIST=" arpa_inet_h + asm_hwcap_h asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h @@ -6432,6 +6433,7 @@ check_headers io.h enabled libdrm && check_headers linux/dma-buf.h +check_headers asm/hwcap.h check_headers linux/perf_event.h check_headers libcrystalhd/libcrystalhd_if.h check_headers malloc.h diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c index 0c76f5ad15..4563959ffd 100644 --- a/libavutil/aarch64/cpu.c +++ b/libavutil/aarch64/cpu.c @@ -20,6 +20,67 @@ #include "libavutil/cpu_internal.h" #include "config.h" +#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL && HAVE_ASM_HWCAP_H +#include +#include +#include + +#define get_cpu_feature_reg(reg, val) \ + __asm__("mrs %0, " #reg : "=r" (val)) + +static int detect_flags(void) +{ + int flags = 0; + unsigned long hwcap, hwcap2; + + // Check for support using direct individual HWCAPs + hwcap = getauxval(AT_HWCAP); +#ifdef HWCAP_ASIMDDP + if (hwcap & HWCAP_ASIMDDP) + flags |= AV_CPU_FLAG_DOTPROD; +#endif + +#ifdef AT_HWCAP2 + hwcap2 = getauxval(AT_HWCAP2); +#ifdef HWCAP2_I8MM + if (hwcap2 & HWCAP2_I8MM) + flags |= AV_CPU_FLAG_I8MM; +#endif +#endif + + // Silence warnings if none of the hwcaps to check are known. + (void)hwcap; + (void)hwcap2; + +#if defined(HWCAP_CPUID) + // The HWCAP_* defines for individual extensions may become available late, as + // they require updates to userland headers. As a fallback, see if we can access + // the CPUID registers (trapped via the kernel). + // See https://www.kernel.org/doc/html/latest/arm64/cpu-feature-registers.html + if (hwcap & HWCAP_CPUID) { + uint64_t tmp; + + get_cpu_feature_reg(ID_AA64ISAR0_EL1, tmp); + if (((tmp >> 44) & 0xf) == 0x1) + flags |= AV_CPU_FLAG_DOTPROD; + get_cpu_feature_reg(ID_AA64ISAR1_EL1, tmp); + if (((tmp >> 52) & 0xf) == 0x1) + flags |= AV_CPU_FLAG_I8MM; + } +#endif + + return flags; +} + +#else + +static int detect_flags(void) +{ + return 0; +} + +#endif + int ff_get_cpu_flags_aarch64(void) { int flags = AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 | @@ -33,6 +94,8 @@ int ff_get_cpu_flags_aarch64(void) flags |= AV_CPU_FLAG_I8MM; #endif + flags |= detect_flags(); + return flags; } -- 2.37.1 (Apple Git-137.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".