From: Yann Collet <cyan@fb.com>
Date: Fri, 21 Jan 2022 05:59:46 +0000 (-0800)
Subject: update regression tests
X-Git-Tag: v1.5.4^2~260^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4684836f4fbaea1d5416306173306bac56361d83;p=thirdparty%2Fzstd.git

update regression tests

minor compression ratio benefits in some cases,
no compression ratio regression in the measured scenarios.
---

diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c
index e61b39f60..fee2c0b52 100644
--- a/lib/compress/huf_compress.c
+++ b/lib/compress/huf_compress.c
@@ -598,21 +598,21 @@ static void HUF_sort(nodeElt huffNode[], const unsigned count[], U32 const maxSy
 }
 
 
-size_t showHNodeSymbols(const nodeElt* hnode, size_t size)
+static size_t showHNodeSymbols(const nodeElt* hnode, size_t size)
 {
     size_t u;
     for (u=0; u<size; u++) {
-        RAWLOG(6, " %u", hnode[u].byte);
+        RAWLOG(6, " %u", hnode[u].byte); (void)hnode;
     }
     RAWLOG(6, " \n");
     return size;
 }
 
-size_t showHNodeBits(const nodeElt* hnode, size_t size)
+static size_t showHNodeBits(const nodeElt* hnode, size_t size)
 {
     size_t u;
     for (u=0; u<size; u++) {
-        RAWLOG(6, " %u", hnode[u].nbBits);
+        RAWLOG(6, " %u", hnode[u].nbBits); (void)hnode;
     }
     RAWLOG(6, " \n");
     return size;
@@ -749,9 +749,9 @@ HUF_buildCTable_wksp(HUF_CElt* CTable, const unsigned* count, U32 maxSymbolValue
      * A harsh rebalancing can be bad for compression ratio
      * while a mild one tends to be better */
     while (maxNbBits < HUF_TABLELOG_MAX) {
-        size_t const nbNodes = HUF_nbSymbolsTooLarge(huffNode, maxSymbolValue, maxNbBits);
-        #define HUF_NB_NODES_TO_FIX_MAX 8
-        if (nbNodes < HUF_NB_NODES_TO_FIX_MAX) /* heuristic */
+        size_t const nbSTL = HUF_nbSymbolsTooLarge(huffNode, maxSymbolValue, maxNbBits);
+        #define HUF_NB_NODES_TO_FIX_MAX 32
+        if (nbSTL < HUF_NB_NODES_TO_FIX_MAX) /* heuristic */
             break;
         maxNbBits++;
     }
@@ -1218,7 +1218,7 @@ static size_t showU32(const U32* arr, size_t size)
 {
     size_t u;
     for (u=0; u<size; u++) {
-        RAWLOG(6, " %u", arr[u]);
+        RAWLOG(6, " %u", arr[u]); (void)arr;
     }
     RAWLOG(6, " \n");
     return size;
@@ -1228,7 +1228,7 @@ static size_t showCTableBits(const HUF_CElt* ctable, size_t size)
 {
     size_t u;
     for (u=0; u<size; u++) {
-        RAWLOG(6, " %zu", HUF_getNbBits(ctable[u]));
+        RAWLOG(6, " %zu", HUF_getNbBits(ctable[u])); (void)ctable;
     }
     RAWLOG(6, " \n");
     return size;
diff --git a/lib/compress/zstd_compress_literals.c b/lib/compress/zstd_compress_literals.c
index 0c1acc407..a114b7d15 100644
--- a/lib/compress/zstd_compress_literals.c
+++ b/lib/compress/zstd_compress_literals.c
@@ -72,7 +72,7 @@ static size_t showHexa(const void* src, size_t srcSize)
     const BYTE* const ip = (const BYTE*)src;
     size_t u;
     for (u=0; u<srcSize; u++) {
-        RAWLOG(6, " %02X", ip[u]);
+        RAWLOG(6, " %02X", ip[u]); (void)ip;
     }
     RAWLOG(6, " \n");
     return srcSize;
diff --git a/tests/regression/results.csv b/tests/regression/results.csv
index 3385c5049..f80da9f4e 100644
--- a/tests/regression/results.csv
+++ b/tests/regression/results.csv
@@ -51,7 +51,7 @@ silesia,                            long distance mode,                 compress
 silesia,                            multithreaded,                      compress cctx,                      4842075
 silesia,                            multithreaded long distance mode,   compress cctx,                      4842075
 silesia,                            small window log,                   compress cctx,                      7082951
-silesia,                            small hash log,                     compress cctx,                      6526141
+silesia,                            small hash log,                     compress cctx,                      6525895
 silesia,                            small chain log,                    compress cctx,                      4912197
 silesia,                            explicit params,                    compress cctx,                      4794052
 silesia,                            uncompressed literals,              compress cctx,                      4842075
@@ -115,7 +115,7 @@ silesia,                            long distance mode,                 zstdcli,
 silesia,                            multithreaded,                      zstdcli,                            4842123
 silesia,                            multithreaded long distance mode,   zstdcli,                            4833785
 silesia,                            small window log,                   zstdcli,                            7095048
-silesia,                            small hash log,                     zstdcli,                            6526189
+silesia,                            small hash log,                     zstdcli,                            6525943
 silesia,                            small chain log,                    zstdcli,                            4912245
 silesia,                            explicit params,                    zstdcli,                            4795432
 silesia,                            uncompressed literals,              zstdcli,                            5120614
@@ -141,7 +141,7 @@ silesia.tar,                        long distance mode,                 zstdcli,
 silesia.tar,                        multithreaded,                      zstdcli,                            4854164
 silesia.tar,                        multithreaded long distance mode,   zstdcli,                            4845745
 silesia.tar,                        small window log,                   zstdcli,                            7100701
-silesia.tar,                        small hash log,                     zstdcli,                            6529289
+silesia.tar,                        small hash log,                     zstdcli,                            6529041
 silesia.tar,                        small chain log,                    zstdcli,                            4917022
 silesia.tar,                        explicit params,                    zstdcli,                            4820713
 silesia.tar,                        uncompressed literals,              zstdcli,                            5122571
@@ -255,7 +255,7 @@ silesia,                            long distance mode,                 advanced
 silesia,                            multithreaded,                      advanced one pass,                  4842075
 silesia,                            multithreaded long distance mode,   advanced one pass,                  4833737
 silesia,                            small window log,                   advanced one pass,                  7095000
-silesia,                            small hash log,                     advanced one pass,                  6526141
+silesia,                            small hash log,                     advanced one pass,                  6525895
 silesia,                            small chain log,                    advanced one pass,                  4912197
 silesia,                            explicit params,                    advanced one pass,                  4795432
 silesia,                            uncompressed literals,              advanced one pass,                  5120566
@@ -289,7 +289,7 @@ silesia.tar,                        long distance mode,                 advanced
 silesia.tar,                        multithreaded,                      advanced one pass,                  4854160
 silesia.tar,                        multithreaded long distance mode,   advanced one pass,                  4845741
 silesia.tar,                        small window log,                   advanced one pass,                  7100655
-silesia.tar,                        small hash log,                     advanced one pass,                  6529231
+silesia.tar,                        small hash log,                     advanced one pass,                  6528983
 silesia.tar,                        small chain log,                    advanced one pass,                  4917041
 silesia.tar,                        explicit params,                    advanced one pass,                  4806855
 silesia.tar,                        uncompressed literals,              advanced one pass,                  5122473
@@ -573,7 +573,7 @@ silesia,                            long distance mode,                 advanced
 silesia,                            multithreaded,                      advanced one pass small out,        4842075
 silesia,                            multithreaded long distance mode,   advanced one pass small out,        4833737
 silesia,                            small window log,                   advanced one pass small out,        7095000
-silesia,                            small hash log,                     advanced one pass small out,        6526141
+silesia,                            small hash log,                     advanced one pass small out,        6525895
 silesia,                            small chain log,                    advanced one pass small out,        4912197
 silesia,                            explicit params,                    advanced one pass small out,        4795432
 silesia,                            uncompressed literals,              advanced one pass small out,        5120566
@@ -607,7 +607,7 @@ silesia.tar,                        long distance mode,                 advanced
 silesia.tar,                        multithreaded,                      advanced one pass small out,        4854160
 silesia.tar,                        multithreaded long distance mode,   advanced one pass small out,        4845741
 silesia.tar,                        small window log,                   advanced one pass small out,        7100655
-silesia.tar,                        small hash log,                     advanced one pass small out,        6529231
+silesia.tar,                        small hash log,                     advanced one pass small out,        6528983
 silesia.tar,                        small chain log,                    advanced one pass small out,        4917041
 silesia.tar,                        explicit params,                    advanced one pass small out,        4806855
 silesia.tar,                        uncompressed literals,              advanced one pass small out,        5122473
@@ -891,7 +891,7 @@ silesia,                            long distance mode,                 advanced
 silesia,                            multithreaded,                      advanced streaming,                 4842075
 silesia,                            multithreaded long distance mode,   advanced streaming,                 4833737
 silesia,                            small window log,                   advanced streaming,                 7111103
-silesia,                            small hash log,                     advanced streaming,                 6526141
+silesia,                            small hash log,                     advanced streaming,                 6525895
 silesia,                            small chain log,                    advanced streaming,                 4912197
 silesia,                            explicit params,                    advanced streaming,                 4795452
 silesia,                            uncompressed literals,              advanced streaming,                 5120566
@@ -925,7 +925,7 @@ silesia.tar,                        long distance mode,                 advanced
 silesia.tar,                        multithreaded,                      advanced streaming,                 4854160
 silesia.tar,                        multithreaded long distance mode,   advanced streaming,                 4845741
 silesia.tar,                        small window log,                   advanced streaming,                 7117559
-silesia.tar,                        small hash log,                     advanced streaming,                 6529234
+silesia.tar,                        small hash log,                     advanced streaming,                 6528986
 silesia.tar,                        small chain log,                    advanced streaming,                 4917021
 silesia.tar,                        explicit params,                    advanced streaming,                 4806873
 silesia.tar,                        uncompressed literals,              advanced streaming,                 5127423
@@ -1303,7 +1303,7 @@ silesia,                            long distance mode,                 old stre
 silesia,                            multithreaded,                      old streaming advanced,             4842075
 silesia,                            multithreaded long distance mode,   old streaming advanced,             4842075
 silesia,                            small window log,                   old streaming advanced,             7111103
-silesia,                            small hash log,                     old streaming advanced,             6526141
+silesia,                            small hash log,                     old streaming advanced,             6525895
 silesia,                            small chain log,                    old streaming advanced,             4912197
 silesia,                            explicit params,                    old streaming advanced,             4795452
 silesia,                            uncompressed literals,              old streaming advanced,             4842075
@@ -1329,7 +1329,7 @@ silesia.tar,                        long distance mode,                 old stre
 silesia.tar,                        multithreaded,                      old streaming advanced,             4859271
 silesia.tar,                        multithreaded long distance mode,   old streaming advanced,             4859271
 silesia.tar,                        small window log,                   old streaming advanced,             7117562
-silesia.tar,                        small hash log,                     old streaming advanced,             6529234
+silesia.tar,                        small hash log,                     old streaming advanced,             6528986
 silesia.tar,                        small chain log,                    old streaming advanced,             4917021
 silesia.tar,                        explicit params,                    old streaming advanced,             4806873
 silesia.tar,                        uncompressed literals,              old streaming advanced,             4859271