[regression] Test ZSTD_c_literalCompressionMode

Test a positive compression level with uncompressed literals,
and a negative compression level with compressed literals.

I double checked the `results.csv` and made sure that the compressed
sizes make sense.

diff --git a/tests/regression/config.c b/tests/regression/config.c
index 8a6103b2929e5d18c3059a23ec6d8a7ede498e41..f04d32d8381b17d58771895d683132c58639c0c8 100644 (file)
--- a/tests/regression/config.c
+++ b/tests/regression/config.c
@@ -122,6 +122,26 @@ static config_t small_clog = {
     .param_values = PARAM_VALUES(small_clog_param_values),
 };
 
+static param_value_t const uncompressed_literals_param_values[] = {
+    {.param = ZSTD_c_compressionLevel, .value = 3},
+    {.param = ZSTD_c_literalCompressionMode, .value = ZSTD_lcm_uncompressed},
+};
+
+static config_t uncompressed_literals = {
+    .name = "uncompressed literals",
+    .param_values = PARAM_VALUES(uncompressed_literals_param_values),
+};
+
+static param_value_t const huffman_literals_param_values[] = {
+    {.param = ZSTD_c_compressionLevel, .value = -1},
+    {.param = ZSTD_c_literalCompressionMode, .value = ZSTD_lcm_huffman},
+};
+
+static config_t huffman_literals = {
+    .name = "huffman literals",
+    .param_values = PARAM_VALUES(huffman_literals_param_values),
+};
+
 static param_value_t const explicit_params_param_values[] = {
     {.param = ZSTD_c_checksumFlag, .value = 1},
     {.param = ZSTD_c_contentSizeFlag, .value = 0},
@@ -155,6 +175,8 @@ static config_t const* g_configs[] = {
     &small_hlog,
     &small_clog,
     &explicit_params,
+    &uncompressed_literals,
+    &huffman_literals,
     NULL,
 };
 

diff --git a/tests/regression/results.csv b/tests/regression/results.csv
index a62178d6ed0cba08ccc5b8b84ed908e4ea73768a..d9c5a4a0a5d1728a377afcab17f712b14dc77d93 100644 (file)
--- a/tests/regression/results.csv
+++ b/tests/regression/results.csv
@@ -13,6 +13,8 @@ silesia.tar,                      level 9,                          compress sim
 silesia.tar,                      level 13,                         compress simple,                  4491702
 silesia.tar,                      level 16,                         compress simple,                  4381277
 silesia.tar,                      level 19,                         compress simple,                  4281514
+silesia.tar,                      uncompressed literals,            compress simple,                  4875008
+silesia.tar,                      huffman literals,                 compress simple,                  6195462
 silesia,                          level -5,                         compress cctx,                    7152294
 silesia,                          level -3,                         compress cctx,                    6789969
 silesia,                          level -1,                         compress cctx,                    6191548
@@ -34,6 +36,8 @@ silesia,                          small window log,                 compress cct
 silesia,                          small hash log,                   compress cctx,                    6554898
 silesia,                          small chain log,                  compress cctx,                    4931093
 silesia,                          explicit params,                  compress cctx,                    4813352
+silesia,                          uncompressed literals,            compress cctx,                    4862377
+silesia,                          huffman literals,                 compress cctx,                    6191548
 github,                           level -5,                         compress cctx,                    232744
 github,                           level -5 with dict,               compress cctx,                    47294
 github,                           level -3,                         compress cctx,                    220611
@@ -69,6 +73,8 @@ github,                           small window log,                 compress cct
 github,                           small hash log,                   compress cctx,                    decompression error
 github,                           small chain log,                  compress cctx,                    decompression error
 github,                           explicit params,                  compress cctx,                    decompression error
+github,                           uncompressed literals,            compress cctx,                    136397
+github,                           huffman literals,                 compress cctx,                    176575
 silesia,                          level -5,                         zstdcli,                          7152342
 silesia,                          level -3,                         zstdcli,                          6790021
 silesia,                          level -1,                         zstdcli,                          6191597
@@ -169,6 +175,8 @@ silesia,                          small window log,                 advanced one
 silesia,                          small hash log,                   advanced one pass,                6554898
 silesia,                          small chain log,                  advanced one pass,                4931093
 silesia,                          explicit params,                  advanced one pass,                4815369
+silesia,                          uncompressed literals,            advanced one pass,                5155424
+silesia,                          huffman literals,                 advanced one pass,                5341356
 silesia.tar,                      level -5,                         advanced one pass,                7160438
 silesia.tar,                      level -3,                         advanced one pass,                6789024
 silesia.tar,                      level -1,                         advanced one pass,                6195462
@@ -191,6 +199,8 @@ silesia.tar,                      small window log,                 advanced one
 silesia.tar,                      small hash log,                   advanced one pass,                6587833
 silesia.tar,                      small chain log,                  advanced one pass,                4943255
 silesia.tar,                      explicit params,                  advanced one pass,                4829974
+silesia.tar,                      uncompressed literals,            advanced one pass,                5157992
+silesia.tar,                      huffman literals,                 advanced one pass,                5358079
 github,                           level -5,                         advanced one pass,                232744
 github,                           level -5 with dict,               advanced one pass,                46718
 github,                           level -3,                         advanced one pass,                220611
@@ -227,6 +237,8 @@ github,                           small window log,                 advanced one
 github,                           small hash log,                   advanced one pass,                135467
 github,                           small chain log,                  advanced one pass,                136314
 github,                           explicit params,                  advanced one pass,                137670
+github,                           uncompressed literals,            advanced one pass,                167004
+github,                           huffman literals,                 advanced one pass,                143457
 silesia,                          level -5,                         advanced one pass small out,      7152294
 silesia,                          level -3,                         advanced one pass small out,      6789969
 silesia,                          level -1,                         advanced one pass small out,      6191548
@@ -249,6 +261,8 @@ silesia,                          small window log,                 advanced one
 silesia,                          small hash log,                   advanced one pass small out,      6554898
 silesia,                          small chain log,                  advanced one pass small out,      4931093
 silesia,                          explicit params,                  advanced one pass small out,      4815369
+silesia,                          uncompressed literals,            advanced one pass small out,      5155424
+silesia,                          huffman literals,                 advanced one pass small out,      5341356
 silesia.tar,                      level -5,                         advanced one pass small out,      7160438
 silesia.tar,                      level -3,                         advanced one pass small out,      6789024
 silesia.tar,                      level -1,                         advanced one pass small out,      6195462
@@ -271,6 +285,8 @@ silesia.tar,                      small window log,                 advanced one
 silesia.tar,                      small hash log,                   advanced one pass small out,      6587833
 silesia.tar,                      small chain log,                  advanced one pass small out,      4943255
 silesia.tar,                      explicit params,                  advanced one pass small out,      4829974
+silesia.tar,                      uncompressed literals,            advanced one pass small out,      5157992
+silesia.tar,                      huffman literals,                 advanced one pass small out,      5358079
 github,                           level -5,                         advanced one pass small out,      232744
 github,                           level -5 with dict,               advanced one pass small out,      46718
 github,                           level -3,                         advanced one pass small out,      220611
@@ -307,6 +323,8 @@ github,                           small window log,                 advanced one
 github,                           small hash log,                   advanced one pass small out,      135467
 github,                           small chain log,                  advanced one pass small out,      136314
 github,                           explicit params,                  advanced one pass small out,      137670
+github,                           uncompressed literals,            advanced one pass small out,      167004
+github,                           huffman literals,                 advanced one pass small out,      143457
 silesia,                          level -5,                         advanced streaming,               7152294
 silesia,                          level -3,                         advanced streaming,               6789973
 silesia,                          level -1,                         advanced streaming,               6191549
@@ -329,6 +347,8 @@ silesia,                          small window log,                 advanced str
 silesia,                          small hash log,                   advanced streaming,               6554898
 silesia,                          small chain log,                  advanced streaming,               4931093
 silesia,                          explicit params,                  advanced streaming,               4815380
+silesia,                          uncompressed literals,            advanced streaming,               5155424
+silesia,                          huffman literals,                 advanced streaming,               5341357
 silesia.tar,                      level -5,                         advanced streaming,               7160440
 silesia.tar,                      level -3,                         advanced streaming,               6789026
 silesia.tar,                      level -1,                         advanced streaming,               6195465
@@ -351,6 +371,8 @@ silesia.tar,                      small window log,                 advanced str
 silesia.tar,                      small hash log,                   advanced streaming,               6587834
 silesia.tar,                      small chain log,                  advanced streaming,               4943260
 silesia.tar,                      explicit params,                  advanced streaming,               4830002
+silesia.tar,                      uncompressed literals,            advanced streaming,               5157995
+silesia.tar,                      huffman literals,                 advanced streaming,               5358083
 github,                           level -5,                         advanced streaming,               232744
 github,                           level -5 with dict,               advanced streaming,               46718
 github,                           level -3,                         advanced streaming,               220611
@@ -387,6 +409,8 @@ github,                           small window log,                 advanced str
 github,                           small hash log,                   advanced streaming,               135467
 github,                           small chain log,                  advanced streaming,               136314
 github,                           explicit params,                  advanced streaming,               137670
+github,                           uncompressed literals,            advanced streaming,               167004
+github,                           huffman literals,                 advanced streaming,               143457
 silesia,                          level -5,                         old streaming,                    7152294
 silesia,                          level -3,                         old streaming,                    6789973
 silesia,                          level -1,                         old streaming,                    6191549
@@ -402,6 +426,8 @@ silesia,                          level 13,                         old streamin
 silesia,                          level 16,                         old streaming,                    4377391
 silesia,                          level 19,                         old streaming,                    4293262
 silesia,                          no source size,                   old streaming,                    4862341
+silesia,                          uncompressed literals,            old streaming,                    4862377
+silesia,                          huffman literals,                 old streaming,                    6191549
 silesia.tar,                      level -5,                         old streaming,                    7160440
 silesia.tar,                      level -3,                         old streaming,                    6789026
 silesia.tar,                      level -1,                         old streaming,                    6195465
@@ -417,6 +443,8 @@ silesia.tar,                      level 13,                         old streamin
 silesia.tar,                      level 16,                         old streaming,                    4381277
 silesia.tar,                      level 19,                         old streaming,                    4281514
 silesia.tar,                      no source size,                   old streaming,                    4875006
+silesia.tar,                      uncompressed literals,            old streaming,                    4875010
+silesia.tar,                      huffman literals,                 old streaming,                    6195465
 github,                           level -5,                         old streaming,                    232744
 github,                           level -5 with dict,               old streaming,                    46718
 github,                           level -3,                         old streaming,                    220611
@@ -446,3 +474,5 @@ github,                           level 16 with dict,               old streamin
 github,                           level 19,                         old streaming,                    133717
 github,                           level 19 with dict,               old streaming,                    37576
 github,                           no source size,                   old streaming,                    141003
+github,                           uncompressed literals,            old streaming,                    136397
+github,                           huffman literals,                 old streaming,                    176575