Skip to content

Commit 34ba144

Browse files
Cyan4973Cyan4973
committed
minor boundary change
improves compression ratio at low levels
1 parent ffa66a6 commit 34ba144

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ msanregressiontest:
296296

297297
update_regressionResults : REGRESS_RESULTS_DIR := /tmp/regress_results_dir/
298298
update_regressionResults:
299-
$(MAKE) -C programs zstd
300-
$(MAKE) -C tests/regression test
301-
$(RM) -rf $(REGRESS_RESULTS_DIR)
299+
$(MAKE) -j -C programs zstd
300+
$(MAKE) -j -C tests/regression test
301+
$(RM) -r $(REGRESS_RESULTS_DIR)
302302
$(MKDIR) $(REGRESS_RESULTS_DIR)
303303
./tests/regression/test \
304304
--cache tests/regression/cache \

‎lib/compress/zstd_compress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4960,7 +4960,7 @@ ZSTD_loadDictionaryContent(ZSTD_MatchState_t* ms,
49604960
}
49614961

49624962
/* If the dict is larger than we can reasonably index in our tables, only load the suffix. */
4963-
{ U32 maxDictSize = 2U << MIN(MAX(params->cParams.hashLog, params->cParams.chainLog), 30);
4963+
{ U32 maxDictSize = 1U << MIN(MAX(params->cParams.hashLog + 3, params->cParams.chainLog + 1), 31);
49644964
if (srcSize > maxDictSize) {
49654965
ip = iend - maxDictSize;
49664966
src = ip;

‎tests/regression/results.csv

+9-9
Original file line numberDiff line numberDiff line change
@@ -395,19 +395,19 @@ github, level 13 with dict, advanced
395395
github, level 13 with dict dms, advanced one pass, 39900
396396
github, level 13 with dict dds, advanced one pass, 39900
397397
github, level 13 with dict copy, advanced one pass, 39948
398-
github, level 13 with dict load, advanced one pass, 42624
398+
github, level 13 with dict load, advanced one pass, 42643
399399
github, level 16, advanced one pass, 133209
400400
github, level 16 with dict, advanced one pass, 37902
401401
github, level 16 with dict dms, advanced one pass, 37902
402402
github, level 16 with dict dds, advanced one pass, 37902
403403
github, level 16 with dict copy, advanced one pass, 37892
404-
github, level 16 with dict load, advanced one pass, 42402
404+
github, level 16 with dict load, advanced one pass, 42434
405405
github, level 19, advanced one pass, 132879
406406
github, level 19 with dict, advanced one pass, 37916
407407
github, level 19 with dict dms, advanced one pass, 37916
408408
github, level 19 with dict dds, advanced one pass, 37916
409409
github, level 19 with dict copy, advanced one pass, 37906
410-
github, level 19 with dict load, advanced one pass, 39770
410+
github, level 19 with dict load, advanced one pass, 40405
411411
github, no source size, advanced one pass, 136331
412412
github, no source size with dict, advanced one pass, 41118
413413
github, long distance mode, advanced one pass, 136331
@@ -713,19 +713,19 @@ github, level 13 with dict, advanced
713713
github, level 13 with dict dms, advanced one pass small out, 39900
714714
github, level 13 with dict dds, advanced one pass small out, 39900
715715
github, level 13 with dict copy, advanced one pass small out, 39948
716-
github, level 13 with dict load, advanced one pass small out, 42624
716+
github, level 13 with dict load, advanced one pass small out, 42643
717717
github, level 16, advanced one pass small out, 133209
718718
github, level 16 with dict, advanced one pass small out, 37902
719719
github, level 16 with dict dms, advanced one pass small out, 37902
720720
github, level 16 with dict dds, advanced one pass small out, 37902
721721
github, level 16 with dict copy, advanced one pass small out, 37892
722-
github, level 16 with dict load, advanced one pass small out, 42402
722+
github, level 16 with dict load, advanced one pass small out, 42434
723723
github, level 19, advanced one pass small out, 132879
724724
github, level 19 with dict, advanced one pass small out, 37916
725725
github, level 19 with dict dms, advanced one pass small out, 37916
726726
github, level 19 with dict dds, advanced one pass small out, 37916
727727
github, level 19 with dict copy, advanced one pass small out, 37906
728-
github, level 19 with dict load, advanced one pass small out, 39770
728+
github, level 19 with dict load, advanced one pass small out, 40405
729729
github, no source size, advanced one pass small out, 136331
730730
github, no source size with dict, advanced one pass small out, 41118
731731
github, long distance mode, advanced one pass small out, 136331
@@ -1031,19 +1031,19 @@ github, level 13 with dict, advanced
10311031
github, level 13 with dict dms, advanced streaming, 39900
10321032
github, level 13 with dict dds, advanced streaming, 39900
10331033
github, level 13 with dict copy, advanced streaming, 39948
1034-
github, level 13 with dict load, advanced streaming, 42624
1034+
github, level 13 with dict load, advanced streaming, 42643
10351035
github, level 16, advanced streaming, 133209
10361036
github, level 16 with dict, advanced streaming, 37902
10371037
github, level 16 with dict dms, advanced streaming, 37902
10381038
github, level 16 with dict dds, advanced streaming, 37902
10391039
github, level 16 with dict copy, advanced streaming, 37892
1040-
github, level 16 with dict load, advanced streaming, 42402
1040+
github, level 16 with dict load, advanced streaming, 42434
10411041
github, level 19, advanced streaming, 132879
10421042
github, level 19 with dict, advanced streaming, 37916
10431043
github, level 19 with dict dms, advanced streaming, 37916
10441044
github, level 19 with dict dds, advanced streaming, 37916
10451045
github, level 19 with dict copy, advanced streaming, 37906
1046-
github, level 19 with dict load, advanced streaming, 39770
1046+
github, level 19 with dict load, advanced streaming, 40405
10471047
github, no source size, advanced streaming, 136331
10481048
github, no source size with dict, advanced streaming, 41118
10491049
github, long distance mode, advanced streaming, 136331

0 commit comments

Comments
 (0)