diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 892126cc..2e68f5c0 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -79,7 +79,7 @@ #if defined(__x86_64__) && !defined(__native_client__) #include #include -#define WUFFS_BASE__CPU_ARCH__X86_64 +#define WUFFS_BASE__CPU_ARCH__X86_FAMILY #endif // defined(__x86_64__) && !defined(__native_client__) #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) @@ -98,7 +98,7 @@ #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL -#define WUFFS_BASE__CPU_ARCH__X86_64 +#define WUFFS_BASE__CPU_ARCH__X86_FAMILY #else // defined(__AVX__) || defined(__clang__) @@ -150,7 +150,7 @@ wuffs_base__cpu_arch__have_arm_neon() { static inline bool // wuffs_base__cpu_arch__have_x86_avx2() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_AVX2 = (1 << 5) const unsigned int avx2_ebx7 = 0x00000020; @@ -190,13 +190,13 @@ wuffs_base__cpu_arch__have_x86_avx2() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } static inline bool // wuffs_base__cpu_arch__have_x86_bmi2() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_BMI2 = (1 << 8) const unsigned int bmi2_ebx7 = 0x00000100; @@ -220,13 +220,13 @@ wuffs_base__cpu_arch__have_x86_bmi2() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } static inline bool // wuffs_base__cpu_arch__have_x86_sse42() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_PCLMUL = (1 << 1) // - bit_POPCNT = (1 << 23) @@ -252,7 +252,7 @@ wuffs_base__cpu_arch__have_x86_sse42() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } diff --git a/internal/cgen/base/pixconv-submodule.c b/internal/cgen/base/pixconv-submodule.c index 0b3e66bd..842805f8 100644 --- a/internal/cgen/base/pixconv-submodule.c +++ b/internal/cgen/base/pixconv-submodule.c @@ -810,7 +810,7 @@ wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr, } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, @@ -854,7 +854,7 @@ wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, } return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -3133,7 +3133,7 @@ wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr, } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, @@ -3186,7 +3186,7 @@ wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -3845,7 +3845,7 @@ wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over( } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, @@ -3892,7 +3892,7 @@ wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -4180,7 +4180,7 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__RGBX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__xxxx__y__sse42; } @@ -4563,7 +4563,7 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__RGBX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; } @@ -4638,7 +4638,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -4819,7 +4819,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul( case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -4887,7 +4887,7 @@ wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__BGRX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; } @@ -4938,7 +4938,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul( case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -5049,7 +5049,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul( case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 0524bbf5..8f50d1a5 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -277,15 +277,15 @@ func cpuArchCNames(asserts []*a.Node) (caMacro string, caName string, caAttribut caMacro, caName, caAttribute = "ARM_NEON", "arm_neon", "" case t.IDX86SSE42: caMacro, caName, caAttribute = - "X86_64", "x86_sse42", + "X86_FAMILY", "x86_sse42", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"pclmul,popcnt,sse4.2\")" case t.IDX86AVX2: caMacro, caName, caAttribute = - "X86_64", "x86_avx2", + "X86_FAMILY", "x86_avx2", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"pclmul,popcnt,sse4.2,avx2\")" case t.IDX86BMI2: caMacro, caName, caAttribute = - "X86_64", "x86_bmi2", + "X86_FAMILY", "x86_bmi2", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"bmi2\")" } } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0d2f31e6..30b2f9fd 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -134,7 +134,7 @@ extern "C" { #if defined(__x86_64__) && !defined(__native_client__) #include #include -#define WUFFS_BASE__CPU_ARCH__X86_64 +#define WUFFS_BASE__CPU_ARCH__X86_FAMILY #endif // defined(__x86_64__) && !defined(__native_client__) #elif defined(_MSC_VER) // (#if-chain ref AVOID_CPU_ARCH_1) @@ -153,7 +153,7 @@ extern "C" { #include // AVX, AVX2, FMA, POPCNT #include // SSE4.2 #include // AES, PCLMUL -#define WUFFS_BASE__CPU_ARCH__X86_64 +#define WUFFS_BASE__CPU_ARCH__X86_FAMILY #else // defined(__AVX__) || defined(__clang__) @@ -205,7 +205,7 @@ wuffs_base__cpu_arch__have_arm_neon() { static inline bool // wuffs_base__cpu_arch__have_x86_avx2() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_AVX2 = (1 << 5) const unsigned int avx2_ebx7 = 0x00000020; @@ -245,13 +245,13 @@ wuffs_base__cpu_arch__have_x86_avx2() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } static inline bool // wuffs_base__cpu_arch__have_x86_bmi2() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_BMI2 = (1 << 8) const unsigned int bmi2_ebx7 = 0x00000100; @@ -275,13 +275,13 @@ wuffs_base__cpu_arch__have_x86_bmi2() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } static inline bool // wuffs_base__cpu_arch__have_x86_sse42() { -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // GCC defines these macros but MSVC does not. // - bit_PCLMUL = (1 << 1) // - bit_POPCNT = (1 << 23) @@ -307,7 +307,7 @@ wuffs_base__cpu_arch__have_x86_sse42() { #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) return false; } @@ -15925,7 +15925,7 @@ wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr, } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, @@ -15969,7 +15969,7 @@ wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, } return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -18248,7 +18248,7 @@ wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr, } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, @@ -18301,7 +18301,7 @@ wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -18960,7 +18960,7 @@ wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over( } // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, @@ -19007,7 +19007,7 @@ wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, return len; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 static uint64_t // @@ -19295,7 +19295,7 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__RGBX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__xxxx__y__sse42; } @@ -19678,7 +19678,7 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__RGBX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; } @@ -19753,7 +19753,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -19934,7 +19934,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul( case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -20002,7 +20002,7 @@ wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: case WUFFS_BASE__PIXEL_FORMAT__BGRX: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; } @@ -20053,7 +20053,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul( case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -20164,7 +20164,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul( case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; } @@ -20647,12 +20647,12 @@ wuffs_adler32__hasher__up_arm_neon( wuffs_base__slice_u8 a_x); #endif // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_adler32__hasher__up_x86_sse42( wuffs_adler32__hasher* self, wuffs_base__slice_u8 a_x); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ---------------- VTables @@ -20768,7 +20768,7 @@ wuffs_adler32__hasher__update_u32( #if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_adler32__hasher__up_arm_neon : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_adler32__hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); @@ -20960,7 +20960,7 @@ wuffs_adler32__hasher__up_arm_neon( // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func adler32.hasher.up_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_adler32__hasher__up_x86_sse42( @@ -21046,7 +21046,7 @@ wuffs_adler32__hasher__up_x86_sse42( self->private_impl.f_state = (((v_s2 & 65535) << 16) | (v_s1 & 65535)); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) @@ -24826,19 +24826,19 @@ wuffs_crc32__ieee_hasher__up_arm_crc32( wuffs_base__slice_u8 a_x); #endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_crc32__ieee_hasher__up_x86_avx2( wuffs_crc32__ieee_hasher* self, wuffs_base__slice_u8 a_x); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_crc32__ieee_hasher__up_x86_sse42( wuffs_crc32__ieee_hasher* self, wuffs_base__slice_u8 a_x); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ---------------- VTables @@ -24952,10 +24952,10 @@ wuffs_crc32__ieee_hasher__update_u32( #if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) wuffs_base__cpu_arch__have_arm_crc32() ? &wuffs_crc32__ieee_hasher__up_arm_crc32 : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_avx2() ? &wuffs_crc32__ieee_hasher__up_x86_avx2 : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_crc32__ieee_hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); @@ -25145,7 +25145,7 @@ wuffs_crc32__ieee_hasher__up_arm_crc32( // ‼ WUFFS MULTI-FILE SECTION +x86_avx2 // -------- func crc32.ieee_hasher.up_x86_avx2 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static wuffs_base__empty_struct wuffs_crc32__ieee_hasher__up_x86_avx2( @@ -25258,13 +25258,13 @@ wuffs_crc32__ieee_hasher__up_x86_avx2( self->private_impl.f_state = (4294967295 ^ v_s); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_avx2 // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func crc32.ieee_hasher.up_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_crc32__ieee_hasher__up_x86_sse42( @@ -25377,7 +25377,7 @@ wuffs_crc32__ieee_hasher__up_x86_sse42( self->private_impl.f_state = (4294967295 ^ v_s); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) @@ -25502,13 +25502,13 @@ wuffs_deflate__decoder__init_huff( uint32_t a_n_codes1, uint32_t a_base_symbol); -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__status wuffs_deflate__decoder__decode_huffman_bmi2( wuffs_deflate__decoder* self, wuffs_base__io_buffer* a_dst, wuffs_base__io_buffer* a_src); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__status wuffs_deflate__decoder__decode_huffman_fast32( @@ -25738,7 +25738,7 @@ wuffs_deflate__decoder__transform_io( WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; self->private_impl.choosy_decode_huffman_fast64 = ( -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_bmi2() ? &wuffs_deflate__decoder__decode_huffman_bmi2 : #endif self->private_impl.choosy_decode_huffman_fast64); @@ -26631,7 +26631,7 @@ wuffs_deflate__decoder__init_huff( // ‼ WUFFS MULTI-FILE SECTION +x86_bmi2 // -------- func deflate.decoder.decode_huffman_bmi2 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("bmi2") static wuffs_base__status wuffs_deflate__decoder__decode_huffman_bmi2( @@ -26842,7 +26842,7 @@ wuffs_deflate__decoder__decode_huffman_bmi2( return status; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_bmi2 // -------- func deflate.decoder.decode_huffman_fast32 @@ -34932,36 +34932,36 @@ wuffs_png__decoder__filter_4_distance_4_fallback( wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_png__decoder__filter_1_distance_4_x86_sse42( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_png__decoder__filter_3_distance_4_x86_sse42( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_png__decoder__filter_4_distance_3_x86_sse42( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__empty_struct wuffs_png__decoder__filter_4_distance_4_x86_sse42( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) static wuffs_base__status wuffs_png__decoder__decode_ihdr( @@ -36169,7 +36169,7 @@ wuffs_png__decoder__filter_4_distance_4_fallback( // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func png.decoder.filter_1_distance_4_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_png__decoder__filter_1_distance_4_x86_sse42( @@ -36209,13 +36209,13 @@ wuffs_png__decoder__filter_1_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func png.decoder.filter_3_distance_4_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_png__decoder__filter_3_distance_4_x86_sse42( @@ -36314,13 +36314,13 @@ wuffs_png__decoder__filter_3_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func png.decoder.filter_4_distance_3_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_png__decoder__filter_4_distance_3_x86_sse42( @@ -36440,13 +36440,13 @@ wuffs_png__decoder__filter_4_distance_3_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func png.decoder.filter_4_distance_4_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static wuffs_base__empty_struct wuffs_png__decoder__filter_4_distance_4_x86_sse42( @@ -36544,7 +36544,7 @@ wuffs_png__decoder__filter_4_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 // -------- func png.decoder.set_quirk_enabled @@ -37228,7 +37228,7 @@ wuffs_png__decoder__choose_filter_implementations( #if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_4_distance_3_arm_neon : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_4_distance_3_x86_sse42 : #endif &wuffs_png__decoder__filter_4_distance_3_fallback); @@ -37237,7 +37237,7 @@ wuffs_png__decoder__choose_filter_implementations( #if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_1_distance_4_arm_neon : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_1_distance_4_x86_sse42 : #endif &wuffs_png__decoder__filter_1_distance_4_fallback); @@ -37245,7 +37245,7 @@ wuffs_png__decoder__choose_filter_implementations( #if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_3_distance_4_arm_neon : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_3_distance_4_x86_sse42 : #endif &wuffs_png__decoder__filter_3_distance_4_fallback); @@ -37253,7 +37253,7 @@ wuffs_png__decoder__choose_filter_implementations( #if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON) wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_4_distance_4_arm_neon : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_4_distance_4_x86_sse42 : #endif &wuffs_png__decoder__filter_4_distance_4_fallback);