From 6bb493615b0ef35c98fc4aa4ec04f448788db6a5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 20 May 2025 22:18:11 +0100 Subject: [PATCH] lib/x86: drop any mention of `evex512` `-mavx*` set of options now enable `EVEX` where required without a separate flag. Let's drop explicit use of `-mevex512` as it was dropped in `gcc-16.` --- lib/x86/adler32_impl.h | 4 ++-- lib/x86/cpu_features.h | 9 --------- lib/x86/crc32_impl.h | 4 ++-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/x86/adler32_impl.h b/lib/x86/adler32_impl.h index cc118c76..74c7b312 100644 --- a/lib/x86/adler32_impl.h +++ b/lib/x86/adler32_impl.h @@ -82,7 +82,7 @@ */ # define adler32_x86_avx512_vl256_vnni adler32_x86_avx512_vl256_vnni # define SUFFIX _avx512_vl256_vnni -# define ATTRIBUTES _target_attribute("avx512bw,avx512vl,avx512vnni" NO_EVEX512) +# define ATTRIBUTES _target_attribute("avx512bw,avx512vl,avx512vnni") # define VL 32 # define USE_VNNI 1 # define USE_AVX512 1 @@ -94,7 +94,7 @@ */ # define adler32_x86_avx512_vl512_vnni adler32_x86_avx512_vl512_vnni # define SUFFIX _avx512_vl512_vnni -# define ATTRIBUTES _target_attribute("avx512bw,avx512vnni" EVEX512) +# define ATTRIBUTES _target_attribute("avx512bw,avx512vnni") # define VL 64 # define USE_VNNI 1 # define USE_AVX512 1 diff --git a/lib/x86/cpu_features.h b/lib/x86/cpu_features.h index f9d69d72..cb225b98 100644 --- a/lib/x86/cpu_features.h +++ b/lib/x86/cpu_features.h @@ -165,15 +165,6 @@ static inline u32 get_x86_cpu_features(void) { return 0; } # define HAVE_AVXVNNI(features) ((features) & X86_CPU_FEATURE_AVXVNNI) #endif -#if ((GCC_PREREQ(14, 0) && !(GCC_PREREQ(16, 0))) || CLANG_PREREQ(18, 0, 18000000)) \ - && !defined(__EVEX512__) /* avoid subtracting the evex512 feature */ -# define EVEX512 ",evex512" /* needed to override potential -mno-evex512 */ -# define NO_EVEX512 ",no-evex512" -#else -# define EVEX512 "" -# define NO_EVEX512 "" -#endif - #endif /* ARCH_X86_32 || ARCH_X86_64 */ #endif /* LIB_X86_CPU_FEATURES_H */ diff --git a/lib/x86/crc32_impl.h b/lib/x86/crc32_impl.h index 47551c5f..50ea52bb 100644 --- a/lib/x86/crc32_impl.h +++ b/lib/x86/crc32_impl.h @@ -104,7 +104,7 @@ static const u8 MAYBE_UNUSED shift_tab[48] = { */ # define crc32_x86_vpclmulqdq_avx512_vl256 crc32_x86_vpclmulqdq_avx512_vl256 # define SUFFIX _vpclmulqdq_avx512_vl256 -# define ATTRIBUTES _target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl" NO_EVEX512) +# define ATTRIBUTES _target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl") # define VL 32 # define USE_AVX512 1 # include "crc32_pclmul_template.h" @@ -117,7 +117,7 @@ static const u8 MAYBE_UNUSED shift_tab[48] = { */ # define crc32_x86_vpclmulqdq_avx512_vl512 crc32_x86_vpclmulqdq_avx512_vl512 # define SUFFIX _vpclmulqdq_avx512_vl512 -# define ATTRIBUTES _target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl" EVEX512) +# define ATTRIBUTES _target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl") # define VL 64 # define USE_AVX512 1 # include "crc32_pclmul_template.h"