Add tests for crc32_fold_copy functions

diff --git a/arch/generic/generic_functions.h b/arch/generic/generic_functions.h
index cb92bd37380491b5bcd8fedf13aa1b9fb056c765..6e18e3404522b1fb63f54f10dfb4fc3fee74413c 100644 (file)
--- a/arch/generic/generic_functions.h
+++ b/arch/generic/generic_functions.h
@@ -12,6 +12,9 @@
 typedef uint32_t (*adler32_func)(uint32_t adler, const uint8_t *buf, size_t len);
 typedef uint32_t (*compare256_func)(const uint8_t *src0, const uint8_t *src1);
 typedef uint32_t (*crc32_func)(uint32_t crc32, const uint8_t *buf, size_t len);
+typedef uint32_t (*crc32_fold_reset_func)(crc32_fold *crc);
+typedef void     (*crc32_fold_copy_func)(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len);
+typedef uint32_t (*crc32_fold_final_func)(crc32_fold *crc);
 typedef void     (*slide_hash_func)(deflate_state *s);
 
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a2304cf02bb8841620b488e2c0fe6a57d9c46e37..2ce549e8d89b41a549ff6b4725992cb98f5f52db 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -180,6 +180,7 @@ if(WITH_GTEST)
                 test_compare256.cc          # compare256_neon(), etc
                 test_compare256_rle.cc      # compare256_rle(), etc
                 test_crc32.cc               # crc32_armv8(), etc
+                test_crc32_fold_copy.cc     # crc32_fold_copy implementations
                 test_inflate_sync.cc        # expects a certain compressed block layout
                 test_main.cc                # cpu_check_features()
                 test_version.cc             # expects a fixed version string

