diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 0daada75..e03f6ed8 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -119,11 +119,13 @@ #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) #if defined(_M_X64) -#if defined(__AVX2__) || defined(__clang__) - // We need for the __cpuid function. #include -// That's not enough for X64 SIMD, with clang-cl, if we want to use +#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64 +#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V2 +#if defined(__AVX2__) || defined(__clang__) + +// intrin.h isn't enough for X64 SIMD, with clang-cl, if we want to use // "__attribute__((target(arg)))" without e.g. "/arch:AVX". // // Some web pages suggest that is all you need, as it pulls in @@ -132,8 +134,6 @@ #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL -#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64 -#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V2 #define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V3 #else // defined(__AVX2__) || defined(__clang__) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index fdd1d4c3..715c3d51 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -175,11 +175,13 @@ extern "C" { #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) #if defined(_M_X64) -#if defined(__AVX2__) || defined(__clang__) - // We need for the __cpuid function. #include -// That's not enough for X64 SIMD, with clang-cl, if we want to use +#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64 +#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V2 +#if defined(__AVX2__) || defined(__clang__) + +// intrin.h isn't enough for X64 SIMD, with clang-cl, if we want to use // "__attribute__((target(arg)))" without e.g. "/arch:AVX". // // Some web pages suggest that is all you need, as it pulls in @@ -188,8 +190,6 @@ extern "C" { #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL -#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64 -#define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V2 #define WUFFS_PRIVATE_IMPL__CPU_ARCH__X86_64_V3 #else // defined(__AVX2__) || defined(__clang__)