Change avx512vnni_vbmi to avx512vnni_bmi2

Author: junparser

include/xsimd/arch/xsimd_isa.hpp

@@ -100,7 +100,7 @@
 #include "./xsimd_avx512vnni_avx512bw.hpp"
 #endif
 
-#if XSIMD_WITH_AVX512VNNI_AVX512VBMI
+#if XSIMD_WITH_AVX512VNNI_AVX512VBMI2
 #include "./xsimd_avx512vnni_avx512vbmi.hpp"
 #endif
 

include/xsimd/config/xsimd_arch.hpp

@@ -162,7 +162,7 @@ namespace xsimd
     } // namespace detail
 
     using all_x86_architectures = arch_list<
-        avx512vnni<avx512vbmi>, avx512vbmi2, avx512vbmi, avx512ifma, avx512pf, avx512vnni<avx512bw>, avx512bw, avx512er, avx512dq, avx512cd, avx512f,
+        avx512vnni<avx512vbmi2>, avx512vbmi2, avx512vbmi, avx512ifma, avx512pf, avx512vnni<avx512bw>, avx512bw, avx512er, avx512dq, avx512cd, avx512f,
         avxvnni, fma3<avx2>, avx2, fma3<avx>, avx, fma4, fma3<sse4_2>,
         sse4_2, sse4_1, /*sse4a,*/ ssse3, sse3, sse2>;
 

include/xsimd/config/xsimd_config.hpp

@@ -317,17 +317,17 @@
  */
 #ifdef __AVX512VNNI__
 
-#if XSIMD_WITH_AVX512VBMI
-#define XSIMD_WITH_AVX512VNNI_AVX512VBMI XSIMD_WITH_AVX512F
+#if XSIMD_WITH_AVX512VBMI2
+#define XSIMD_WITH_AVX512VNNI_AVX512VBMI2 XSIMD_WITH_AVX512F
 #define XSIMD_WITH_AVX512VNNI_AVX512BW XSIMD_WITH_AVX512F
 #else
-#define XSIMD_WITH_AVX512VNNI_AVX512VBMI 0
+#define XSIMD_WITH_AVX512VNNI_AVX512VBMI2 0
 #define XSIMD_WITH_AVX512VNNI_AVX512BW XSIMD_WITH_AVX512F
 #endif
 
 #else
 
-#define XSIMD_WITH_AVX512VNNI_AVX512VBMI 0
+#define XSIMD_WITH_AVX512VNNI_AVX512VBMI2 0
 #define XSIMD_WITH_AVX512VNNI_AVX512BW 0
 
 #endif

include/xsimd/config/xsimd_cpuid.hpp

@@ -73,7 +73,7 @@ namespace xsimd
             ARCH_FIELD(avx512vbmi)
             ARCH_FIELD(avx512vbmi2)
             ARCH_FIELD_EX(avx512vnni<::xsimd::avx512bw>, avx512vnni_bw)
-            ARCH_FIELD_EX(avx512vnni<::xsimd::avx512vbmi>, avx512vnni_vbmi)
+            ARCH_FIELD_EX(avx512vnni<::xsimd::avx512vbmi2>, avx512vnni_vbmi2)
             ARCH_FIELD(neon)
             ARCH_FIELD(neon64)
             ARCH_FIELD_EX(i8mm<::xsimd::neon64>, i8mm_neon64)
@@ -248,7 +248,7 @@ namespace xsimd
                 avx512vbmi = regs7[2] >> 1 & avx512_state_os_enabled;
                 avx512vbmi2 = regs7[2] >> 6 & avx512_state_os_enabled;
                 avx512vnni_bw = regs7[2] >> 11 & avx512_state_os_enabled;
-                avx512vnni_vbmi = avx512vbmi && avx512vnni_bw;
+                avx512vnni_vbmi2 = avx512vbmi2 && avx512vnni_bw;
 #endif
             }
         };

include/xsimd/types/xsimd_avx512vnni_avx512vbmi_register.hpp

@@ -9,10 +9,10 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
-#ifndef XSIMD_AVX512VNNI_AVX512VBMI_REGISTER_HPP
-#define XSIMD_AVX512VNNI_AVX512VBMI_REGISTER_HPP
+#ifndef XSIMD_AVX512VNNI_AVX512VBMI2_REGISTER_HPP
+#define XSIMD_AVX512VNNI_AVX512VBMI2_REGISTER_HPP
 
-#include "./xsimd_avx512vbmi_register.hpp"
+#include "./xsimd_avx512vbmi2_register.hpp"
 
 namespace xsimd
 {
@@ -25,29 +25,28 @@ namespace xsimd
      * AVX512VNNI instructions
      */
     template <>
-    struct avx512vnni<avx512vbmi> : avx512vbmi
+    struct avx512vnni<avx512vbmi2> : avx512vbmi2
     {
-        static constexpr bool supported() noexcept { return XSIMD_WITH_AVX512VNNI_AVX512VBMI; }
+        static constexpr bool supported() noexcept { return XSIMD_WITH_AVX512VNNI_AVX512VBMI2; }
         static constexpr bool available() noexcept { return true; }
-        static constexpr char const* name() noexcept { return "avx512vnni+avx512vbmi"; }
+        static constexpr char const* name() noexcept { return "avx512vnni+avx512vbmi2"; }
     };
 
-#if XSIMD_WITH_AVX512VNNI_AVX512VBMI
+#if XSIMD_WITH_AVX512VNNI_AVX512VBMI2
 
-#if !XSIMD_WITH_AVX512VBMI
-#error "architecture inconsistency: avx512vnni+avx512vbmi requires avx512vbmi"
+#if !XSIMD_WITH_AVX512VBMI2
+#error "architecture inconsistency: avx512vnni+avx512vbmi2 requires avx512vbmi2"
 #endif
 
     namespace types
     {
         template <class T>
-        struct get_bool_simd_register<T, avx512vnni<avx512vbmi>>
+        struct get_bool_simd_register<T, avx512vnni<avx512vbmi2>>
         {
             using type = simd_avx512_bool_register<T>;
         };
 
-        XSIMD_DECLARE_SIMD_REGISTER_ALIAS(avx512vnni<avx512vbmi>, avx512vbmi);
-
+        XSIMD_DECLARE_SIMD_REGISTER_ALIAS(avx512vnni<avx512vbmi2>, avx512vbmi2);
     }
 #endif
 }