Also check AVX512BW bit

aws · Sep 19, 2024 · 9cff9f8 · 9cff9f8
1 parent 5e504f7
commit 9cff9f8
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/crypto/fipsmodule/cpucap/internal.h b/crypto/fipsmodule/cpucap/internal.h
@@ -135,17 +135,15 @@ OPENSSL_INLINE int CRYPTO_is_VPCLMULQDQ_capable(void) {
   return (OPENSSL_ia32cap_get()[3] & (1u << (42 - 32))) != 0;
 }
 
-// AVX512VL  | AVX512_IFMA | AVX512DQ | AVX512F
-// 1u << 31  | 1u << 21    | 1u << 17 | 1u << 16
-// 1000_0000_0010_0011_0000_0000_0000_0000
-#define CPU_CAP_AVX512IFMA_BITFLAGS 0x80230000
+// AVX512VL  | AVX512BW | AVX512_IFMA | AVX512DQ | AVX512F
+// 1u << 31  | 1u << 30 | 1u << 21    | 1u << 17 | 1u << 16
+// 1100_0000_0010_0011_0000_0000_0000_0000
+#define CPU_CAP_AVX512IFMA_BITFLAGS 0xC0230000
 OPENSSL_INLINE int CRYPTO_is_AVX512IFMA_capable(void) {
-#ifdef _MSC_VER
-  return 0;
-#else
-  return (OPENSSL_ia32cap_get()[2] & CPU_CAP_AVX512IFMA_BITFLAGS) ==
-         CPU_CAP_AVX512IFMA_BITFLAGS;
-#endif
+    return 0;
+// TODO: Re-enable once we understand Windows test failures.
+//  return (OPENSSL_ia32cap_get()[2] & CPU_CAP_AVX512IFMA_BITFLAGS) ==
+//         CPU_CAP_AVX512IFMA_BITFLAGS;
 }
 
 OPENSSL_INLINE int CRYPTO_is_VBMI2_capable(void) {