diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 6388ae73..936cc749 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -275,17 +275,27 @@ func cpuArchCNames(asserts []*a.Node) (caMacro string, caName string, caAttribut caMacro, caName, caAttribute = "ARM_NEON", "arm_neon", "" case t.IDX86SSE42: caMacro, caName, caAttribute = - "X86_FAMILY", "x86_sse42", + "X86_64", // See the "X86_FAMILY" comment, below. + "x86_sse42", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"pclmul,popcnt,sse4.2\")" case t.IDX86AVX2: caMacro, caName, caAttribute = - "X86_64", "x86_avx2", + "X86_64", + "x86_avx2", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"pclmul,popcnt,sse4.2,avx2\")" case t.IDX86BMI2: caMacro, caName, caAttribute = - "X86_FAMILY", "x86_bmi2", + "X86_64", // See the "X86_FAMILY" comment, below. + "x86_bmi2", "WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(\"bmi2\")" } + + // "X86_FAMILY" (which covers both 32-bit and 64-bit x86) is + // technically correct, instead of "X86_64". But some intrinsics + // don't compile in 32-bit mode. It's not worth the hassle to + // support 32-bit x86 SIMD, so we gate on "X86_64" instead. + // + // https://github.com/google/wuffs/issues/145 } } return caMacro, caName, caAttribute, nil diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ceb4ff17..3ddb7280 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -29417,13 +29417,13 @@ 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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ---------------- VTables @@ -29574,7 +29574,7 @@ wuffs_adler32__hasher__update( #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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_adler32__hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); @@ -29804,7 +29804,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -29891,7 +29891,7 @@ wuffs_adler32__hasher__up_x86_sse42( self->private_impl.f_state = (((v_s2 & 65535u) << 16u) | (v_s1 & 65535u)); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) @@ -35690,13 +35690,13 @@ wuffs_crc32__ieee_hasher__up_x86_avx2( wuffs_base__slice_u8 a_x); #endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ---------------- VTables @@ -35848,7 +35848,7 @@ wuffs_crc32__ieee_hasher__update( #if defined(WUFFS_BASE__CPU_ARCH__X86_64) wuffs_base__cpu_arch__have_x86_avx2() ? &wuffs_crc32__ieee_hasher__up_x86_avx2 : #endif -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_crc32__ieee_hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); @@ -36196,7 +36196,7 @@ wuffs_crc32__ieee_hasher__up_x86_avx2( // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func crc32.ieee_hasher.up_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -36310,7 +36310,7 @@ wuffs_crc32__ieee_hasher__up_x86_sse42( self->private_impl.f_state = (4294967295u ^ v_s); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) @@ -36630,13 +36630,13 @@ wuffs_crc64__ecma_hasher__up__choosy_default( wuffs_crc64__ecma_hasher* self, wuffs_base__slice_u8 a_x); -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct wuffs_crc64__ecma_hasher__up_x86_sse42( wuffs_crc64__ecma_hasher* self, wuffs_base__slice_u8 a_x); -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ---------------- VTables @@ -36782,7 +36782,7 @@ wuffs_crc64__ecma_hasher__update( if (self->private_impl.f_state == 0u) { self->private_impl.choosy_up = ( -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_crc64__ecma_hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); @@ -36884,7 +36884,7 @@ wuffs_crc64__ecma_hasher__checksum_u64( // ‼ WUFFS MULTI-FILE SECTION +x86_sse42 // -------- func crc64.ecma_hasher.up_x86_sse42 -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -36979,7 +36979,7 @@ wuffs_crc64__ecma_hasher__up_x86_sse42( self->private_impl.f_state = (18446744073709551615u ^ v_s); return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC64) @@ -37118,14 +37118,14 @@ wuffs_deflate__decoder__init_huff( uint32_t a_n_codes1, uint32_t a_base_symbol); -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status @@ -37459,7 +37459,7 @@ wuffs_deflate__decoder__do_transform_io( WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; self->private_impl.choosy_decode_huffman_fast64 = ( -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) wuffs_base__cpu_arch__have_x86_bmi2() ? &wuffs_deflate__decoder__decode_huffman_bmi2 : #endif self->private_impl.choosy_decode_huffman_fast64); @@ -38348,7 +38348,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("bmi2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status @@ -38556,7 +38556,7 @@ wuffs_deflate__decoder__decode_huffman_bmi2( return status; } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ WUFFS MULTI-FILE SECTION -x86_bmi2 // -------- func deflate.decoder.decode_huffman_fast32 @@ -59434,40 +59434,40 @@ 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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) -#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE 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_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status @@ -60786,7 +60786,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -60827,13 +60827,13 @@ wuffs_png__decoder__filter_1_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ 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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -60933,13 +60933,13 @@ wuffs_png__decoder__filter_3_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ 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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -61060,13 +61060,13 @@ wuffs_png__decoder__filter_4_distance_3_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ 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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct @@ -61165,7 +61165,7 @@ wuffs_png__decoder__filter_4_distance_4_x86_sse42( } return wuffs_base__make_empty_struct(); } -#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64) // ‼ WUFFS MULTI-FILE SECTION -x86_sse42 // -------- func png.decoder.get_quirk @@ -61912,7 +61912,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) 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); @@ -61921,7 +61921,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) 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); @@ -61929,7 +61929,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) 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); @@ -61937,7 +61937,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_FAMILY) +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) 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);