From 542c2760258f6d46236914a4a5817349d200c95d Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 21 Mar 2024 15:41:16 -0700 Subject: [PATCH 1/2] added sanity_test_vectors.h check for ARM32 presumed to fail (see #926) --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44a0ac54..c0532b2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -443,6 +443,8 @@ jobs: run: | CPPFLAGS="-DXXH_VECTOR=XXH_SCALAR" LDFLAGS="-static" CC=$XCC RUN_ENV=$XEMU make clean check CPPFLAGS="-DXXH_VECTOR=XXH_NEON" CFLAGS="-O3 -march=armv7-a -fPIC -mfloat-abi=softfp -mfpu=neon-vfpv4" LDFLAGS="-static" CC=$XCC RUN_ENV=$XEMU make clean check + make -C tests clean + CPPFLAGS="-DXXH_VECTOR=XXH_SCALAR" LDFLAGS="-static" CC=$XCC RUN_ENV=$XEMU make -C tests sanity_test_vectors.h test_sanity - name: AARCH64 (XXH_VECTOR=[ scalar, NEON, SVE ]) if: ${{ startsWith(matrix.name, 'AARCH64') }} From 4b5573cbc73a1a5e8fb1eee2e1b8f2020b2e908c Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 21 Mar 2024 15:50:21 -0700 Subject: [PATCH 2/2] fix #926 code fix suggested by @tansy --- tests/sanity_test_vectors_generator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/sanity_test_vectors_generator.c b/tests/sanity_test_vectors_generator.c index 196995dd..f9104623 100644 --- a/tests/sanity_test_vectors_generator.c +++ b/tests/sanity_test_vectors_generator.c @@ -138,11 +138,11 @@ static void fprintf_XSUM_testdata32_t(FILE* fp, XSUM_testdata32_t const v) { } static void fprintf_XSUM_testdata64_t(FILE* fp, XSUM_testdata64_t const v) { - fprintf(fp, "{ %4d, 0x%016zXULL, 0x%016zXULL },", v.len, v.seed, v.Nresult); + fprintf(fp, "{ %4d, 0x%016llXULL, 0x%016llXULL },", v.len, v.seed, v.Nresult); } static void fprintf_XSUM_testdata128_t(FILE* fp, XSUM_testdata128_t const v) { - fprintf(fp, "{ %4d, 0x%016zXULL, { 0x%016zXULL, 0x%016zXULL } },", + fprintf(fp, "{ %4d, 0x%016llXULL, { 0x%016llXULL, 0x%016llXULL } },", v.len, v.seed, v.Nresult.low64, v.Nresult.high64); } @@ -208,7 +208,7 @@ static void generate_sanity_test_vectors_xxh32(FILE* fp, size_t maxLen) { size_t index = 0; for(size_t len = 0; len < maxLen; ++len) { - static const size_t seeds[] = { 0, PRIME32 }; + static const uint64_t seeds[] = { 0, PRIME32 }; for(size_t iSeed = 0; iSeed < sizeof(seeds)/sizeof(seeds[0]); ++iSeed) { size_t const seed = seeds[iSeed]; XSUM_testdata32_t const v = tvgen_XXH32(sanityBuffer, len, seed); @@ -234,7 +234,7 @@ static void generate_sanity_test_vectors_xxh64(FILE* fp, size_t maxLen) { size_t index = 0; for(size_t len = 0; len < maxLen; ++len) { - static const size_t seeds[] = { 0, PRIME32 }; + static const uint64_t seeds[] = { 0, PRIME32 }; for(size_t iSeed = 0; iSeed < sizeof(seeds)/sizeof(seeds[0]); ++iSeed) { size_t const seed = seeds[iSeed]; XSUM_testdata64_t const v = tvgen_XXH64(sanityBuffer, len, seed); @@ -260,7 +260,7 @@ static void generate_sanity_test_vectors_xxh3(FILE* fp, size_t maxLen) { size_t index = 0; for(size_t len = 0; len < maxLen; ++len) { - static const size_t seeds[] = { 0, PRIME64 }; + static const uint64_t seeds[] = { 0, PRIME64 }; for(size_t iSeed = 0; iSeed < sizeof(seeds)/sizeof(seeds[0]); ++iSeed) { size_t const seed = seeds[iSeed]; XSUM_testdata64_t const v = tvgen_XXH3_64bits_withSeed(sanityBuffer, len, seed); @@ -312,7 +312,7 @@ static void generate_sanity_test_vectors_xxh128(FILE* fp, size_t maxLen) { size_t index = 0; for(size_t len = 0; len < maxLen; ++len) { - static const size_t seeds[] = { 0, PRIME32, PRIME64 }; + static const uint64_t seeds[] = { 0, PRIME32, PRIME64 }; for(size_t iSeed = 0; iSeed < sizeof(seeds)/sizeof(seeds[0]); ++iSeed) { XSUM_U64 const seed = seeds[iSeed]; XSUM_testdata128_t const v = tvgen_XXH3_128bits_withSeed(sanityBuffer, len, seed);