From 44acd0e20a6a324e1c14a9cfae188a47839f24af Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 6 Mar 2021 11:20:50 +1100 Subject: [PATCH] Add std/crc32 ieee_hasher.up_x86_sse42 placeholder --- release/c/wuffs-unsupported-snapshot.c | 61 +++++++++++++++++++++++++- std/crc32/common_crc32.wuffs | 4 +- std/crc32/common_up_arm_crc32.wuffs | 3 +- std/crc32/common_up_x86_sse42.wuffs | 44 +++++++++++++++++++ 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 std/crc32/common_up_x86_sse42.wuffs diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ac2284ee..2b7eb1df 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -22174,6 +22174,13 @@ 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) +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) + // ---------------- VTables const wuffs_base__hasher_u32__func_ptrs @@ -22285,6 +22292,9 @@ wuffs_crc32__ieee_hasher__update_u32( self->private_impl.choosy_up = ( #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) + wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_crc32__ieee_hasher__up_x86_sse42 : #endif self->private_impl.choosy_up); } @@ -22402,8 +22412,8 @@ static wuffs_base__empty_struct wuffs_crc32__ieee_hasher__up_arm_crc32( wuffs_crc32__ieee_hasher* self, wuffs_base__slice_u8 a_x) { - uint32_t v_s = 0; wuffs_base__slice_u8 v_p = {0}; + uint32_t v_s = 0; v_s = (4294967295 ^ self->private_impl.f_state); while ((((uint64_t)(a_x.len)) > 0) && ((15 & ((uint32_t)(0xFFF & (uintptr_t)(a_x.ptr)))) != 0)) { @@ -22468,6 +22478,55 @@ wuffs_crc32__ieee_hasher__up_arm_crc32( } #endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) +// -------- func crc32.ieee_hasher.up_x86_sse42 + +#if defined(WUFFS_BASE__CPU_ARCH__X86_64) +#if defined(__GNUC__) +__attribute__((target("sse4.2"))) +#endif +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up_x86_sse42( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x) { + uint32_t v_s = 0; + wuffs_base__slice_u8 v_p = {0}; + + v_s = (4294967295 ^ self->private_impl.f_state); + while ((((uint64_t)(a_x.len)) > 0) && ((15 & ((uint32_t)(0xFFF & (uintptr_t)(a_x.ptr)))) != 0)) { + v_s = (WUFFS_CRC32__IEEE_TABLE[0][(((uint8_t)((v_s & 255))) ^ a_x.ptr[0])] ^ (v_s >> 8)); + a_x = wuffs_base__slice_u8__subslice_i(a_x, 1); + } + if (((uint64_t)(a_x.len)) < 64) { + { + wuffs_base__slice_u8 i_slice_p = a_x; + v_p.ptr = i_slice_p.ptr; + v_p.len = 1; + uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len; + while (v_p.ptr < i_end0_p) { + v_s = (WUFFS_CRC32__IEEE_TABLE[0][(((uint8_t)((v_s & 255))) ^ v_p.ptr[0])] ^ (v_s >> 8)); + v_p.ptr += 1; + } + v_p.len = 0; + } + self->private_impl.f_state = (4294967295 ^ v_s); + return wuffs_base__make_empty_struct(); + } + { + wuffs_base__slice_u8 i_slice_p = a_x; + v_p.ptr = i_slice_p.ptr; + v_p.len = 1; + uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len; + while (v_p.ptr < i_end0_p) { + v_s = (WUFFS_CRC32__IEEE_TABLE[0][(((uint8_t)((v_s & 255))) ^ v_p.ptr[0])] ^ (v_s >> 8)); + v_p.ptr += 1; + } + v_p.len = 0; + } + 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_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) diff --git a/std/crc32/common_crc32.wuffs b/std/crc32/common_crc32.wuffs index aaec989d..ae48e95f 100644 --- a/std/crc32/common_crc32.wuffs +++ b/std/crc32/common_crc32.wuffs @@ -25,7 +25,9 @@ pub func ieee_hasher.set_quirk_enabled!(quirk: base.u32, enabled: base.bool) { // C code, be "struct{ uint32_t checksum; wuffs_crc32__status status }"? pub func ieee_hasher.update_u32!(x: slice base.u8) base.u32 { if this.state == 0 { - choose up = [up_arm_crc32] + choose up = [ + up_arm_crc32, + up_x86_sse42] } this.up!(x: args.x) return this.state diff --git a/std/crc32/common_up_arm_crc32.wuffs b/std/crc32/common_up_arm_crc32.wuffs index 11ed882b..20b1ef4f 100644 --- a/std/crc32/common_up_arm_crc32.wuffs +++ b/std/crc32/common_up_arm_crc32.wuffs @@ -15,9 +15,10 @@ pri func ieee_hasher.up_arm_crc32!(x: slice base.u8), choose cpu_arch >= arm_crc32, { + var p : slice base.u8 + var util : base.arm_crc32_utility var s : base.arm_crc32_u32 - var p : slice base.u8 s = util.make_u32(a: 0xFFFF_FFFF ^ this.state) diff --git a/std/crc32/common_up_x86_sse42.wuffs b/std/crc32/common_up_x86_sse42.wuffs new file mode 100644 index 00000000..82373822 --- /dev/null +++ b/std/crc32/common_up_x86_sse42.wuffs @@ -0,0 +1,44 @@ +// Copyright 2021 The Wuffs Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +pri func ieee_hasher.up_x86_sse42!(x: slice base.u8), + choose cpu_arch >= x86_sse42, +{ + var s : base.u32 + var p : slice base.u8 + + s = 0xFFFF_FFFF ^ this.state + + // Align to a 16-byte boundary. + while (args.x.length() > 0) and ((15 & args.x.uintptr_low_12_bits()) <> 0) { + s = IEEE_TABLE[0][((s & 0xFF) as base.u8) ^ args.x[0]] ^ (s >> 8) + args.x = args.x[1 ..] + } endwhile + + // For short inputs, just do a simple loop. + if args.x.length() < 64 { + iterate (p = args.x)(length: 1, advance: 1, unroll: 1) { + s = IEEE_TABLE[0][((s & 0xFF) as base.u8) ^ p[0]] ^ (s >> 8) + } + this.state = 0xFFFF_FFFF ^ s + return nothing + } + + // Placeholder. + iterate (p = args.x)(length: 1, advance: 1, unroll: 1) { + s = IEEE_TABLE[0][((s & 0xFF) as base.u8) ^ p[0]] ^ (s >> 8) + } + + this.state = 0xFFFF_FFFF ^ s +}