Skip to content

Commit

Permalink
minor boundary change
Browse files Browse the repository at this point in the history 
improves compression ratio at low levels
  • Loading branch information
@Cyan4973
Cyan4973 committed Jan 31, 2025
1 parent 158aec8 commit 5ef6e51
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ msanregressiontest:

update_regressionResults : REGRESS_RESULTS_DIR := /tmp/regress_results_dir/
update_regressionResults:
$(MAKE) -C programs zstd
$(MAKE) -C tests/regression test
$(RM) -rf $(REGRESS_RESULTS_DIR)
$(MAKE) -j -C programs zstd
$(MAKE) -j -C tests/regression test
$(RM) -r $(REGRESS_RESULTS_DIR)
$(MKDIR) $(REGRESS_RESULTS_DIR)
./tests/regression/test \
--cache tests/regression/cache \
Expand Down
2 changes: 1 addition & 1 deletion lib/compress/zstd_compress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4960,7 +4960,7 @@ ZSTD_loadDictionaryContent(ZSTD_MatchState_t* ms,
}

/* If the dict is larger than we can reasonably index in our tables, only load the suffix. */
{ U32 maxDictSize = 2U << MIN(MAX(params->cParams.hashLog, params->cParams.chainLog), 30);
{ U32 maxDictSize = 1U << MIN(MAX(params->cParams.hashLog + 3, params->cParams.chainLog + 1), 31);
if (srcSize > maxDictSize) {
ip = iend - maxDictSize;
src = ip;
Expand Down
18 changes: 9 additions & 9 deletions tests/regression/results.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,19 @@ github, level 13 with dict, advanced
github, level 13 with dict dms, advanced one pass, 39900
github, level 13 with dict dds, advanced one pass, 39900
github, level 13 with dict copy, advanced one pass, 39948
github, level 13 with dict load, advanced one pass, 42624
github, level 13 with dict load, advanced one pass, 42643
github, level 16, advanced one pass, 133209
github, level 16 with dict, advanced one pass, 37902
github, level 16 with dict dms, advanced one pass, 37902
github, level 16 with dict dds, advanced one pass, 37902
github, level 16 with dict copy, advanced one pass, 37892
github, level 16 with dict load, advanced one pass, 42402
github, level 16 with dict load, advanced one pass, 42434
github, level 19, advanced one pass, 132879
github, level 19 with dict, advanced one pass, 37916
github, level 19 with dict dms, advanced one pass, 37916
github, level 19 with dict dds, advanced one pass, 37916
github, level 19 with dict copy, advanced one pass, 37906
github, level 19 with dict load, advanced one pass, 39770
github, level 19 with dict load, advanced one pass, 40405
github, no source size, advanced one pass, 136331
github, no source size with dict, advanced one pass, 41118
github, long distance mode, advanced one pass, 136331
Expand Down Expand Up @@ -713,19 +713,19 @@ github, level 13 with dict, advanced
github, level 13 with dict dms, advanced one pass small out, 39900
github, level 13 with dict dds, advanced one pass small out, 39900
github, level 13 with dict copy, advanced one pass small out, 39948
github, level 13 with dict load, advanced one pass small out, 42624
github, level 13 with dict load, advanced one pass small out, 42643
github, level 16, advanced one pass small out, 133209
github, level 16 with dict, advanced one pass small out, 37902
github, level 16 with dict dms, advanced one pass small out, 37902
github, level 16 with dict dds, advanced one pass small out, 37902
github, level 16 with dict copy, advanced one pass small out, 37892
github, level 16 with dict load, advanced one pass small out, 42402
github, level 16 with dict load, advanced one pass small out, 42434
github, level 19, advanced one pass small out, 132879
github, level 19 with dict, advanced one pass small out, 37916
github, level 19 with dict dms, advanced one pass small out, 37916
github, level 19 with dict dds, advanced one pass small out, 37916
github, level 19 with dict copy, advanced one pass small out, 37906
github, level 19 with dict load, advanced one pass small out, 39770
github, level 19 with dict load, advanced one pass small out, 40405
github, no source size, advanced one pass small out, 136331
github, no source size with dict, advanced one pass small out, 41118
github, long distance mode, advanced one pass small out, 136331
Expand Down Expand Up @@ -1031,19 +1031,19 @@ github, level 13 with dict, advanced
github, level 13 with dict dms, advanced streaming, 39900
github, level 13 with dict dds, advanced streaming, 39900
github, level 13 with dict copy, advanced streaming, 39948
github, level 13 with dict load, advanced streaming, 42624
github, level 13 with dict load, advanced streaming, 42643
github, level 16, advanced streaming, 133209
github, level 16 with dict, advanced streaming, 37902
github, level 16 with dict dms, advanced streaming, 37902
github, level 16 with dict dds, advanced streaming, 37902
github, level 16 with dict copy, advanced streaming, 37892
github, level 16 with dict load, advanced streaming, 42402
github, level 16 with dict load, advanced streaming, 42434
github, level 19, advanced streaming, 132879
github, level 19 with dict, advanced streaming, 37916
github, level 19 with dict dms, advanced streaming, 37916
github, level 19 with dict dds, advanced streaming, 37916
github, level 19 with dict copy, advanced streaming, 37906
github, level 19 with dict load, advanced streaming, 39770
github, level 19 with dict load, advanced streaming, 40405
github, no source size, advanced streaming, 136331
github, no source size with dict, advanced streaming, 41118
github, long distance mode, advanced streaming, 136331
Expand Down

0 comments on commit 5ef6e51

Please sign in to comment.