commit 5dfc913cb0c1bba57b926fd51c96b0cc5522dde7
author Nigel Tao <nigeltao@golang.org> Sun Jul 23 21:45:22 2023 +1000
committer Nigel Tao <nigeltao@golang.org> Sun Jul 23 21:48:33 2023 +1000
tree a982e720df4b98e596f504eb44f8c4e1d7cff5f5
parent e2b9566fc5b99012805a87c2ee972f6bc8a400df

base: let cpu_arch__have_x86_etc return true

internal/cgen/base/fundamental-public.h

diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h
index 617343a..81b6d26 100644
--- a/internal/cgen/base/fundamental-public.h
+++ b/internal/cgen/base/fundamental-public.h
@@ -163,6 +163,10 @@
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_avx2() {
+#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) && \
+    defined(__AVX2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
   // GCC defines these macros but MSVC does not.
   //  - bit_AVX2 = (1 <<  5)
@@ -205,10 +209,15 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
   return false;
+#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) &&
+        // defined(__AVX2__)
 }
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_bmi2() {
+#if defined(__BMI2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   // GCC defines these macros but MSVC does not.
   //  - bit_BMI2 = (1 <<  8)
@@ -235,10 +244,14 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   return false;
+#endif  // defined(__BMI2__)
 }
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_sse42() {
+#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   // GCC defines these macros but MSVC does not.
   //  - bit_PCLMUL = (1 <<  1)
@@ -267,6 +280,7 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   return false;
+#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
 }
 
 // ---------------- Fundamentals

release/c/wuffs-unsupported-snapshot.c

diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index cf5b53f..61e2ab3 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -219,6 +219,10 @@
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_avx2() {
+#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) && \
+    defined(__AVX2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
   // GCC defines these macros but MSVC does not.
   //  - bit_AVX2 = (1 <<  5)
@@ -261,10 +265,15 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
   return false;
+#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) &&
+        // defined(__AVX2__)
 }
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_bmi2() {
+#if defined(__BMI2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   // GCC defines these macros but MSVC does not.
   //  - bit_BMI2 = (1 <<  8)
@@ -291,10 +300,14 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   return false;
+#endif  // defined(__BMI2__)
 }
 
 static inline bool  //
 wuffs_base__cpu_arch__have_x86_sse42() {
+#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
+  return true;
+#else
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   // GCC defines these macros but MSVC does not.
   //  - bit_PCLMUL = (1 <<  1)
@@ -323,6 +336,7 @@
 #endif  // defined(__GNUC__); defined(_MSC_VER)
 #endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
   return false;
+#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
 }
 
 // ---------------- Fundamentals