From 1304ee6265c1aec79cef44b37db1ee3ce9b7e51b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 6 Oct 2023 13:10:47 +1100 Subject: [PATCH] std/xxhash64: add new package --- doc/changelog.md | 1 + doc/std/hashers.md | 1 + release/c/wuffs-unsupported-snapshot.c | 716 ++++++++++++++++++++++- script/checksum.go | 3 + std/xxhash32/common_xxhash32.wuffs | 3 +- std/xxhash64/common_xxhash64.wuffs | 336 +++++++++++ test/c/mimiclib/{xxhash32.c => xxhash.c} | 41 ++ test/c/std/xxhash32.c | 2 +- test/c/std/xxhash64.c | 367 ++++++++++++ test/c/testlib/testlib.c | 21 + 10 files changed, 1488 insertions(+), 3 deletions(-) create mode 100644 std/xxhash64/common_xxhash64.wuffs rename test/c/mimiclib/{xxhash32.c => xxhash.c} (56%) create mode 100644 test/c/std/xxhash64.c diff --git a/doc/changelog.md b/doc/changelog.md index 4c091126..e97348e7 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -16,6 +16,7 @@ The LICENSE has changed from a single license (Apache 2) to a dual license - Added `std/jpeg`. - Added `std/netpbm`. - Added `std/xxhash32`. +- Added `std/xxhash64`. - Added `wuffs_base__status__is_truncated_input_error`. - Changed `lzw.set_literal_width` to `lzw.set_quirk`. - Changed `set_quirk_enabled!(quirk: u32, enabled: bool)` to `set_quirk!(key: diff --git a/doc/std/hashers.md b/doc/std/hashers.md index 7038b151..609f5e43 100644 --- a/doc/std/hashers.md +++ b/doc/std/hashers.md @@ -45,6 +45,7 @@ calculating a 64-bit (not 32-bit) checksum. - [std/adler32](/std/adler32) - [std/crc32](/std/crc32) - [std/xxhash32](/std/xxhash32) +- [std/xxhash64](/std/xxhash64) ## Examples diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 489bca39..57c64814 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -12666,6 +12666,233 @@ struct wuffs_xxhash32__hasher__struct { #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH32) || defined(WUFFS_NONMONOLITHIC) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH64) || defined(WUFFS_NONMONOLITHIC) + +// ---------------- Status Codes + +// ---------------- Public Consts + +// ---------------- Struct Declarations + +typedef struct wuffs_xxhash64__hasher__struct wuffs_xxhash64__hasher; + +#ifdef __cplusplus +extern "C" { +#endif + +// ---------------- Public Initializer Prototypes + +// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self, +// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)". +// +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. +// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options. + +wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT +wuffs_xxhash64__hasher__initialize( + wuffs_xxhash64__hasher* self, + size_t sizeof_star_self, + uint64_t wuffs_version, + uint32_t options); + +size_t +sizeof__wuffs_xxhash64__hasher(); + +// ---------------- Allocs + +// These functions allocate and initialize Wuffs structs. They return NULL if +// memory allocation fails. If they return non-NULL, there is no need to call +// wuffs_foo__bar__initialize, but the caller is responsible for eventually +// calling free on the returned pointer. That pointer is effectively a C++ +// std::unique_ptr. + +wuffs_xxhash64__hasher* +wuffs_xxhash64__hasher__alloc(); + +static inline wuffs_base__hasher_u64* +wuffs_xxhash64__hasher__alloc_as__wuffs_base__hasher_u64() { + return (wuffs_base__hasher_u64*)(wuffs_xxhash64__hasher__alloc()); +} + +// ---------------- Upcasts + +static inline wuffs_base__hasher_u64* +wuffs_xxhash64__hasher__upcast_as__wuffs_base__hasher_u64( + wuffs_xxhash64__hasher* p) { + return (wuffs_base__hasher_u64*)p; +} + +// ---------------- Public Function Prototypes + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__get_quirk( + const wuffs_xxhash64__hasher* self, + uint32_t a_key); + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__status +wuffs_xxhash64__hasher__set_quirk( + wuffs_xxhash64__hasher* self, + uint32_t a_key, + uint64_t a_value); + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct +wuffs_xxhash64__hasher__update( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x); + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__update_u64( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x); + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__checksum_u64( + const wuffs_xxhash64__hasher* self); + +#ifdef __cplusplus +} // extern "C" +#endif + +// ---------------- Struct Definitions + +// These structs' fields, and the sizeof them, are private implementation +// details that aren't guaranteed to be stable across Wuffs versions. +// +// See https://en.wikipedia.org/wiki/Opaque_pointer#C + +#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) + +struct wuffs_xxhash64__hasher__struct { + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. + // + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + + struct { + uint32_t magic; + uint32_t active_coroutine; + wuffs_base__vtable vtable_for__wuffs_base__hasher_u64; + wuffs_base__vtable null_vtable; + + uint64_t f_length_modulo_u64; + bool f_length_overflows_u64; + uint8_t f_padding0; + uint8_t f_padding1; + uint8_t f_padding2; + uint32_t f_buf_len; + uint8_t f_buf_data[32]; + uint64_t f_v0; + uint64_t f_v1; + uint64_t f_v2; + uint64_t f_v3; + } private_impl; + +#ifdef __cplusplus +#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR) + using unique_ptr = std::unique_ptr; + + // On failure, the alloc_etc functions return nullptr. They don't throw. + + static inline unique_ptr + alloc() { + return unique_ptr(wuffs_xxhash64__hasher__alloc()); + } + + static inline wuffs_base__hasher_u64::unique_ptr + alloc_as__wuffs_base__hasher_u64() { + return wuffs_base__hasher_u64::unique_ptr( + wuffs_xxhash64__hasher__alloc_as__wuffs_base__hasher_u64()); + } +#endif // defined(WUFFS_BASE__HAVE_UNIQUE_PTR) + +#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION) + // Disallow constructing or copying an object via standard C++ mechanisms, + // e.g. the "new" operator, as this struct is intentionally opaque. Its total + // size and field layout is not part of the public, stable, memory-safe API. + // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and + // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as + // their first argument) rather than tweaking bar.private_impl.qux fields. + // + // In C, we can just leave wuffs_foo__bar as an incomplete type (unless + // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in + // order to provide convenience methods. These forward on "this", so that you + // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)". + wuffs_xxhash64__hasher__struct() = delete; + wuffs_xxhash64__hasher__struct(const wuffs_xxhash64__hasher__struct&) = delete; + wuffs_xxhash64__hasher__struct& operator=( + const wuffs_xxhash64__hasher__struct&) = delete; +#endif // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION) + +#if !defined(WUFFS_IMPLEMENTATION) + // As above, the size of the struct is not part of the public API, and unless + // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap + // allocated, not stack allocated. Its size is not intended to be known at + // compile time, but it is unfortunately divulged as a side effect of + // defining C++ convenience methods. Use "sizeof__T()", calling the function, + // instead of "sizeof T", invoking the operator. To make the two values + // different, so that passing the latter will be rejected by the initialize + // function, we add an arbitrary amount of dead weight. + uint8_t dead_weight[123000000]; // 123 MB. +#endif // !defined(WUFFS_IMPLEMENTATION) + + inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT + initialize( + size_t sizeof_star_self, + uint64_t wuffs_version, + uint32_t options) { + return wuffs_xxhash64__hasher__initialize( + this, sizeof_star_self, wuffs_version, options); + } + + inline wuffs_base__hasher_u64* + upcast_as__wuffs_base__hasher_u64() { + return (wuffs_base__hasher_u64*)this; + } + + inline uint64_t + get_quirk( + uint32_t a_key) const { + return wuffs_xxhash64__hasher__get_quirk(this, a_key); + } + + inline wuffs_base__status + set_quirk( + uint32_t a_key, + uint64_t a_value) { + return wuffs_xxhash64__hasher__set_quirk(this, a_key, a_value); + } + + inline wuffs_base__empty_struct + update( + wuffs_base__slice_u8 a_x) { + return wuffs_xxhash64__hasher__update(this, a_x); + } + + inline uint64_t + update_u64( + wuffs_base__slice_u8 a_x) { + return wuffs_xxhash64__hasher__update_u64(this, a_x); + } + + inline uint64_t + checksum_u64() const { + return wuffs_xxhash64__hasher__checksum_u64(this); + } + +#endif // __cplusplus +}; // struct wuffs_xxhash64__hasher__struct + +#endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) + +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH64) || defined(WUFFS_NONMONOLITHIC) + #if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // ---------------- Auxiliary - Base @@ -61522,14 +61749,15 @@ wuffs_xxhash32__hasher__checksum_u32( uint32_t v_n = 0; uint32_t v_buf_u32 = 0; - v_ret = self->private_impl.f_length_modulo_u32; if ((self->private_impl.f_length_modulo_u32 >= 16u) || self->private_impl.f_length_overflows_u32) { v_ret += (((uint32_t)(self->private_impl.f_v0 << 1u)) | (self->private_impl.f_v0 >> 31u)); v_ret += (((uint32_t)(self->private_impl.f_v1 << 7u)) | (self->private_impl.f_v1 >> 25u)); v_ret += (((uint32_t)(self->private_impl.f_v2 << 12u)) | (self->private_impl.f_v2 >> 20u)); v_ret += (((uint32_t)(self->private_impl.f_v3 << 18u)) | (self->private_impl.f_v3 >> 14u)); + v_ret += self->private_impl.f_length_modulo_u32; } else { v_ret += 374761393u; + v_ret += self->private_impl.f_length_modulo_u32; } v_n = 16u; v_n = wuffs_base__u32__min(v_n, ((uint32_t)(self->private_impl.f_buf_len))); @@ -61579,6 +61807,492 @@ wuffs_xxhash32__hasher__checksum_u32( #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH32) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH64) + +// ---------------- Status Codes Implementations + +// ---------------- Private Consts + +#define WUFFS_XXHASH64__XXH_PRIME64_1 11400714785074694791 + +#define WUFFS_XXHASH64__XXH_PRIME64_2 14029467366897019727 + +#define WUFFS_XXHASH64__XXH_PRIME64_3 1609587929392839161 + +#define WUFFS_XXHASH64__XXH_PRIME64_4 9650029242287828579 + +#define WUFFS_XXHASH64__XXH_PRIME64_5 2870177450012600261 + +#define WUFFS_XXHASH64__INITIAL_V0 6983438078262162902 + +#define WUFFS_XXHASH64__INITIAL_V1 14029467366897019727 + +#define WUFFS_XXHASH64__INITIAL_V2 0 + +#define WUFFS_XXHASH64__INITIAL_V3 7046029288634856825 + +// ---------------- Private Initializer Prototypes + +// ---------------- Private Function Prototypes + +WUFFS_BASE__GENERATED_C_CODE +static wuffs_base__empty_struct +wuffs_xxhash64__hasher__up( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x); + +// ---------------- VTables + +const wuffs_base__hasher_u64__func_ptrs +wuffs_xxhash64__hasher__func_ptrs_for__wuffs_base__hasher_u64 = { + (uint64_t(*)(const void*))(&wuffs_xxhash64__hasher__checksum_u64), + (uint64_t(*)(const void*, + uint32_t))(&wuffs_xxhash64__hasher__get_quirk), + (wuffs_base__status(*)(void*, + uint32_t, + uint64_t))(&wuffs_xxhash64__hasher__set_quirk), + (wuffs_base__empty_struct(*)(void*, + wuffs_base__slice_u8))(&wuffs_xxhash64__hasher__update), + (uint64_t(*)(void*, + wuffs_base__slice_u8))(&wuffs_xxhash64__hasher__update_u64), +}; + +// ---------------- Initializer Implementations + +wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT +wuffs_xxhash64__hasher__initialize( + wuffs_xxhash64__hasher* self, + size_t sizeof_star_self, + uint64_t wuffs_version, + uint32_t options){ + if (!self) { + return wuffs_base__make_status(wuffs_base__error__bad_receiver); + } + if (sizeof(*self) != sizeof_star_self) { + return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver); + } + if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || + (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) { + return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version); + } + + if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) { + // The whole point of this if-check is to detect an uninitialized *self. + // We disable the warning on GCC. Clang-5.0 does not have this warning. +#if !defined(__clang__) && defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + if (self->private_impl.magic != 0) { + return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed); + } +#if !defined(__clang__) && defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + } else { + if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { + memset(self, 0, sizeof(*self)); + options |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); + } + } + + self->private_impl.magic = WUFFS_BASE__MAGIC; + self->private_impl.vtable_for__wuffs_base__hasher_u64.vtable_name = + wuffs_base__hasher_u64__vtable_name; + self->private_impl.vtable_for__wuffs_base__hasher_u64.function_pointers = + (const void*)(&wuffs_xxhash64__hasher__func_ptrs_for__wuffs_base__hasher_u64); + return wuffs_base__make_status(NULL); +} + +wuffs_xxhash64__hasher* +wuffs_xxhash64__hasher__alloc() { + wuffs_xxhash64__hasher* x = + (wuffs_xxhash64__hasher*)(calloc(sizeof(wuffs_xxhash64__hasher), 1)); + if (!x) { + return NULL; + } + if (wuffs_xxhash64__hasher__initialize( + x, sizeof(wuffs_xxhash64__hasher), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) { + free(x); + return NULL; + } + return x; +} + +size_t +sizeof__wuffs_xxhash64__hasher() { + return sizeof(wuffs_xxhash64__hasher); +} + +// ---------------- Function Implementations + +// -------- func xxhash64.hasher.get_quirk + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__get_quirk( + const wuffs_xxhash64__hasher* self, + uint32_t a_key) { + if (!self) { + return 0; + } + if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && + (self->private_impl.magic != WUFFS_BASE__DISABLED)) { + return 0; + } + + return 0u; +} + +// -------- func xxhash64.hasher.set_quirk + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__status +wuffs_xxhash64__hasher__set_quirk( + wuffs_xxhash64__hasher* self, + uint32_t a_key, + uint64_t a_value) { + if (!self) { + return wuffs_base__make_status(wuffs_base__error__bad_receiver); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return wuffs_base__make_status( + (self->private_impl.magic == WUFFS_BASE__DISABLED) + ? wuffs_base__error__disabled_by_previous_error + : wuffs_base__error__initialize_not_called); + } + + return wuffs_base__make_status(wuffs_base__error__unsupported_option); +} + +// -------- func xxhash64.hasher.update + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct +wuffs_xxhash64__hasher__update( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x) { + if (!self) { + return wuffs_base__make_empty_struct(); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return wuffs_base__make_empty_struct(); + } + + if ((self->private_impl.f_length_modulo_u64 == 0u) && ! self->private_impl.f_length_overflows_u64) { + self->private_impl.f_v0 = 6983438078262162902u; + self->private_impl.f_v1 = 14029467366897019727u; + self->private_impl.f_v2 = 0u; + self->private_impl.f_v3 = 7046029288634856825u; + } + wuffs_xxhash64__hasher__up(self, a_x); + return wuffs_base__make_empty_struct(); +} + +// -------- func xxhash64.hasher.update_u64 + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__update_u64( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x) { + if (!self) { + return 0; + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return 0; + } + + wuffs_xxhash64__hasher__update(self, a_x); + return wuffs_xxhash64__hasher__checksum_u64(self); +} + +// -------- func xxhash64.hasher.up + +WUFFS_BASE__GENERATED_C_CODE +static wuffs_base__empty_struct +wuffs_xxhash64__hasher__up( + wuffs_xxhash64__hasher* self, + wuffs_base__slice_u8 a_x) { + uint64_t v_new_lmu = 0; + uint64_t v_buf_u64 = 0; + uint32_t v_buf_len = 0; + uint64_t v_v0 = 0; + uint64_t v_v1 = 0; + uint64_t v_v2 = 0; + uint64_t v_v3 = 0; + wuffs_base__slice_u8 v_p = {0}; + + v_new_lmu = ((uint64_t)(self->private_impl.f_length_modulo_u64 + ((uint64_t)(a_x.len)))); + self->private_impl.f_length_overflows_u64 = ((v_new_lmu < self->private_impl.f_length_modulo_u64) || self->private_impl.f_length_overflows_u64); + self->private_impl.f_length_modulo_u64 = v_new_lmu; + while (true) { + if (self->private_impl.f_buf_len >= 32u) { + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[0u])) | + (((uint64_t)(self->private_impl.f_buf_data[1u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[2u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[3u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[4u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[5u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[6u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[7u])) << 56u)); + v_v0 = ((uint64_t)(self->private_impl.f_v0 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v0 = (((uint64_t)(v_v0 << 31u)) | (v_v0 >> 33u)); + self->private_impl.f_v0 = ((uint64_t)(v_v0 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[8u])) | + (((uint64_t)(self->private_impl.f_buf_data[9u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[10u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[11u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[12u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[13u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[14u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[15u])) << 56u)); + v_v1 = ((uint64_t)(self->private_impl.f_v1 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v1 = (((uint64_t)(v_v1 << 31u)) | (v_v1 >> 33u)); + self->private_impl.f_v1 = ((uint64_t)(v_v1 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[16u])) | + (((uint64_t)(self->private_impl.f_buf_data[17u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[18u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[19u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[20u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[21u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[22u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[23u])) << 56u)); + v_v2 = ((uint64_t)(self->private_impl.f_v2 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v2 = (((uint64_t)(v_v2 << 31u)) | (v_v2 >> 33u)); + self->private_impl.f_v2 = ((uint64_t)(v_v2 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[24u])) | + (((uint64_t)(self->private_impl.f_buf_data[25u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[26u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[27u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[28u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[29u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[30u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[31u])) << 56u)); + v_v3 = ((uint64_t)(self->private_impl.f_v3 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v3 = (((uint64_t)(v_v3 << 31u)) | (v_v3 >> 33u)); + self->private_impl.f_v3 = ((uint64_t)(v_v3 * 11400714785074694791u)); + self->private_impl.f_buf_len = 0u; + break; + } + if (((uint64_t)(a_x.len)) <= 0u) { + return wuffs_base__make_empty_struct(); + } + self->private_impl.f_buf_data[self->private_impl.f_buf_len] = a_x.ptr[0u]; + self->private_impl.f_buf_len += 1u; + a_x = wuffs_base__slice_u8__subslice_i(a_x, 1u); + } + v_buf_len = (self->private_impl.f_buf_len & 31u); + v_v0 = self->private_impl.f_v0; + v_v1 = self->private_impl.f_v1; + v_v2 = self->private_impl.f_v2; + v_v3 = self->private_impl.f_v3; + { + wuffs_base__slice_u8 i_slice_p = a_x; + v_p.ptr = i_slice_p.ptr; + v_p.len = 32; + uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 32) * 32); + while (v_p.ptr < i_end0_p) { + v_buf_u64 = (((uint64_t)(v_p.ptr[0u])) | + (((uint64_t)(v_p.ptr[1u])) << 8u) | + (((uint64_t)(v_p.ptr[2u])) << 16u) | + (((uint64_t)(v_p.ptr[3u])) << 24u) | + (((uint64_t)(v_p.ptr[4u])) << 32u) | + (((uint64_t)(v_p.ptr[5u])) << 40u) | + (((uint64_t)(v_p.ptr[6u])) << 48u) | + (((uint64_t)(v_p.ptr[7u])) << 56u)); + v_v0 = ((uint64_t)(v_v0 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v0 = (((uint64_t)(v_v0 << 31u)) | (v_v0 >> 33u)); + v_v0 = ((uint64_t)(v_v0 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(v_p.ptr[8u])) | + (((uint64_t)(v_p.ptr[9u])) << 8u) | + (((uint64_t)(v_p.ptr[10u])) << 16u) | + (((uint64_t)(v_p.ptr[11u])) << 24u) | + (((uint64_t)(v_p.ptr[12u])) << 32u) | + (((uint64_t)(v_p.ptr[13u])) << 40u) | + (((uint64_t)(v_p.ptr[14u])) << 48u) | + (((uint64_t)(v_p.ptr[15u])) << 56u)); + v_v1 = ((uint64_t)(v_v1 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v1 = (((uint64_t)(v_v1 << 31u)) | (v_v1 >> 33u)); + v_v1 = ((uint64_t)(v_v1 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(v_p.ptr[16u])) | + (((uint64_t)(v_p.ptr[17u])) << 8u) | + (((uint64_t)(v_p.ptr[18u])) << 16u) | + (((uint64_t)(v_p.ptr[19u])) << 24u) | + (((uint64_t)(v_p.ptr[20u])) << 32u) | + (((uint64_t)(v_p.ptr[21u])) << 40u) | + (((uint64_t)(v_p.ptr[22u])) << 48u) | + (((uint64_t)(v_p.ptr[23u])) << 56u)); + v_v2 = ((uint64_t)(v_v2 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v2 = (((uint64_t)(v_v2 << 31u)) | (v_v2 >> 33u)); + v_v2 = ((uint64_t)(v_v2 * 11400714785074694791u)); + v_buf_u64 = (((uint64_t)(v_p.ptr[24u])) | + (((uint64_t)(v_p.ptr[25u])) << 8u) | + (((uint64_t)(v_p.ptr[26u])) << 16u) | + (((uint64_t)(v_p.ptr[27u])) << 24u) | + (((uint64_t)(v_p.ptr[28u])) << 32u) | + (((uint64_t)(v_p.ptr[29u])) << 40u) | + (((uint64_t)(v_p.ptr[30u])) << 48u) | + (((uint64_t)(v_p.ptr[31u])) << 56u)); + v_v3 = ((uint64_t)(v_v3 + ((uint64_t)(v_buf_u64 * 14029467366897019727u)))); + v_v3 = (((uint64_t)(v_v3 << 31u)) | (v_v3 >> 33u)); + v_v3 = ((uint64_t)(v_v3 * 11400714785074694791u)); + v_p.ptr += 32; + } + v_p.len = 1; + uint8_t* i_end1_p = i_slice_p.ptr + i_slice_p.len; + while (v_p.ptr < i_end1_p) { + self->private_impl.f_buf_data[v_buf_len] = v_p.ptr[0u]; + v_buf_len = ((v_buf_len + 1u) & 31u); + v_p.ptr += 1; + } + v_p.len = 0; + } + self->private_impl.f_buf_len = v_buf_len; + self->private_impl.f_v0 = v_v0; + self->private_impl.f_v1 = v_v1; + self->private_impl.f_v2 = v_v2; + self->private_impl.f_v3 = v_v3; + return wuffs_base__make_empty_struct(); +} + +// -------- func xxhash64.hasher.checksum_u64 + +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC uint64_t +wuffs_xxhash64__hasher__checksum_u64( + const wuffs_xxhash64__hasher* self) { + if (!self) { + return 0; + } + if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && + (self->private_impl.magic != WUFFS_BASE__DISABLED)) { + return 0; + } + + uint64_t v_ret = 0; + uint64_t v_v0 = 0; + uint64_t v_v1 = 0; + uint64_t v_v2 = 0; + uint64_t v_v3 = 0; + uint32_t v_i = 0; + uint32_t v_i8 = 0; + uint32_t v_n = 0; + uint32_t v_buf_u32 = 0; + uint64_t v_buf_u64 = 0; + + if ((self->private_impl.f_length_modulo_u64 >= 32u) || self->private_impl.f_length_overflows_u64) { + v_ret += (((uint64_t)(self->private_impl.f_v0 << 1u)) | (self->private_impl.f_v0 >> 63u)); + v_ret += (((uint64_t)(self->private_impl.f_v1 << 7u)) | (self->private_impl.f_v1 >> 57u)); + v_ret += (((uint64_t)(self->private_impl.f_v2 << 12u)) | (self->private_impl.f_v2 >> 52u)); + v_ret += (((uint64_t)(self->private_impl.f_v3 << 18u)) | (self->private_impl.f_v3 >> 46u)); + v_v0 = ((uint64_t)(self->private_impl.f_v0 * 14029467366897019727u)); + v_v0 = (((uint64_t)(v_v0 << 31u)) | (v_v0 >> 33u)); + v_v0 *= 11400714785074694791u; + v_v1 = ((uint64_t)(self->private_impl.f_v1 * 14029467366897019727u)); + v_v1 = (((uint64_t)(v_v1 << 31u)) | (v_v1 >> 33u)); + v_v1 *= 11400714785074694791u; + v_v2 = ((uint64_t)(self->private_impl.f_v2 * 14029467366897019727u)); + v_v2 = (((uint64_t)(v_v2 << 31u)) | (v_v2 >> 33u)); + v_v2 *= 11400714785074694791u; + v_v3 = ((uint64_t)(self->private_impl.f_v3 * 14029467366897019727u)); + v_v3 = (((uint64_t)(v_v3 << 31u)) | (v_v3 >> 33u)); + v_v3 *= 11400714785074694791u; + v_ret = ((uint64_t)(((uint64_t)((v_ret ^ v_v0) * 11400714785074694791u)) + 9650029242287828579u)); + v_ret = ((uint64_t)(((uint64_t)((v_ret ^ v_v1) * 11400714785074694791u)) + 9650029242287828579u)); + v_ret = ((uint64_t)(((uint64_t)((v_ret ^ v_v2) * 11400714785074694791u)) + 9650029242287828579u)); + v_ret = ((uint64_t)(((uint64_t)((v_ret ^ v_v3) * 11400714785074694791u)) + 9650029242287828579u)); + v_ret += self->private_impl.f_length_modulo_u64; + } else { + v_ret += 2870177450012600261u; + v_ret += self->private_impl.f_length_modulo_u64; + } + v_n = 32u; + v_n = wuffs_base__u32__min(v_n, self->private_impl.f_buf_len); + if (8u <= v_n) { + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[0u])) | + (((uint64_t)(self->private_impl.f_buf_data[1u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[2u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[3u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[4u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[5u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[6u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[7u])) << 56u)); + v_buf_u64 *= 14029467366897019727u; + v_buf_u64 = (((uint64_t)(v_buf_u64 << 31u)) | (v_buf_u64 >> 33u)); + v_buf_u64 *= 11400714785074694791u; + v_ret ^= v_buf_u64; + v_ret = (((uint64_t)(v_ret << 27u)) | (v_ret >> 37u)); + v_ret *= 11400714785074694791u; + v_ret += 9650029242287828579u; + v_i = 8u; + } + if (16u <= v_n) { + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[8u])) | + (((uint64_t)(self->private_impl.f_buf_data[9u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[10u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[11u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[12u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[13u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[14u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[15u])) << 56u)); + v_buf_u64 *= 14029467366897019727u; + v_buf_u64 = (((uint64_t)(v_buf_u64 << 31u)) | (v_buf_u64 >> 33u)); + v_buf_u64 *= 11400714785074694791u; + v_ret ^= v_buf_u64; + v_ret = (((uint64_t)(v_ret << 27u)) | (v_ret >> 37u)); + v_ret *= 11400714785074694791u; + v_ret += 9650029242287828579u; + v_i = 16u; + } + if (24u <= v_n) { + v_buf_u64 = (((uint64_t)(self->private_impl.f_buf_data[16u])) | + (((uint64_t)(self->private_impl.f_buf_data[17u])) << 8u) | + (((uint64_t)(self->private_impl.f_buf_data[18u])) << 16u) | + (((uint64_t)(self->private_impl.f_buf_data[19u])) << 24u) | + (((uint64_t)(self->private_impl.f_buf_data[20u])) << 32u) | + (((uint64_t)(self->private_impl.f_buf_data[21u])) << 40u) | + (((uint64_t)(self->private_impl.f_buf_data[22u])) << 48u) | + (((uint64_t)(self->private_impl.f_buf_data[23u])) << 56u)); + v_buf_u64 *= 14029467366897019727u; + v_buf_u64 = (((uint64_t)(v_buf_u64 << 31u)) | (v_buf_u64 >> 33u)); + v_buf_u64 *= 11400714785074694791u; + v_ret ^= v_buf_u64; + v_ret = (((uint64_t)(v_ret << 27u)) | (v_ret >> 37u)); + v_ret *= 11400714785074694791u; + v_ret += 9650029242287828579u; + v_i = 24u; + } + if ((v_n & 4u) != 0u) { + v_i8 = (v_i & 24u); + v_buf_u32 = (((uint32_t)(self->private_impl.f_buf_data[(v_i8 + 0u)])) | + (((uint32_t)(self->private_impl.f_buf_data[(v_i8 + 1u)])) << 8u) | + (((uint32_t)(self->private_impl.f_buf_data[(v_i8 + 2u)])) << 16u) | + (((uint32_t)(self->private_impl.f_buf_data[(v_i8 + 3u)])) << 24u)); + v_ret ^= ((uint64_t)(((uint64_t)(v_buf_u32)) * 11400714785074694791u)); + v_ret = (((uint64_t)(v_ret << 23u)) | (v_ret >> 41u)); + v_ret *= 14029467366897019727u; + v_ret += 1609587929392839161u; + v_i = (v_i8 + 4u); + } + while (v_i < v_n) { + v_ret ^= ((uint64_t)(((uint64_t)(self->private_impl.f_buf_data[v_i])) * 2870177450012600261u)); + v_ret = (((uint64_t)(v_ret << 11u)) | (v_ret >> 53u)); + v_ret *= 11400714785074694791u; + v_i += 1u; + } + v_ret ^= (v_ret >> 33u); + v_ret *= 14029467366897019727u; + v_ret ^= (v_ret >> 29u); + v_ret *= 1609587929392839161u; + v_ret ^= (v_ret >> 32u); + return ((uint64_t)(v_ret)); +} + +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH64) + #if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // ---------------- Auxiliary - Base diff --git a/script/checksum.go b/script/checksum.go index 00182b8b..3ce583b0 100644 --- a/script/checksum.go +++ b/script/checksum.go @@ -27,6 +27,7 @@ import ( "strings" "github.com/pierrec/xxHash/xxHash32" + "github.com/pierrec/xxHash/xxHash64" ) var ( @@ -76,6 +77,8 @@ func do(r io.Reader) error { h = crc32.NewIEEE() case "xxhash32": h = xxHash32.New(0) + case "xxhash64": + h = xxHash64.New(0) default: return fmt.Errorf("unknown algorithm %q", *algorithm) } diff --git a/std/xxhash32/common_xxhash32.wuffs b/std/xxhash32/common_xxhash32.wuffs index b7257ca4..47398430 100644 --- a/std/xxhash32/common_xxhash32.wuffs +++ b/std/xxhash32/common_xxhash32.wuffs @@ -186,14 +186,15 @@ pub func hasher.checksum_u32() base.u32 { var n : base.u32[..= 16] var buf_u32 : base.u32 - ret = this.length_modulo_u32 if (this.length_modulo_u32 >= 16) or this.length_overflows_u32 { ret ~mod+= (this.v0 ~mod<< 1) | (this.v0 >> 31) ret ~mod+= (this.v1 ~mod<< 7) | (this.v1 >> 25) ret ~mod+= (this.v2 ~mod<< 12) | (this.v2 >> 20) ret ~mod+= (this.v3 ~mod<< 18) | (this.v3 >> 14) + ret ~mod+= this.length_modulo_u32 } else { ret ~mod+= XXH_PRIME32_5 + ret ~mod+= this.length_modulo_u32 } n = 16 diff --git a/std/xxhash64/common_xxhash64.wuffs b/std/xxhash64/common_xxhash64.wuffs new file mode 100644 index 00000000..7047fcc4 --- /dev/null +++ b/std/xxhash64/common_xxhash64.wuffs @@ -0,0 +1,336 @@ +// Copyright 2023 The Wuffs Authors. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pri const XXH_PRIME64_1 : base.u64 = 0x9E37_79B1_85EB_CA87 +pri const XXH_PRIME64_2 : base.u64 = 0xC2B2_AE3D_27D4_EB4F +pri const XXH_PRIME64_3 : base.u64 = 0x1656_67B1_9E37_79F9 +pri const XXH_PRIME64_4 : base.u64 = 0x85EB_CA77_C2B2_AE63 +pri const XXH_PRIME64_5 : base.u64 = 0x27D4_EB2F_1656_67C5 + +pri const INITIAL_V0 : base.u64 = 0x60EA_27EE_ADC0_B5D6 // 0 + XXH_PRIME64_1 + XXH_PRIME64_2 +pri const INITIAL_V1 : base.u64 = 0xC2B2_AE3D_27D4_EB4F // 0 + XXH_PRIME64_2 +pri const INITIAL_V2 : base.u64 = 0x0000_0000_0000_0000 // 0 +pri const INITIAL_V3 : base.u64 = 0x61C8_864E_7A14_3579 // 0 - XXH_PRIME64_1 + +pub struct hasher? implements base.hasher_u64( + length_modulo_u64 : base.u64, + length_overflows_u64 : base.bool, + + padding0 : base.u8, + padding1 : base.u8, + padding2 : base.u8, + + buf_len : base.u32[..= 32], + buf_data : array[32] base.u8, + + v0 : base.u64, + v1 : base.u64, + v2 : base.u64, + v3 : base.u64, +) + +pub func hasher.get_quirk(key: base.u32) base.u64 { + return 0 +} + +pub func hasher.set_quirk!(key: base.u32, value: base.u64) base.status { + return base."#unsupported option" +} + +pub func hasher.update!(x: roslice base.u8) { + if (this.length_modulo_u64 == 0) and not this.length_overflows_u64 { + this.v0 = INITIAL_V0 + this.v1 = INITIAL_V1 + this.v2 = INITIAL_V2 + this.v3 = INITIAL_V3 + } + + this.up!(x: args.x) +} + +pub func hasher.update_u64!(x: roslice base.u8) base.u64 { + this.update!(x: args.x) + return this.checksum_u64() +} + +pri func hasher.up!(x: roslice base.u8) { + var new_lmu : base.u64 + var buf_u64 : base.u64 + var buf_len : base.u32[..= 31] + var v0 : base.u64 + var v1 : base.u64 + var v2 : base.u64 + var v3 : base.u64 + var p : roslice base.u8 + + new_lmu = this.length_modulo_u64 ~mod+ args.x.length() + this.length_overflows_u64 = (new_lmu < this.length_modulo_u64) or this.length_overflows_u64 + this.length_modulo_u64 = new_lmu + + while true { + if this.buf_len >= 32 { + buf_u64 = (this.buf_data[0x00] as base.u64) | + ((this.buf_data[0x01] as base.u64) << 8) | + ((this.buf_data[0x02] as base.u64) << 16) | + ((this.buf_data[0x03] as base.u64) << 24) | + ((this.buf_data[0x04] as base.u64) << 32) | + ((this.buf_data[0x05] as base.u64) << 40) | + ((this.buf_data[0x06] as base.u64) << 48) | + ((this.buf_data[0x07] as base.u64) << 56) + v0 = this.v0 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v0 = (v0 ~mod<< 31) | (v0 >> 33) + this.v0 = v0 ~mod* XXH_PRIME64_1 + + buf_u64 = (this.buf_data[0x08] as base.u64) | + ((this.buf_data[0x09] as base.u64) << 8) | + ((this.buf_data[0x0A] as base.u64) << 16) | + ((this.buf_data[0x0B] as base.u64) << 24) | + ((this.buf_data[0x0C] as base.u64) << 32) | + ((this.buf_data[0x0D] as base.u64) << 40) | + ((this.buf_data[0x0E] as base.u64) << 48) | + ((this.buf_data[0x0F] as base.u64) << 56) + v1 = this.v1 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v1 = (v1 ~mod<< 31) | (v1 >> 33) + this.v1 = v1 ~mod* XXH_PRIME64_1 + + buf_u64 = (this.buf_data[0x10] as base.u64) | + ((this.buf_data[0x11] as base.u64) << 8) | + ((this.buf_data[0x12] as base.u64) << 16) | + ((this.buf_data[0x13] as base.u64) << 24) | + ((this.buf_data[0x14] as base.u64) << 32) | + ((this.buf_data[0x15] as base.u64) << 40) | + ((this.buf_data[0x16] as base.u64) << 48) | + ((this.buf_data[0x17] as base.u64) << 56) + v2 = this.v2 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v2 = (v2 ~mod<< 31) | (v2 >> 33) + this.v2 = v2 ~mod* XXH_PRIME64_1 + + buf_u64 = (this.buf_data[0x18] as base.u64) | + ((this.buf_data[0x19] as base.u64) << 8) | + ((this.buf_data[0x1A] as base.u64) << 16) | + ((this.buf_data[0x1B] as base.u64) << 24) | + ((this.buf_data[0x1C] as base.u64) << 32) | + ((this.buf_data[0x1D] as base.u64) << 40) | + ((this.buf_data[0x1E] as base.u64) << 48) | + ((this.buf_data[0x1F] as base.u64) << 56) + v3 = this.v3 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v3 = (v3 ~mod<< 31) | (v3 >> 33) + this.v3 = v3 ~mod* XXH_PRIME64_1 + + this.buf_len = 0 + break + } + + if args.x.length() <= 0 { + return nothing + } + this.buf_data[this.buf_len] = args.x[0] + this.buf_len += 1 + args.x = args.x[1 ..] + } endwhile + + buf_len = this.buf_len & 31 + v0 = this.v0 + v1 = this.v1 + v2 = this.v2 + v3 = this.v3 + + iterate (p = args.x)(length: 32, advance: 32, unroll: 1) { + buf_u64 = (p[0x00] as base.u64) | + ((p[0x01] as base.u64) << 8) | + ((p[0x02] as base.u64) << 16) | + ((p[0x03] as base.u64) << 24) | + ((p[0x04] as base.u64) << 32) | + ((p[0x05] as base.u64) << 40) | + ((p[0x06] as base.u64) << 48) | + ((p[0x07] as base.u64) << 56) + v0 = v0 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v0 = (v0 ~mod<< 31) | (v0 >> 33) + v0 = v0 ~mod* XXH_PRIME64_1 + + buf_u64 = (p[0x08] as base.u64) | + ((p[0x09] as base.u64) << 8) | + ((p[0x0A] as base.u64) << 16) | + ((p[0x0B] as base.u64) << 24) | + ((p[0x0C] as base.u64) << 32) | + ((p[0x0D] as base.u64) << 40) | + ((p[0x0E] as base.u64) << 48) | + ((p[0x0F] as base.u64) << 56) + v1 = v1 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v1 = (v1 ~mod<< 31) | (v1 >> 33) + v1 = v1 ~mod* XXH_PRIME64_1 + + buf_u64 = (p[0x10] as base.u64) | + ((p[0x11] as base.u64) << 8) | + ((p[0x12] as base.u64) << 16) | + ((p[0x13] as base.u64) << 24) | + ((p[0x14] as base.u64) << 32) | + ((p[0x15] as base.u64) << 40) | + ((p[0x16] as base.u64) << 48) | + ((p[0x17] as base.u64) << 56) + v2 = v2 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v2 = (v2 ~mod<< 31) | (v2 >> 33) + v2 = v2 ~mod* XXH_PRIME64_1 + + buf_u64 = (p[0x18] as base.u64) | + ((p[0x19] as base.u64) << 8) | + ((p[0x1A] as base.u64) << 16) | + ((p[0x1B] as base.u64) << 24) | + ((p[0x1C] as base.u64) << 32) | + ((p[0x1D] as base.u64) << 40) | + ((p[0x1E] as base.u64) << 48) | + ((p[0x1F] as base.u64) << 56) + v3 = v3 ~mod+ (buf_u64 ~mod* XXH_PRIME64_2) + v3 = (v3 ~mod<< 31) | (v3 >> 33) + v3 = v3 ~mod* XXH_PRIME64_1 + + } else (length: 1, advance: 1, unroll: 1) { + this.buf_data[buf_len] = p[0] + buf_len = (buf_len + 1) & 31 + } + + this.buf_len = buf_len + this.v0 = v0 + this.v1 = v1 + this.v2 = v2 + this.v3 = v3 +} + +pub func hasher.checksum_u64() base.u64 { + var ret : base.u64 + var v0 : base.u64 + var v1 : base.u64 + var v2 : base.u64 + var v3 : base.u64 + var i : base.u32[..= 32] + var i8 : base.u32[..= 24] + var n : base.u32[..= 32] + var buf_u32 : base.u32 + var buf_u64 : base.u64 + + if (this.length_modulo_u64 >= 32) or this.length_overflows_u64 { + ret ~mod+= (this.v0 ~mod<< 1) | (this.v0 >> 63) + ret ~mod+= (this.v1 ~mod<< 7) | (this.v1 >> 57) + ret ~mod+= (this.v2 ~mod<< 12) | (this.v2 >> 52) + ret ~mod+= (this.v3 ~mod<< 18) | (this.v3 >> 46) + + v0 = this.v0 ~mod* XXH_PRIME64_2 + v0 = (v0 ~mod<< 31) | (v0 >> 33) + v0 ~mod*= XXH_PRIME64_1 + v1 = this.v1 ~mod* XXH_PRIME64_2 + v1 = (v1 ~mod<< 31) | (v1 >> 33) + v1 ~mod*= XXH_PRIME64_1 + v2 = this.v2 ~mod* XXH_PRIME64_2 + v2 = (v2 ~mod<< 31) | (v2 >> 33) + v2 ~mod*= XXH_PRIME64_1 + v3 = this.v3 ~mod* XXH_PRIME64_2 + v3 = (v3 ~mod<< 31) | (v3 >> 33) + v3 ~mod*= XXH_PRIME64_1 + + ret = ((ret ^ v0) ~mod* XXH_PRIME64_1) ~mod+ XXH_PRIME64_4 + ret = ((ret ^ v1) ~mod* XXH_PRIME64_1) ~mod+ XXH_PRIME64_4 + ret = ((ret ^ v2) ~mod* XXH_PRIME64_1) ~mod+ XXH_PRIME64_4 + ret = ((ret ^ v3) ~mod* XXH_PRIME64_1) ~mod+ XXH_PRIME64_4 + + ret ~mod+= this.length_modulo_u64 + } else { + ret ~mod+= XXH_PRIME64_5 + ret ~mod+= this.length_modulo_u64 + } + + n = 32 + n = n.min(no_more_than: this.buf_len) + + if 0x08 <= n { + buf_u64 = (this.buf_data[0x00] as base.u64) | + ((this.buf_data[0x01] as base.u64) << 8) | + ((this.buf_data[0x02] as base.u64) << 16) | + ((this.buf_data[0x03] as base.u64) << 24) | + ((this.buf_data[0x04] as base.u64) << 32) | + ((this.buf_data[0x05] as base.u64) << 40) | + ((this.buf_data[0x06] as base.u64) << 48) | + ((this.buf_data[0x07] as base.u64) << 56) + buf_u64 ~mod*= XXH_PRIME64_2 + buf_u64 = (buf_u64 ~mod<< 31) | (buf_u64 >> 33) + buf_u64 ~mod*= XXH_PRIME64_1 + ret ^= buf_u64 + ret = (ret ~mod<< 27) | (ret >> 37) + ret ~mod*= XXH_PRIME64_1 + ret ~mod+= XXH_PRIME64_4 + i = 0x08 + } + + if 0x10 <= n { + buf_u64 = (this.buf_data[0x08] as base.u64) | + ((this.buf_data[0x09] as base.u64) << 8) | + ((this.buf_data[0x0A] as base.u64) << 16) | + ((this.buf_data[0x0B] as base.u64) << 24) | + ((this.buf_data[0x0C] as base.u64) << 32) | + ((this.buf_data[0x0D] as base.u64) << 40) | + ((this.buf_data[0x0E] as base.u64) << 48) | + ((this.buf_data[0x0F] as base.u64) << 56) + buf_u64 ~mod*= XXH_PRIME64_2 + buf_u64 = (buf_u64 ~mod<< 31) | (buf_u64 >> 33) + buf_u64 ~mod*= XXH_PRIME64_1 + ret ^= buf_u64 + ret = (ret ~mod<< 27) | (ret >> 37) + ret ~mod*= XXH_PRIME64_1 + ret ~mod+= XXH_PRIME64_4 + i = 0x10 + } + + if 0x18 <= n { + buf_u64 = (this.buf_data[0x10] as base.u64) | + ((this.buf_data[0x11] as base.u64) << 8) | + ((this.buf_data[0x12] as base.u64) << 16) | + ((this.buf_data[0x13] as base.u64) << 24) | + ((this.buf_data[0x14] as base.u64) << 32) | + ((this.buf_data[0x15] as base.u64) << 40) | + ((this.buf_data[0x16] as base.u64) << 48) | + ((this.buf_data[0x17] as base.u64) << 56) + buf_u64 ~mod*= XXH_PRIME64_2 + buf_u64 = (buf_u64 ~mod<< 31) | (buf_u64 >> 33) + buf_u64 ~mod*= XXH_PRIME64_1 + ret ^= buf_u64 + ret = (ret ~mod<< 27) | (ret >> 37) + ret ~mod*= XXH_PRIME64_1 + ret ~mod+= XXH_PRIME64_4 + i = 0x18 + } + + if (n & 4) <> 0 { + i8 = i & 24 + buf_u32 = (this.buf_data[i8 + 0x00] as base.u32) | + ((this.buf_data[i8 + 0x01] as base.u32) << 8) | + ((this.buf_data[i8 + 0x02] as base.u32) << 16) | + ((this.buf_data[i8 + 0x03] as base.u32) << 24) + ret ^= (buf_u32 as base.u64) ~mod* XXH_PRIME64_1 + ret = (ret ~mod<< 23) | (ret >> 41) + ret ~mod*= XXH_PRIME64_2 + ret ~mod+= XXH_PRIME64_3 + i = i8 + 4 + } + + while i < n { + assert i < 32 via "a < b: a < c; c <= b"(c: n) + + ret ^= (this.buf_data[i] as base.u64) ~mod* XXH_PRIME64_5 + ret = (ret ~mod<< 11) | (ret >> 53) + ret ~mod*= XXH_PRIME64_1 + + i += 1 + } endwhile + + ret ^= ret >> 33 + ret ~mod*= XXH_PRIME64_2 + ret ^= ret >> 29 + ret ~mod*= XXH_PRIME64_3 + ret ^= ret >> 32 + + return ret as base.u64 +} diff --git a/test/c/mimiclib/xxhash32.c b/test/c/mimiclib/xxhash.c similarity index 56% rename from test/c/mimiclib/xxhash32.c rename to test/c/mimiclib/xxhash.c index 86830a73..4aa8c209 100644 --- a/test/c/mimiclib/xxhash32.c +++ b/test/c/mimiclib/xxhash.c @@ -9,6 +9,7 @@ #include "xxhash.h" uint32_t global_mimiclib_xxhash32_unused_u32; +uint64_t global_mimiclib_xxhash64_unused_u64; const char* // mimic_bench_xxhash32(wuffs_base__io_buffer* dst, @@ -45,7 +46,47 @@ mimic_bench_xxhash32(wuffs_base__io_buffer* dst, return NULL; } +const char* // +mimic_bench_xxhash64(wuffs_base__io_buffer* dst, + wuffs_base__io_buffer* src, + uint32_t wuffs_initialize_flags, + uint64_t wlimit, + uint64_t rlimit) { + XXH64_state_t* hasher = XXH64_createState(); + if (!hasher) { + return "libxxhash: XXH64_createState failed"; + } else if (XXH_OK != XXH64_reset(hasher, 0)) { + return "libxxhash: XXH64_reset failed"; + } + + global_mimiclib_xxhash64_unused_u64 = 0; + while (src->meta.ri < src->meta.wi) { + uint8_t* ptr = src->data.ptr + src->meta.ri; + size_t len = src->meta.wi - src->meta.ri; + if (len > 0x7FFFFFFF) { + return "src length is too large"; + } else if (len > rlimit) { + len = rlimit; + } + if (XXH_OK != XXH64_update(hasher, ptr, len)) { + return "libxxhash: XXH64_update failed"; + } + src->meta.ri += len; + } + global_mimiclib_xxhash64_unused_u64 = XXH64_digest(hasher); + + if (XXH_OK != XXH64_freeState(hasher)) { + return "libxxhash: XXH64_freeState failed"; + } + return NULL; +} + uint32_t // mimic_xxhash32_one_shot_checksum_u32(wuffs_base__slice_u8 data) { return XXH32(data.ptr, data.len, 0); } + +uint64_t // +mimic_xxhash64_one_shot_checksum_u64(wuffs_base__slice_u8 data) { + return XXH64(data.ptr, data.len, 0); +} diff --git a/test/c/std/xxhash32.c b/test/c/std/xxhash32.c index 45121257..02eccd0b 100644 --- a/test/c/std/xxhash32.c +++ b/test/c/std/xxhash32.c @@ -58,7 +58,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the #include "../../../release/c/wuffs-unsupported-snapshot.c" #include "../testlib/testlib.c" #ifdef WUFFS_MIMIC -#include "../mimiclib/xxhash32.c" +#include "../mimiclib/xxhash.c" #endif // ---------------- Golden Tests diff --git a/test/c/std/xxhash64.c b/test/c/std/xxhash64.c new file mode 100644 index 00000000..bde81f4b --- /dev/null +++ b/test/c/std/xxhash64.c @@ -0,0 +1,367 @@ +// Copyright 2023 The Wuffs Authors. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ---------------- + +/* +This test program is typically run indirectly, by the "wuffs test" or "wuffs +bench" commands. These commands take an optional "-mimic" flag to check that +Wuffs' output mimics (i.e. exactly matches) other libraries' output, such as +giflib for GIF, libpng for PNG, etc. + +To manually run this test: + +for CC in clang gcc; do + $CC -std=c99 -Wall -Werror xxhash64.c && ./a.out + rm -f a.out +done + +Each edition should print "PASS", amongst other information, and exit(0). + +Add the "wuffs mimic cflags" (everything after the colon below) to the C +compiler flags (after the .c file) to run the mimic tests. + +To manually run the benchmarks, replace "-Wall -Werror" with "-O3" and replace +the first "./a.out" with "./a.out -bench". Combine these changes with the +"wuffs mimic cflags" to run the mimic benchmarks. +*/ + +// ¿ wuffs mimic cflags: -DWUFFS_MIMIC -lxxhash + +// Wuffs ships as a "single file C library" or "header file library" as per +// https://github.com/nothings/stb/blob/master/docs/stb_howto.txt +// +// To use that single file as a "foo.c"-like implementation, instead of a +// "foo.h"-like header, #define WUFFS_IMPLEMENTATION before #include'ing or +// compiling it. +#define WUFFS_IMPLEMENTATION + +// Defining the WUFFS_CONFIG__MODULE* macros are optional, but it lets users of +// release/c/etc.c choose which parts of Wuffs to build. That file contains the +// entire Wuffs standard library, implementing a variety of codecs and file +// formats. Without this macro definition, an optimizing compiler or linker may +// very well discard Wuffs code for unused codecs, but listing the Wuffs +// modules we use makes that process explicit. Preprocessing means that such +// code simply isn't compiled. +#define WUFFS_CONFIG__MODULES +#define WUFFS_CONFIG__MODULE__BASE +#define WUFFS_CONFIG__MODULE__XXHASH64 + +// If building this program in an environment that doesn't easily accommodate +// relative includes, you can use the script/inline-c-relative-includes.go +// program to generate a stand-alone C file. +#include "../../../release/c/wuffs-unsupported-snapshot.c" +#include "../testlib/testlib.c" +#ifdef WUFFS_MIMIC +#include "../mimiclib/xxhash.c" +#endif + +// ---------------- Golden Tests + +golden_test g_xxhash64_midsummer_gt = { + .src_filename = "test/data/midsummer.txt", +}; + +golden_test g_xxhash64_pi_gt = { + .src_filename = "test/data/pi.txt", +}; + +// ---------------- XXHash64 Tests + +const char* // +test_wuffs_xxhash64_interface() { + CHECK_FOCUS(__func__); + wuffs_xxhash64__hasher h; + CHECK_STATUS("initialize", + wuffs_xxhash64__hasher__initialize( + &h, sizeof h, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + return do_test__wuffs_base__hasher_u64( + wuffs_xxhash64__hasher__upcast_as__wuffs_base__hasher_u64(&h), + "test/data/hat.lossy.webp", 0, SIZE_MAX, 0x85D813707FE352B7); +} + +const char* // +test_wuffs_xxhash64_golden() { + CHECK_FOCUS(__func__); + + struct { + const char* filename; + // The want values are determined by script/checksum.go. + uint64_t want; + } test_cases[] = { + { + .filename = "test/data/hat.bmp", + .want = 0xA7D576E6A9BAF900, + }, + { + .filename = "test/data/hat.gif", + .want = 0x38E8A7CAFE15E5B8, + }, + { + .filename = "test/data/hat.jpeg", + .want = 0x6B8E028CE8CC09AD, + }, + { + .filename = "test/data/hat.lossless.webp", + .want = 0xCA571B25E75792DA, + }, + { + .filename = "test/data/hat.lossy.webp", + .want = 0x85D813707FE352B7, + }, + { + .filename = "test/data/hat.png", + .want = 0x6096D53175D9C0B5, + }, + { + .filename = "test/data/hat.tiff", + .want = 0x2B7A9E69AEB07DD1, + }, + }; + + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = g_src_slice_u8, + }); + CHECK_STRING(read_file(&src, test_cases[tc].filename)); + + for (int j = 0; j < 2; j++) { + wuffs_xxhash64__hasher checksum; + CHECK_STATUS("initialize", + wuffs_xxhash64__hasher__initialize( + &checksum, sizeof checksum, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + + uint64_t have = 0; + size_t num_fragments = 0; + size_t num_bytes = 0; + do { + wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ + .ptr = src.data.ptr + num_bytes, + .len = src.meta.wi - num_bytes, + }); + size_t limit = 101 + 103 * num_fragments; + if ((j > 0) && (data.len > limit)) { + data.len = limit; + } + have = wuffs_xxhash64__hasher__update_u64(&checksum, data); + num_fragments++; + num_bytes += data.len; + } while (num_bytes < src.meta.wi); + + if (have != test_cases[tc].want) { + RETURN_FAIL("tc=%zu, j=%d, filename=\"%s\": have 0x%016" PRIX64 + ", want 0x%016" PRIX64 "\n", + tc, j, test_cases[tc].filename, have, test_cases[tc].want); + } + } + } + return NULL; +} + +const char* // +do_test_xxxxx_xxhash64_pi(bool mimic) { + const char* digits = + "3." + "141592653589793238462643383279502884197169399375105820974944592307816406" + "2862089986280348253421170"; + if (strlen(digits) != 99) { + RETURN_FAIL("strlen(digits): have %d, want 99", (int)(strlen(digits))); + } + + // The want values are determined by script/checksum.go. + // + // wants[i] is the checksum of the first i bytes of the digits string. + uint64_t wants[100] = { + 0xEF46DB3751D8E999, 0x26167C2AF5162CA4, 0x05BEDEA4D7DD3935, + 0x765F8073D4013B31, 0x3E160875545B6BE3, 0x0BC5FB5031C01569, + 0x7F4E574C0FE47F1B, 0xFD47EAC9931E5611, 0x9ECF69693F684A04, + 0x71C02736251798B6, 0x6C21272990F120AC, 0xE4727A188A905D0A, + 0x259CE02196F0FB6C, 0x5E34060EB8B01C23, 0xD13DA3CBF5A601C2, + 0xF127AEAAA3C7373B, 0xDB620698899E4B6D, 0x6E478EE5FA6DD2E9, + 0x1AE794F2917D2E95, 0x276ADD06C59EC853, 0x491CE0EDFE9825B0, + 0x6E74453240292289, 0x22B769287778C836, 0xBF35609B690EC521, + 0x33C6958E166EF7FB, 0xB68BFC69363BA321, 0xF80FA8B7954AEBFA, + 0x0BF5ACA4705A6293, 0x0556B78D45BCAAF2, 0xEE2CEF405184E046, + 0x73227D21D75B5FE8, 0xD0DF37F5BDB842D2, 0x28EE2A083406DB5A, + 0x374E44E23156B38C, 0x2337A79B3AE153E7, 0xF584A7417BA286F4, + 0x5E3C84336022F4D8, 0x59399EA49A971651, 0x2B320610ADC6F17F, + 0xC36EBC282E7312C2, 0x1C81100B2FE75440, 0x1372BAA075FFF382, + 0xE8937E82A1F75179, 0xBAC1E93B15E462CA, 0x562C0E62274601C0, + 0x6F4A0CB8ACFF7034, 0xEA51C1C9C8F23049, 0xCA413E3603CBDCCF, + 0xA7E5B91D287D545F, 0x1C323C89D01E9460, 0xA6DDEB12F0B41B72, + 0x4C4BD80B6559D8D2, 0x9D84AF3AF8CCF566, 0x1DAE74E2D7F65F4F, + 0x214AA9F23CF62937, 0xBA95E37E94F03C41, 0x00C40774F9799DE7, + 0x623CA815A53DC0A0, 0x2B966F603BAA005A, 0x4A7F01729330A03C, + 0x3AA3C3B6AF1ACE45, 0x8EEDAFF7174EBDC5, 0x78005039F4CEA4AA, + 0x4D36AAB2FCA2C150, 0xDDE323A66BF337F5, 0x6F7E47861B7A1277, + 0xB86088670CA3BAA8, 0x218C45C8727FBAA0, 0x76D3167331343EF7, + 0x78DF6DE9AADD9E63, 0x9DD67E3E0CCF388B, 0xB571630663016120, + 0x349C904FA4D6AFC9, 0xA4321D9FB73EC5D5, 0xA31CB6B845CF52B1, + 0xED771A139FE20B86, 0xC05857A1061CE915, 0xE1C69AF2BA7BE706, + 0x88DF0DDA58781E75, 0xBFE6E4B61B923F50, 0x2D1797888A57F9FC, + 0x37F0A88CB6BB2317, 0x1E5AF6EBC5D5CD77, 0xBCF0BB798CF609D2, + 0x6C74415B840C8F42, 0x5F92AC0AEFBB2A2A, 0xAEA80952AC83CDCC, + 0x148E6336080BC9FC, 0x440A9EAC0572D0BC, 0xBB2DCE23A2FCF164, + 0xC63F825E6738F990, 0x4F4B89A6AB0C59DF, 0x2B1B23B3AAE125F7, + 0x02AFCD3AA9D1B454, 0xFCEF5F3517819564, 0x54B73F4D8F06CD33, + 0x9B59C3BAA7819081, 0xF406BAA777860094, 0xC66B599CB8D22647, + 0x7DBC5F307AC4DB70, + }; + + for (int i = 0; i < 100; i++) { + uint64_t have = 0; + wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(digits), + .len = (size_t)(i), + }); + + if (mimic) { +#ifdef WUFFS_MIMIC + have = mimic_xxhash64_one_shot_checksum_u64(data); +#endif // WUFFS_MIMIC + + } else { + wuffs_xxhash64__hasher checksum; + CHECK_STATUS("initialize", + wuffs_xxhash64__hasher__initialize( + &checksum, sizeof checksum, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + have = wuffs_xxhash64__hasher__update_u64(&checksum, data); + } + + if (have != wants[i]) { + RETURN_FAIL("i=%d: have 0x%016" PRIX64 ", want 0x%016" PRIX64, i, have, + wants[i]); + } + } + return NULL; +} + +const char* // +test_wuffs_xxhash64_pi() { + CHECK_FOCUS(__func__); + return do_test_xxxxx_xxhash64_pi(false); +} + +// ---------------- Mimic Tests + +#ifdef WUFFS_MIMIC + +const char* // +test_mimic_xxhash64_pi() { + CHECK_FOCUS(__func__); + return do_test_xxxxx_xxhash64_pi(true); +} + +#endif // WUFFS_MIMIC + +// ---------------- XXHash64 Benches + +uint64_t g_wuffs_xxhash64_unused_u64; + +const char* // +wuffs_bench_xxhash64(wuffs_base__io_buffer* dst, + wuffs_base__io_buffer* src, + uint32_t wuffs_initialize_flags, + uint64_t wlimit, + uint64_t rlimit) { + uint64_t len = src->meta.wi - src->meta.ri; + if (rlimit) { + len = wuffs_base__u64__min(len, rlimit); + } + wuffs_xxhash64__hasher checksum = {0}; + CHECK_STATUS("initialize", wuffs_xxhash64__hasher__initialize( + &checksum, sizeof checksum, WUFFS_VERSION, + wuffs_initialize_flags)); + g_wuffs_xxhash64_unused_u64 = wuffs_xxhash64__hasher__update_u64( + &checksum, ((wuffs_base__slice_u8){ + .ptr = src->data.ptr + src->meta.ri, + .len = len, + })); + src->meta.ri += len; + return NULL; +} + +const char* // +bench_wuffs_xxhash64_10k() { + CHECK_FOCUS(__func__); + return do_bench_io_buffers( + wuffs_bench_xxhash64, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src, + &g_xxhash64_midsummer_gt, UINT64_MAX, UINT64_MAX, 5000); +} + +const char* // +bench_wuffs_xxhash64_100k() { + CHECK_FOCUS(__func__); + return do_bench_io_buffers( + wuffs_bench_xxhash64, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src, + &g_xxhash64_pi_gt, UINT64_MAX, UINT64_MAX, 500); +} + +// ---------------- Mimic Benches + +#ifdef WUFFS_MIMIC + +const char* // +bench_mimic_xxhash64_10k() { + CHECK_FOCUS(__func__); + return do_bench_io_buffers(mimic_bench_xxhash64, 0, tcounter_src, + &g_xxhash64_midsummer_gt, UINT64_MAX, UINT64_MAX, + 5000); +} + +const char* // +bench_mimic_xxhash64_100k() { + CHECK_FOCUS(__func__); + return do_bench_io_buffers(mimic_bench_xxhash64, 0, tcounter_src, + &g_xxhash64_pi_gt, UINT64_MAX, UINT64_MAX, 500); +} + +#endif // WUFFS_MIMIC + +// ---------------- Manifest + +proc g_tests[] = { + + test_wuffs_xxhash64_golden, + test_wuffs_xxhash64_interface, + test_wuffs_xxhash64_pi, + +#ifdef WUFFS_MIMIC + + test_mimic_xxhash64_pi, + +#endif // WUFFS_MIMIC + + NULL, +}; + +proc g_benches[] = { + + bench_wuffs_xxhash64_10k, + bench_wuffs_xxhash64_100k, + +#ifdef WUFFS_MIMIC + + bench_mimic_xxhash64_10k, + bench_mimic_xxhash64_100k, + +#endif // WUFFS_MIMIC + + NULL, +}; + +int // +main(int argc, char** argv) { + g_proc_package_name = "std/xxhash64"; + return test_main(argc, argv, g_tests, g_benches); +} diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index bc8c761c..8a2c047e 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -1161,6 +1161,27 @@ do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* b, return NULL; } +const char* // +do_test__wuffs_base__hasher_u64(wuffs_base__hasher_u64* b, + const char* src_filename, + size_t src_ri, + size_t src_wi, + uint64_t want) { + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = g_src_slice_u8, + }); + CHECK_STRING(read_file_fragment(&src, src_filename, src_ri, src_wi)); + uint64_t have = wuffs_base__hasher_u64__update_u64( + b, ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(src.data.ptr + src.meta.ri), + .len = (size_t)(src.meta.wi - src.meta.ri), + })); + if (have != want) { + RETURN_FAIL("have 0x%016" PRIX64 ", want 0x%016" PRIX64, have, want); + } + return NULL; +} + const char* // do_test__wuffs_base__image_decoder( wuffs_base__image_decoder* b,