Check __AVX512__ macro

kimwalisch · Apr 4, 2024 · 4ee88fb · 4ee88fb
1 parent c2dd191
commit 4ee88fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/include/primesieve/PrimeGenerator.hpp b/include/primesieve/PrimeGenerator.hpp
@@ -24,9 +24,10 @@
 #include <cstddef>
 
 #if defined(MULTIARCH_AVX512)
-  #if defined(__AVX512F__) && \
-      defined(__AVX512VBMI__) && \
-      defined(__AVX512VBMI2__)
+  #if defined(__AVX512__) || \
+      (defined(__AVX512F__) && \
+       defined(__AVX512VBMI__) && \
+       defined(__AVX512VBMI2__))
     // GCC/Clang function multiversioning for AVX512 is not needed if
     // the user compiles with -mavx512f -mavx512vbmi -mavx512vbmi2.
     // GCC/Clang function multiversioning generally causes a minor

diff --git a/src/PrimeGenerator.cpp b/src/PrimeGenerator.cpp
@@ -36,10 +36,11 @@
 #include <limits>
 
 // x86-64 AVX512
-#if defined(__AVX512F__) && \
-    defined(__AVX512VBMI__) && \
-    defined(__AVX512VBMI2__) && \
-    __has_include(<immintrin.h>)
+#if __has_include(<immintrin.h>) && \
+    (defined(__AVX512__) || \
+       (defined(__AVX512F__) && \
+        defined(__AVX512VBMI__) && \
+        defined(__AVX512VBMI2__)))
   #include <immintrin.h>
   #define HAS_AVX512_VBMI2