diff --git a/test/crc32_test_strings_p.h b/test/crc32_test_strings_p.h
new file mode 100644 (file)
index 0000000..f6960b4
--- /dev/null
+++ b/test/crc32_test_strings_p.h
@@ -0,0 +1,183 @@
+#ifndef CRC32_TEST_STRINGS_P_H
+#define CRC32_TEST_STRINGS_P_H
+
+ALIGNED_(16) static uint8_t crc32_fullwin_buf[32768];
+
+static uint8_t* crc32_setup_buf() {
+    for (int i = 0; i < 32768; ++i) {
+        uint8_t ic = (uint8_t)(i % 256);
+        crc32_fullwin_buf[i] = ic;
+    }
+
+    return crc32_fullwin_buf;
+}
+
+static uint8_t *buf32k = crc32_setup_buf();
+
+typedef struct {
+    unsigned long crc;
+    const uint8_t *buf;
+    size_t len;
+    unsigned long expect;
+} crc32_test;
+
+/* (init-)crc, buf, len, expect(-crc) */
+static const crc32_test crc32_tests[] = {
+  {0x0, (const uint8_t *)0x0, 0, 0x0},
+  {0xffffffff, (const uint8_t *)0x0, 0, 0x0},
+  {0x0, (const uint8_t *)0x0, 255, 0x0}, /*  BZ 174799.  */
+  {0x0, (const uint8_t *)0x0, 256, 0x0},
+  {0x0, (const uint8_t *)0x0, 257, 0x0},
+  {0x0, (const uint8_t *)0x0, 32767, 0x0},
+  {0x0, (const uint8_t *)0x0, 32768, 0x0},
+  {0x0, (const uint8_t *)0x0, 32769, 0x0},
+  {0x0, (const uint8_t *)"", 0, 0x0},
+  {0xffffffff, (const uint8_t *)"", 0, 0xffffffff},
+  {0x0, (const uint8_t *)"abacus", 6, 0xc3d7115b},
+  {0x0, (const uint8_t *)"backlog", 7, 0x269205},
+  {0x0, (const uint8_t *)"campfire", 8, 0x22a515f8},
+  {0x0, (const uint8_t *)"delta", 5, 0x9643fed9},
+  {0x0, (const uint8_t *)"executable", 10, 0xd68eda01},
+  {0x0, (const uint8_t *)"file", 4, 0x8c9f3610},
+  {0x0, (const uint8_t *)"greatest", 8, 0xc1abd6cd},
+  {0x0, (const uint8_t *)"hello", 5, 0x3610a686},
+  {0x0, (const uint8_t *)"inverter", 8, 0xc9e962c9},
+  {0x0, (const uint8_t *)"jigsaw", 6, 0xce4e3f69},
+  {0x0, (const uint8_t *)"karate", 6, 0x890be0e2},
+  {0x0, (const uint8_t *)"landscape", 9, 0xc4e0330b},
+  {0x0, (const uint8_t *)"machine", 7, 0x1505df84},
+  {0x0, (const uint8_t *)"nanometer", 9, 0xd4e19f39},
+  {0x0, (const uint8_t *)"oblivion", 8, 0xdae9de77},
+  {0x0, (const uint8_t *)"panama", 6, 0x66b8979c},
+  {0x0, (const uint8_t *)"quest", 5, 0x4317f817},
+  {0x0, (const uint8_t *)"resource", 8, 0xbc91f416},
+  {0x0, (const uint8_t *)"secret", 6, 0x5ca2e8e5},
+  {0x0, (const uint8_t *)"test", 4, 0xd87f7e0c},
+  {0x0, (const uint8_t *)"ultimate", 8, 0x3fc79b0b},
+  {0x0, (const uint8_t *)"vector", 6, 0x1b6e485b},
+  {0x0, (const uint8_t *)"walrus", 6, 0xbe769b97},
+  {0x0, (const uint8_t *)"xeno", 4, 0xe7a06444},
+  {0x0, (const uint8_t *)"yelling", 7, 0xfe3944e5},
+  {0x0, (const uint8_t *)"zlib", 4, 0x73887d3a},
+  {0x0, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0xd487a5a1},
+  {0x0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0x61a0132e},
+  {0x0, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdf02f76},
+  {0x0, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x579b2b0a},
+  {0x0, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xf7d16e2d},
+  {0x0, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0x731788f5},
+  {0x0, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0x7112bb11},
+  {0x0, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xf32a0dac},
+  {0x0, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0x625437bb},
+  {0x0, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0x896930f9},
+  {0x0, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0x8579a37},
+  {0x0, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0x632aa8e0},
+  {0x0, (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0xc829af29},
+  {0x0, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x1b08b7e8},
+  {0x0, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x4e33b192},
+  {0x0, (const uint8_t *)"70684206568419061514", 20, 0x59a179f0},
+  {0x0, (const uint8_t *)"42015093765128581010", 20, 0xcd1013d7},
+  {0x0, (const uint8_t *)"88214814356148806939", 20, 0xab927546},
+  {0x0, (const uint8_t *)"43472694284527343838", 20, 0x11f3b20c},
+  {0x0, (const uint8_t *)"49769333513942933689", 20, 0xd562d4ca},
+  {0x0, (const uint8_t *)"54979784887993251199", 20, 0x233395f7},
+  {0x0, (const uint8_t *)"58360544869206793220", 20, 0x2d167fd5},
+  {0x0, (const uint8_t *)"27347953487840714234", 20, 0x8b5108ba},
+  {0x0, (const uint8_t *)"07650690295365319082", 20, 0xc46b3cd8},
+  {0x0, (const uint8_t *)"42655507906821911703", 20, 0xc10b2662},
+  {0x0, (const uint8_t *)"29977409200786225655", 20, 0xc9a0f9d2},
+  {0x0, (const uint8_t *)"85181542907229116674", 20, 0x9341357b},
+  {0x0, (const uint8_t *)"87963594337989416799", 20, 0xf0424937},
+  {0x0, (const uint8_t *)"21395988329504168551", 20, 0xd7c4c31f},
+  {0x0, (const uint8_t *)"51991013580943379423", 20, 0xf11edcc4},
+  {0x0, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x40795df4},
+  {0x0, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0xdd61a631},
+  {0x0, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xca907a99},
+  {0x0, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0xf652deac},
+  {0x0, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0xaf39a5a9},
+  {0x0, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x6bebb4cf},
+  {0x0, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0x76430bac},
+  {0x0, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x6c80c388},
+  {0x0, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xd54d977d},
+  {0x0, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0xe3966ad5},
+  {0x0, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xe7c71db9},
+  {0x0, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xeaa52777},
+  {0x0, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xcd472048},
+  {0x7a30360d, (const uint8_t *)"abacus", 6, 0xf8655a84},
+  {0x6fd767ee, (const uint8_t *)"backlog", 7, 0x1ed834b1},
+  {0xefeb7589, (const uint8_t *)"campfire", 8, 0x686cfca},
+  {0x61cf7e6b, (const uint8_t *)"delta", 5, 0x1554e4b1},
+  {0xdc712e2,  (const uint8_t *)"executable", 10, 0x761b4254},
+  {0xad23c7fd, (const uint8_t *)"file", 4, 0x7abdd09b},
+  {0x85cb2317, (const uint8_t *)"greatest", 8, 0x4ba91c6b},
+  {0x9eed31b0, (const uint8_t *)"inverter", 8, 0xd5e78ba5},
+  {0xb94f34ca, (const uint8_t *)"jigsaw", 6, 0x23649109},
+  {0xab058a2,  (const uint8_t *)"karate", 6, 0xc5591f41},
+  {0x5bff2b7a, (const uint8_t *)"landscape", 9, 0xf10eb644},
+  {0x605c9a5f, (const uint8_t *)"machine", 7, 0xbaa0a636},
+  {0x51bdeea5, (const uint8_t *)"nanometer", 9, 0x6af89afb},
+  {0x85c21c79, (const uint8_t *)"oblivion", 8, 0xecae222b},
+  {0x97216f56, (const uint8_t *)"panama", 6, 0x47dffac4},
+  {0x18444af2, (const uint8_t *)"quest", 5, 0x70c2fe36},
+  {0xbe6ce359, (const uint8_t *)"resource", 8, 0x1471d925},
+  {0x843071f1, (const uint8_t *)"secret", 6, 0x50c9a0db},
+  {0xf2480c60, (const uint8_t *)"ultimate", 8, 0xf973daf8},
+  {0x2d2feb3d, (const uint8_t *)"vector", 6, 0x344ac03d},
+  {0x7490310a, (const uint8_t *)"walrus", 6, 0x6d1408ef},
+  {0x97d247d4, (const uint8_t *)"xeno", 4, 0xe62670b5},
+  {0x93cf7599, (const uint8_t *)"yelling", 7, 0x1b36da38},
+  {0x73c84278, (const uint8_t *)"zlib", 4, 0x6432d127},
+  {0x228a87d1, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0x997107d0},
+  {0xa7a048d0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0xdc567274},
+  {0x1f0ded40, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdcc63870},
+  {0xa804a62f, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x6926cffd},
+  {0x508fae6a, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xb52b38bc},
+  {0xe5adaf4f, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0xf83b8178},
+  {0x67136a40, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0xc5213070},
+  {0xb00c4a10, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xbc7648b0},
+  {0x2e0c84b5, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0xd8123a72},
+  {0x81238d44, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0xd5ac5620},
+  {0xf853aa92, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0xceae099d},
+  {0x5a692325, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0xb07d2b24},
+  {0x3275b9f,  (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0x24ce91df},
+  {0x38371feb, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x707b3b30},
+  {0xafc8bf62, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x16abc6a9},
+  {0x9b07db73, (const uint8_t *)"70684206568419061514", 20, 0xae1fb7b7},
+  {0xe75b214,  (const uint8_t *)"42015093765128581010", 20, 0xd4eecd2d},
+  {0x72d0fe6f, (const uint8_t *)"88214814356148806939", 20, 0x4660ec7},
+  {0xf857a4b1, (const uint8_t *)"43472694284527343838", 20, 0xfd8afdf7},
+  {0x54b8e14,  (const uint8_t *)"49769333513942933689", 20, 0xc6d1b5f2},
+  {0xd6aa5616, (const uint8_t *)"54979784887993251199", 20, 0x32476461},
+  {0x11e63098, (const uint8_t *)"58360544869206793220", 20, 0xd917cf1a},
+  {0xbe92385,  (const uint8_t *)"27347953487840714234", 20, 0x4ad14a12},
+  {0x49511de0, (const uint8_t *)"07650690295365319082", 20, 0xe37b5c6c},
+  {0x3db13bc1, (const uint8_t *)"42655507906821911703", 20, 0x7cc497f1},
+  {0xbb899bea, (const uint8_t *)"29977409200786225655", 20, 0x99781bb2},
+  {0xf6cd9436, (const uint8_t *)"85181542907229116674", 20, 0x132256a1},
+  {0x9109e6c3, (const uint8_t *)"87963594337989416799", 20, 0xbfdb2c83},
+  {0x75770fc,  (const uint8_t *)"21395988329504168551", 20, 0x8d9d1e81},
+  {0x69b1d19b, (const uint8_t *)"51991013580943379423", 20, 0x7b6d4404},
+  {0xc6132975, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x8619f010},
+  {0xd58cb00c, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0x15746ac3},
+  {0xb63b8caa, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xaccf812f},
+  {0x8a45a2b8, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0x78af45de},
+  {0xcbe95b78, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0x25b06b59},
+  {0x4ef8a54b, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x4ba0d08f},
+  {0x76ad267a, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0xe26b6aac},
+  {0x569e613c, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x7e2b0a66},
+  {0x36aa61da, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xb3430dc7},
+  {0xf67222df, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0x626c17a},
+  {0x74b34fd3, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xccf98060},
+  {0x351fd770, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xd8b95312},
+  {0xc45aef77, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xbb1c9912},
+  {0xc45aef77, (const uint8_t *)
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
+    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 600, 0x888AFA5B},
+  {0x0, buf32k, 32768, 0x217726B2},
+  {0x0, buf32k, 16384, 0xE81722F0}
+};
+
+#endif /* CRC32_TEST_STRINGS_P_H */

diff --git a/test/test_crc32.cc b/test/test_crc32.cc
index ca0767d46892a391ef13bee3e18e6d6175934e5d..a49c9d72bcc6a0e6ea033b8301b55fd92215e3b5 100644 (file)
--- a/test/test_crc32.cc
+++ b/test/test_crc32.cc
@@ -5,198 +5,16 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "zutil.h"
-#include "zutil_p.h"
+#include <gtest/gtest.h>
 
 extern "C" {
+#  include "zutil_p.h"
 #  include "zbuild.h"
 #  include "arch_functions.h"
 #  include "test_cpu_features.h"
+#  include "crc32_test_strings_p.h"
 }
 
-#include <gtest/gtest.h>
-
-typedef struct {
-    unsigned long crc;
-    const uint8_t *buf;
-    size_t len;
-    unsigned long expect;
-} crc32_test;
-
-ALIGNED_(16) uint8_t fullwin_buf[32768];
-
-uint8_t* setup_buf() {
-    for (int i = 0; i < 32768; ++i) {
-        unsigned char ic = (unsigned char)(i % 256);
-        fullwin_buf[i] = ic;
-    }
-
-    return fullwin_buf;
-}
-
-static uint8_t *buf32k = setup_buf();
-
-static const crc32_test tests[] = {
-  {0x0, (const uint8_t *)0x0, 0, 0x0},
-  {0xffffffff, (const uint8_t *)0x0, 0, 0x0},
-  {0x0, (const uint8_t *)0x0, 255, 0x0}, /*  BZ 174799.  */
-  {0x0, (const uint8_t *)0x0, 256, 0x0},
-  {0x0, (const uint8_t *)0x0, 257, 0x0},
-  {0x0, (const uint8_t *)0x0, 32767, 0x0},
-  {0x0, (const uint8_t *)0x0, 32768, 0x0},
-  {0x0, (const uint8_t *)0x0, 32769, 0x0},
-  {0x0, (const uint8_t *)"", 0, 0x0},
-  {0xffffffff, (const uint8_t *)"", 0, 0xffffffff},
-  {0x0, (const uint8_t *)"abacus", 6, 0xc3d7115b},
-  {0x0, (const uint8_t *)"backlog", 7, 0x269205},
-  {0x0, (const uint8_t *)"campfire", 8, 0x22a515f8},
-  {0x0, (const uint8_t *)"delta", 5, 0x9643fed9},
-  {0x0, (const uint8_t *)"executable", 10, 0xd68eda01},
-  {0x0, (const uint8_t *)"file", 4, 0x8c9f3610},
-  {0x0, (const uint8_t *)"greatest", 8, 0xc1abd6cd},
-  {0x0, (const uint8_t *)"hello", 5, 0x3610a686},
-  {0x0, (const uint8_t *)"inverter", 8, 0xc9e962c9},
-  {0x0, (const uint8_t *)"jigsaw", 6, 0xce4e3f69},
-  {0x0, (const uint8_t *)"karate", 6, 0x890be0e2},
-  {0x0, (const uint8_t *)"landscape", 9, 0xc4e0330b},
-  {0x0, (const uint8_t *)"machine", 7, 0x1505df84},
-  {0x0, (const uint8_t *)"nanometer", 9, 0xd4e19f39},
-  {0x0, (const uint8_t *)"oblivion", 8, 0xdae9de77},
-  {0x0, (const uint8_t *)"panama", 6, 0x66b8979c},
-  {0x0, (const uint8_t *)"quest", 5, 0x4317f817},
-  {0x0, (const uint8_t *)"resource", 8, 0xbc91f416},
-  {0x0, (const uint8_t *)"secret", 6, 0x5ca2e8e5},
-  {0x0, (const uint8_t *)"test", 4, 0xd87f7e0c},
-  {0x0, (const uint8_t *)"ultimate", 8, 0x3fc79b0b},
-  {0x0, (const uint8_t *)"vector", 6, 0x1b6e485b},
-  {0x0, (const uint8_t *)"walrus", 6, 0xbe769b97},
-  {0x0, (const uint8_t *)"xeno", 4, 0xe7a06444},
-  {0x0, (const uint8_t *)"yelling", 7, 0xfe3944e5},
-  {0x0, (const uint8_t *)"zlib", 4, 0x73887d3a},
-  {0x0, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0xd487a5a1},
-  {0x0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0x61a0132e},
-  {0x0, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdf02f76},
-  {0x0, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x579b2b0a},
-  {0x0, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xf7d16e2d},
-  {0x0, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0x731788f5},
-  {0x0, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0x7112bb11},
-  {0x0, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xf32a0dac},
-  {0x0, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0x625437bb},
-  {0x0, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0x896930f9},
-  {0x0, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0x8579a37},
-  {0x0, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0x632aa8e0},
-  {0x0, (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0xc829af29},
-  {0x0, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x1b08b7e8},
-  {0x0, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x4e33b192},
-  {0x0, (const uint8_t *)"70684206568419061514", 20, 0x59a179f0},
-  {0x0, (const uint8_t *)"42015093765128581010", 20, 0xcd1013d7},
-  {0x0, (const uint8_t *)"88214814356148806939", 20, 0xab927546},
-  {0x0, (const uint8_t *)"43472694284527343838", 20, 0x11f3b20c},
-  {0x0, (const uint8_t *)"49769333513942933689", 20, 0xd562d4ca},
-  {0x0, (const uint8_t *)"54979784887993251199", 20, 0x233395f7},
-  {0x0, (const uint8_t *)"58360544869206793220", 20, 0x2d167fd5},
-  {0x0, (const uint8_t *)"27347953487840714234", 20, 0x8b5108ba},
-  {0x0, (const uint8_t *)"07650690295365319082", 20, 0xc46b3cd8},
-  {0x0, (const uint8_t *)"42655507906821911703", 20, 0xc10b2662},
-  {0x0, (const uint8_t *)"29977409200786225655", 20, 0xc9a0f9d2},
-  {0x0, (const uint8_t *)"85181542907229116674", 20, 0x9341357b},
-  {0x0, (const uint8_t *)"87963594337989416799", 20, 0xf0424937},
-  {0x0, (const uint8_t *)"21395988329504168551", 20, 0xd7c4c31f},
-  {0x0, (const uint8_t *)"51991013580943379423", 20, 0xf11edcc4},
-  {0x0, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x40795df4},
-  {0x0, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0xdd61a631},
-  {0x0, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xca907a99},
-  {0x0, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0xf652deac},
-  {0x0, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0xaf39a5a9},
-  {0x0, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x6bebb4cf},
-  {0x0, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0x76430bac},
-  {0x0, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x6c80c388},
-  {0x0, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xd54d977d},
-  {0x0, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0xe3966ad5},
-  {0x0, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xe7c71db9},
-  {0x0, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xeaa52777},
-  {0x0, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xcd472048},
-  {0x7a30360d, (const uint8_t *)"abacus", 6, 0xf8655a84},
-  {0x6fd767ee, (const uint8_t *)"backlog", 7, 0x1ed834b1},
-  {0xefeb7589, (const uint8_t *)"campfire", 8, 0x686cfca},
-  {0x61cf7e6b, (const uint8_t *)"delta", 5, 0x1554e4b1},
-  {0xdc712e2,  (const uint8_t *)"executable", 10, 0x761b4254},
-  {0xad23c7fd, (const uint8_t *)"file", 4, 0x7abdd09b},
-  {0x85cb2317, (const uint8_t *)"greatest", 8, 0x4ba91c6b},
-  {0x9eed31b0, (const uint8_t *)"inverter", 8, 0xd5e78ba5},
-  {0xb94f34ca, (const uint8_t *)"jigsaw", 6, 0x23649109},
-  {0xab058a2,  (const uint8_t *)"karate", 6, 0xc5591f41},
-  {0x5bff2b7a, (const uint8_t *)"landscape", 9, 0xf10eb644},
-  {0x605c9a5f, (const uint8_t *)"machine", 7, 0xbaa0a636},
-  {0x51bdeea5, (const uint8_t *)"nanometer", 9, 0x6af89afb},
-  {0x85c21c79, (const uint8_t *)"oblivion", 8, 0xecae222b},
-  {0x97216f56, (const uint8_t *)"panama", 6, 0x47dffac4},
-  {0x18444af2, (const uint8_t *)"quest", 5, 0x70c2fe36},
-  {0xbe6ce359, (const uint8_t *)"resource", 8, 0x1471d925},
-  {0x843071f1, (const uint8_t *)"secret", 6, 0x50c9a0db},
-  {0xf2480c60, (const uint8_t *)"ultimate", 8, 0xf973daf8},
-  {0x2d2feb3d, (const uint8_t *)"vector", 6, 0x344ac03d},
-  {0x7490310a, (const uint8_t *)"walrus", 6, 0x6d1408ef},
-  {0x97d247d4, (const uint8_t *)"xeno", 4, 0xe62670b5},
-  {0x93cf7599, (const uint8_t *)"yelling", 7, 0x1b36da38},
-  {0x73c84278, (const uint8_t *)"zlib", 4, 0x6432d127},
-  {0x228a87d1, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0x997107d0},
-  {0xa7a048d0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0xdc567274},
-  {0x1f0ded40, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdcc63870},
-  {0xa804a62f, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x6926cffd},
-  {0x508fae6a, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xb52b38bc},
-  {0xe5adaf4f, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0xf83b8178},
-  {0x67136a40, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0xc5213070},
-  {0xb00c4a10, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xbc7648b0},
-  {0x2e0c84b5, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0xd8123a72},
-  {0x81238d44, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0xd5ac5620},
-  {0xf853aa92, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0xceae099d},
-  {0x5a692325, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0xb07d2b24},
-  {0x3275b9f,  (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0x24ce91df},
-  {0x38371feb, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x707b3b30},
-  {0xafc8bf62, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x16abc6a9},
-  {0x9b07db73, (const uint8_t *)"70684206568419061514", 20, 0xae1fb7b7},
-  {0xe75b214,  (const uint8_t *)"42015093765128581010", 20, 0xd4eecd2d},
-  {0x72d0fe6f, (const uint8_t *)"88214814356148806939", 20, 0x4660ec7},
-  {0xf857a4b1, (const uint8_t *)"43472694284527343838", 20, 0xfd8afdf7},
-  {0x54b8e14,  (const uint8_t *)"49769333513942933689", 20, 0xc6d1b5f2},
-  {0xd6aa5616, (const uint8_t *)"54979784887993251199", 20, 0x32476461},
-  {0x11e63098, (const uint8_t *)"58360544869206793220", 20, 0xd917cf1a},
-  {0xbe92385,  (const uint8_t *)"27347953487840714234", 20, 0x4ad14a12},
-  {0x49511de0, (const uint8_t *)"07650690295365319082", 20, 0xe37b5c6c},
-  {0x3db13bc1, (const uint8_t *)"42655507906821911703", 20, 0x7cc497f1},
-  {0xbb899bea, (const uint8_t *)"29977409200786225655", 20, 0x99781bb2},
-  {0xf6cd9436, (const uint8_t *)"85181542907229116674", 20, 0x132256a1},
-  {0x9109e6c3, (const uint8_t *)"87963594337989416799", 20, 0xbfdb2c83},
-  {0x75770fc,  (const uint8_t *)"21395988329504168551", 20, 0x8d9d1e81},
-  {0x69b1d19b, (const uint8_t *)"51991013580943379423", 20, 0x7b6d4404},
-  {0xc6132975, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x8619f010},
-  {0xd58cb00c, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0x15746ac3},
-  {0xb63b8caa, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xaccf812f},
-  {0x8a45a2b8, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0x78af45de},
-  {0xcbe95b78, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0x25b06b59},
-  {0x4ef8a54b, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x4ba0d08f},
-  {0x76ad267a, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0xe26b6aac},
-  {0x569e613c, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x7e2b0a66},
-  {0x36aa61da, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xb3430dc7},
-  {0xf67222df, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0x626c17a},
-  {0x74b34fd3, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xccf98060},
-  {0x351fd770, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xd8b95312},
-  {0xc45aef77, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xbb1c9912},
-  {0xc45aef77, (const uint8_t *)
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 600, 0x888AFA5B},
-  {0x0, buf32k, 32768, 0x217726B2},
-  {0x0, buf32k, 16384, 0xE81722F0}
-};
-
 class crc32_variant : public ::testing::TestWithParam<crc32_test> {
 public:
     void hash(crc32_test param, crc32_func crc32) {
@@ -251,7 +69,7 @@ public:
 
 uint8_t *crc32_large_buf::buffer = nullptr;
 
-INSTANTIATE_TEST_SUITE_P(crc32, crc32_variant, testing::ValuesIn(tests));
+INSTANTIATE_TEST_SUITE_P(crc32, crc32_variant, testing::ValuesIn(crc32_tests));
 
 #define TEST_CRC32(name, func, support_flag) \
     TEST_P(crc32_variant, name) { \

diff --git a/test/test_crc32_fold_copy.cc b/test/test_crc32_fold_copy.cc
new file mode 100644 (file)
index 0000000..8b489fb
--- /dev/null
+++ b/test/test_crc32_fold_copy.cc
@@ -0,0 +1,81 @@
+/* test_crc32_fold_copy.cc -- test for crc32 implementations doing folded copying
+ * Copyright (C) 2025 Hans Kristian Rosbach
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include <gtest/gtest.h>
+
+extern "C" {
+#  include "zbuild.h"
+#  include "arch_functions.h"
+#  include "test_cpu_features.h"
+#  include "crc32_test_strings_p.h"
+}
+
+#define BUFSIZE 33792U
+
+class crc32_fc_variant : public ::testing::TestWithParam<crc32_test> {
+protected:
+    uint8_t dstbuf[BUFSIZE];
+
+public:
+    /* Ensure that crc32 fold copy functions returns the correct crc and copies the data */
+    void crc32_fold_test(size_t minlen, int onlyzero, crc32_fold_reset_func fold_reset, crc32_fold_copy_func fold_copy,
+                         crc32_fold_final_func fold_final, crc32_test params) {
+        ALIGNED_(16) crc32_fold crc_st;
+        uint32_t crc;
+
+        ASSERT_LE(params.len, BUFSIZE);
+
+        // Some optimized functions cannot take a crc value as start point
+        // and some have minimum length requirements
+        if (params.buf == NULL || params.len < minlen || (onlyzero && params.crc != 0)) {
+            GTEST_SKIP();
+        }
+
+        fold_reset(&crc_st);
+        crc_st.value = params.crc;
+
+        fold_copy(&crc_st, dstbuf, params.buf, params.len);
+        crc = fold_final(&crc_st);
+
+        EXPECT_EQ(crc, params.expect);
+        EXPECT_EQ(0, memcmp(params.buf, dstbuf, params.len));
+    }
+};
+
+INSTANTIATE_TEST_SUITE_P(crc32_fc, crc32_fc_variant, testing::ValuesIn(crc32_tests));
+
+#define TEST_CRC32_FOLD(name, minlen, onlyzero, resfunc, copyfunc, finfunc, support_flag) \
+    TEST_P(crc32_fc_variant, name) { \
+        if (!support_flag) { \
+            GTEST_SKIP(); \
+            return; \
+        } \
+        crc32_fold_test(minlen, onlyzero, resfunc, copyfunc, finfunc, GetParam()); \
+    }
+
+// Generic test
+TEST_CRC32_FOLD(generic, 0, 0, crc32_fold_reset_c, crc32_fold_copy_c, crc32_fold_final_c, 1)
+
+#ifdef DISABLE_RUNTIME_CPU_DETECTION
+    // Native test
+    TEST_CRC32_FOLD(native, 16, 1, native_crc32_fold_reset, native_crc32_fold_copy, native_crc32_fold_final, 1)
+#else
+
+    // Tests of optimized functions
+#  ifdef ARM_CRC32
+    TEST_CRC32_FOLD(armv8, 0, 0, crc32_fold_reset_c, crc32_fold_copy_armv8, crc32_fold_final_c, test_cpu_features.arm.has_crc32)
+#  endif
+#  ifdef X86_PCLMULQDQ_CRC
+    // Is 16 bytes len the minimum for pclmul functions?
+    TEST_CRC32_FOLD(pclmulqdq, 16, 1, crc32_fold_pclmulqdq_reset, crc32_fold_pclmulqdq_copy, crc32_fold_pclmulqdq_final, test_cpu_features.x86.has_pclmulqdq)
+#  endif
+#  ifdef X86_VPCLMULQDQ_CRC
+    TEST_CRC32_FOLD(vpclmulqdq, 16, 1, crc32_fold_pclmulqdq_reset, crc32_fold_vpclmulqdq_copy, crc32_fold_pclmulqdq_final, (test_cpu_features.x86.has_pclmulqdq && test_cpu_features.x86.has_avx512_common && test_cpu_features.x86.has_vpclmulqdq))
+#  endif
+#  ifdef LOONGARCH_CRC
+    TEST_CRC32_FOLD(loongarch64, 0, 0, crc32_fold_reset_c, crc32_fold_copy_loongarch64, crc32_fold_final_c, test_cpu_features.loongarch.has_crc)
+#  endif
+
+#endif