From a66a083e82430797822ca97469a5b2f1a2c8a0a3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 22 Aug 2021 22:37:48 +1000 Subject: [PATCH] Have X86_FAMILY allow 32-bit x86, not just x86_64 Fixes #53 --- internal/cgen/base/fundamental-public.h | 14 +++++++++----- release/c/wuffs-unsupported-snapshot.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 2e68f5c0..90a5243d 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -76,15 +76,18 @@ // POPCNT. This is checked at runtime via cpuid, not at compile time. // // Likewise, "cpu_arch >= x86_avx2" also requires PCLMUL, POPCNT and SSE4.2. -#if defined(__x86_64__) && !defined(__native_client__) +#if defined(__i386__) || defined(__x86_64__) +#if !defined(__native_client__) #include #include +// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously). #define WUFFS_BASE__CPU_ARCH__X86_FAMILY -#endif // defined(__x86_64__) && !defined(__native_client__) +#endif // !defined(__native_client__) +#endif // defined(__i386__) || defined(__x86_64__) #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) -#if defined(_M_X64) +#if defined(_M_IX86) || defined(_M_X64) #if defined(__AVX__) || defined(__clang__) // We need for the __cpuid function. @@ -98,6 +101,7 @@ #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL +// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously). #define WUFFS_BASE__CPU_ARCH__X86_FAMILY #else // defined(__AVX__) || defined(__clang__) @@ -108,10 +112,10 @@ // For MSVC's cl.exe (unlike clang or gcc), SIMD capability is a compile-time // property of the source file (e.g. a /arch:AVX or -mavx compiler flag), not // of individual functions (that can be conditionally selected at runtime). -#pragma message("Wuffs with MSVC+X64 needs /arch:AVX for best performance") +#pragma message("Wuffs with MSVC+IX86/X64 needs /arch:AVX for best performance") #endif // defined(__AVX__) || defined(__clang__) -#endif // defined(_M_X64) +#endif // defined(_M_IX86) || defined(_M_X64) #endif // (#if-chain ref AVOID_CPU_ARCH_1) #endif // (#if-chain ref AVOID_CPU_ARCH_0) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 30b2f9fd..709ea263 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -131,15 +131,18 @@ extern "C" { // POPCNT. This is checked at runtime via cpuid, not at compile time. // // Likewise, "cpu_arch >= x86_avx2" also requires PCLMUL, POPCNT and SSE4.2. -#if defined(__x86_64__) && !defined(__native_client__) +#if defined(__i386__) || defined(__x86_64__) +#if !defined(__native_client__) #include #include +// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously). #define WUFFS_BASE__CPU_ARCH__X86_FAMILY -#endif // defined(__x86_64__) && !defined(__native_client__) +#endif // !defined(__native_client__) +#endif // defined(__i386__) || defined(__x86_64__) #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) -#if defined(_M_X64) +#if defined(_M_IX86) || defined(_M_X64) #if defined(__AVX__) || defined(__clang__) // We need for the __cpuid function. @@ -153,6 +156,7 @@ extern "C" { #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL +// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously). #define WUFFS_BASE__CPU_ARCH__X86_FAMILY #else // defined(__AVX__) || defined(__clang__) @@ -163,10 +167,10 @@ extern "C" { // For MSVC's cl.exe (unlike clang or gcc), SIMD capability is a compile-time // property of the source file (e.g. a /arch:AVX or -mavx compiler flag), not // of individual functions (that can be conditionally selected at runtime). -#pragma message("Wuffs with MSVC+X64 needs /arch:AVX for best performance") +#pragma message("Wuffs with MSVC+IX86/X64 needs /arch:AVX for best performance") #endif // defined(__AVX__) || defined(__clang__) -#endif // defined(_M_X64) +#endif // defined(_M_IX86) || defined(_M_X64) #endif // (#if-chain ref AVOID_CPU_ARCH_1) #endif // (#if-chain ref AVOID_CPU_ARCH_0)