lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

update hrlog rule to favor compression ratio a bit more at low levels

Browse Source
This commit is contained in:
Yann Collet
2025-02-07 18:57:44 -08:00
committed by Yann Collet
parent 7c5b6002c9
commit 72406b71c3
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compress/zstd_ldm.c
View File

@ -141,7 +141,7 @@ void ZSTD_ldm_adjustParameters(ldmParams_t* params,
if (params->hashRateLog == 0) { if (params->hashRateLog == 0) {
assert(1 <= (int)cParams->strategy && (int)cParams->strategy <= 9); assert(1 <= (int)cParams->strategy && (int)cParams->strategy <= 9);
/* mapping: strat1 -> rate8 ... strat9 -> rate4*/ /* mapping: strat1 -> rate8 ... strat9 -> rate4*/
params->hashRateLog = 9 - ((cParams->strategy+1)/2); params->hashRateLog = 7 - (cParams->strategy/3);
} }
if (params->hashLog == 0) { if (params->hashLog == 0) {
params->hashLog = MAX(ZSTD_HASHLOG_MIN, params->windowLog - params->hashRateLog); params->hashLog = MAX(ZSTD_HASHLOG_MIN, params->windowLog - params->hashRateLog);

2
programs/zstd.1.md
View File

@ -464,7 +464,7 @@ The list of available _options_:
Larger values will improve compression speed. Deviating far from the Larger values will improve compression speed. Deviating far from the
default value will likely result in a decrease in compression ratio. default value will likely result in a decrease in compression ratio.
The default value varies between 4 and 8, depending on `strategy`. The default value varies between 4 and 7, depending on `strategy`.
- `ldmHashLog`=_lhlog_, `lhlog`=_lhlog_: - `ldmHashLog`=_lhlog_, `lhlog`=_lhlog_:
Specify the maximum size for a hash table used for long distance matching. Specify the maximum size for a hash table used for long distance matching.

48
tests/regression/results.csv
View File

@ -111,9 +111,9 @@ silesia, level 9, zstdcli,
silesia, level 13, zstdcli, 4488438 silesia, level 13, zstdcli, 4488438
silesia, level 16, zstdcli, 4358150 silesia, level 16, zstdcli, 4358150
silesia, level 19, zstdcli, 4265929 silesia, level 19, zstdcli, 4265929
silesia, long distance mode, zstdcli, 4828930 silesia, long distance mode, zstdcli, 4827199
silesia, multithreaded, zstdcli, 4833113 silesia, multithreaded, zstdcli, 4833113
silesia, multithreaded long distance mode, zstdcli, 4828930 silesia, multithreaded long distance mode, zstdcli, 4827199
silesia, small window log, zstdcli, 7094528 silesia, small window log, zstdcli, 7094528
silesia, small hash log, zstdcli, 6527214 silesia, small hash log, zstdcli, 6527214
silesia, small chain log, zstdcli, 4911647 silesia, small chain log, zstdcli, 4911647
@ -137,9 +137,9 @@ silesia.tar, level 13, zstdcli,
silesia.tar, level 16, zstdcli, 4357018 silesia.tar, level 16, zstdcli, 4357018
silesia.tar, level 19, zstdcli, 4259593 silesia.tar, level 19, zstdcli, 4259593
silesia.tar, no source size, zstdcli, 4836000 silesia.tar, no source size, zstdcli, 4836000
silesia.tar, long distance mode, zstdcli, 4833141 silesia.tar, long distance mode, zstdcli, 4831415
silesia.tar, multithreaded, zstdcli, 4836004 silesia.tar, multithreaded, zstdcli, 4836004
silesia.tar, multithreaded long distance mode, zstdcli, 4833141 silesia.tar, multithreaded long distance mode, zstdcli, 4831415
silesia.tar, small window log, zstdcli, 7100110 silesia.tar, small window log, zstdcli, 7100110
silesia.tar, small hash log, zstdcli, 6530127 silesia.tar, small hash log, zstdcli, 6530127
silesia.tar, small chain log, zstdcli, 4915865 silesia.tar, small chain log, zstdcli, 4915865
@ -217,9 +217,9 @@ github.tar, level 19, zstdcli,
github.tar, level 19 with dict, zstdcli, 32705 github.tar, level 19 with dict, zstdcli, 32705
github.tar, no source size, zstdcli, 38885 github.tar, no source size, zstdcli, 38885
github.tar, no source size with dict, zstdcli, 38115 github.tar, no source size with dict, zstdcli, 38115
github.tar, long distance mode, zstdcli, 38801 github.tar, long distance mode, zstdcli, 38775
github.tar, multithreaded, zstdcli, 38888 github.tar, multithreaded, zstdcli, 38888
github.tar, multithreaded long distance mode, zstdcli, 38801 github.tar, multithreaded long distance mode, zstdcli, 38775
github.tar, small window log, zstdcli, 198539 github.tar, small window log, zstdcli, 198539
github.tar, small hash log, zstdcli, 129874 github.tar, small hash log, zstdcli, 129874
github.tar, small chain log, zstdcli, 41673 github.tar, small chain log, zstdcli, 41673
@ -251,9 +251,9 @@ silesia, level 13, advanced
silesia, level 16, advanced one pass, 4356799 silesia, level 16, advanced one pass, 4356799
silesia, level 19, advanced one pass, 4265851 silesia, level 19, advanced one pass, 4265851
silesia, no source size, advanced one pass, 4832054 silesia, no source size, advanced one pass, 4832054
silesia, long distance mode, advanced one pass, 4827748 silesia, long distance mode, advanced one pass, 4826152
silesia, multithreaded, advanced one pass, 4833065 silesia, multithreaded, advanced one pass, 4833065
silesia, multithreaded long distance mode, advanced one pass, 4828882 silesia, multithreaded long distance mode, advanced one pass, 4827151
silesia, small window log, advanced one pass, 7094480 silesia, small window log, advanced one pass, 7094480
silesia, small hash log, advanced one pass, 6525510 silesia, small hash log, advanced one pass, 6525510
silesia, small chain log, advanced one pass, 4912248 silesia, small chain log, advanced one pass, 4912248
@ -285,9 +285,9 @@ silesia.tar, level 13, advanced
silesia.tar, level 16, advanced one pass, 4355572 silesia.tar, level 16, advanced one pass, 4355572
silesia.tar, level 19, advanced one pass, 4257629 silesia.tar, level 19, advanced one pass, 4257629
silesia.tar, no source size, advanced one pass, 4829268 silesia.tar, no source size, advanced one pass, 4829268
silesia.tar, long distance mode, advanced one pass, 4821065 silesia.tar, long distance mode, advanced one pass, 4819329
silesia.tar, multithreaded, advanced one pass, 4836000 silesia.tar, multithreaded, advanced one pass, 4836000
silesia.tar, multithreaded long distance mode, advanced one pass, 4833137 silesia.tar, multithreaded long distance mode, advanced one pass, 4831411
silesia.tar, small window log, advanced one pass, 7100064 silesia.tar, small window log, advanced one pass, 7100064
silesia.tar, small hash log, advanced one pass, 6530222 silesia.tar, small hash log, advanced one pass, 6530222
silesia.tar, small chain log, advanced one pass, 4915689 silesia.tar, small chain log, advanced one pass, 4915689
@ -535,9 +535,9 @@ github.tar, level 19 with dict copy, advanced
github.tar, level 19 with dict load, advanced one pass, 32428 github.tar, level 19 with dict load, advanced one pass, 32428
github.tar, no source size, advanced one pass, 38884 github.tar, no source size, advanced one pass, 38884
github.tar, no source size with dict, advanced one pass, 37995 github.tar, no source size with dict, advanced one pass, 37995
github.tar, long distance mode, advanced one pass, 38797 github.tar, long distance mode, advanced one pass, 38771
github.tar, multithreaded, advanced one pass, 38884 github.tar, multithreaded, advanced one pass, 38884
github.tar, multithreaded long distance mode, advanced one pass, 38797 github.tar, multithreaded long distance mode, advanced one pass, 38771
github.tar, small window log, advanced one pass, 198535 github.tar, small window log, advanced one pass, 198535
github.tar, small hash log, advanced one pass, 129870 github.tar, small hash log, advanced one pass, 129870
github.tar, small chain log, advanced one pass, 41669 github.tar, small chain log, advanced one pass, 41669
@ -569,9 +569,9 @@ silesia, level 13, advanced
silesia, level 16, advanced one pass small out, 4356799 silesia, level 16, advanced one pass small out, 4356799
silesia, level 19, advanced one pass small out, 4265851 silesia, level 19, advanced one pass small out, 4265851
silesia, no source size, advanced one pass small out, 4832054 silesia, no source size, advanced one pass small out, 4832054
silesia, long distance mode, advanced one pass small out, 4827748 silesia, long distance mode, advanced one pass small out, 4826152
silesia, multithreaded, advanced one pass small out, 4833065 silesia, multithreaded, advanced one pass small out, 4833065
silesia, multithreaded long distance mode, advanced one pass small out, 4828882 silesia, multithreaded long distance mode, advanced one pass small out, 4827151
silesia, small window log, advanced one pass small out, 7094480 silesia, small window log, advanced one pass small out, 7094480
silesia, small hash log, advanced one pass small out, 6525510 silesia, small hash log, advanced one pass small out, 6525510
silesia, small chain log, advanced one pass small out, 4912248 silesia, small chain log, advanced one pass small out, 4912248
@ -603,9 +603,9 @@ silesia.tar, level 13, advanced
silesia.tar, level 16, advanced one pass small out, 4355572 silesia.tar, level 16, advanced one pass small out, 4355572
silesia.tar, level 19, advanced one pass small out, 4257629 silesia.tar, level 19, advanced one pass small out, 4257629
silesia.tar, no source size, advanced one pass small out, 4829268 silesia.tar, no source size, advanced one pass small out, 4829268
silesia.tar, long distance mode, advanced one pass small out, 4821065 silesia.tar, long distance mode, advanced one pass small out, 4819329
silesia.tar, multithreaded, advanced one pass small out, 4836000 silesia.tar, multithreaded, advanced one pass small out, 4836000
silesia.tar, multithreaded long distance mode, advanced one pass small out, 4833137 silesia.tar, multithreaded long distance mode, advanced one pass small out, 4831411
silesia.tar, small window log, advanced one pass small out, 7100064 silesia.tar, small window log, advanced one pass small out, 7100064
silesia.tar, small hash log, advanced one pass small out, 6530222 silesia.tar, small hash log, advanced one pass small out, 6530222
silesia.tar, small chain log, advanced one pass small out, 4915689 silesia.tar, small chain log, advanced one pass small out, 4915689
@ -853,9 +853,9 @@ github.tar, level 19 with dict copy, advanced
github.tar, level 19 with dict load, advanced one pass small out, 32428 github.tar, level 19 with dict load, advanced one pass small out, 32428
github.tar, no source size, advanced one pass small out, 38884 github.tar, no source size, advanced one pass small out, 38884
github.tar, no source size with dict, advanced one pass small out, 37995 github.tar, no source size with dict, advanced one pass small out, 37995
github.tar, long distance mode, advanced one pass small out, 38797 github.tar, long distance mode, advanced one pass small out, 38771
github.tar, multithreaded, advanced one pass small out, 38884 github.tar, multithreaded, advanced one pass small out, 38884
github.tar, multithreaded long distance mode, advanced one pass small out, 38797 github.tar, multithreaded long distance mode, advanced one pass small out, 38771
github.tar, small window log, advanced one pass small out, 198535 github.tar, small window log, advanced one pass small out, 198535
github.tar, small hash log, advanced one pass small out, 129870 github.tar, small hash log, advanced one pass small out, 129870
github.tar, small chain log, advanced one pass small out, 41669 github.tar, small chain log, advanced one pass small out, 41669
@ -887,9 +887,9 @@ silesia, level 13, advanced
silesia, level 16, advanced streaming, 4358094 silesia, level 16, advanced streaming, 4358094
silesia, level 19, advanced streaming, 4265908 silesia, level 19, advanced streaming, 4265908
silesia, no source size, advanced streaming, 4835768 silesia, no source size, advanced streaming, 4835768
silesia, long distance mode, advanced streaming, 4831544 silesia, long distance mode, advanced streaming, 4829919
silesia, multithreaded, advanced streaming, 4833065 silesia, multithreaded, advanced streaming, 4833065
silesia, multithreaded long distance mode, advanced streaming, 4828882 silesia, multithreaded long distance mode, advanced streaming, 4827151
silesia, small window log, advanced streaming, 7110591 silesia, small window log, advanced streaming, 7110591
silesia, small hash log, advanced streaming, 6525259 silesia, small hash log, advanced streaming, 6525259
silesia, small chain log, advanced streaming, 4911577 silesia, small chain log, advanced streaming, 4911577
@ -921,9 +921,9 @@ silesia.tar, level 13, advanced
silesia.tar, level 16, advanced streaming, 4358029 silesia.tar, level 16, advanced streaming, 4358029
silesia.tar, level 19, advanced streaming, 4258228 silesia.tar, level 19, advanced streaming, 4258228
silesia.tar, no source size, advanced streaming, 4846779 silesia.tar, no source size, advanced streaming, 4846779
silesia.tar, long distance mode, advanced streaming, 4831119 silesia.tar, long distance mode, advanced streaming, 4829404
silesia.tar, multithreaded, advanced streaming, 4836000 silesia.tar, multithreaded, advanced streaming, 4836000
silesia.tar, multithreaded long distance mode, advanced streaming, 4833137 silesia.tar, multithreaded long distance mode, advanced streaming, 4831411
silesia.tar, small window log, advanced streaming, 7117024 silesia.tar, small window log, advanced streaming, 7117024
silesia.tar, small hash log, advanced streaming, 6529503 silesia.tar, small hash log, advanced streaming, 6529503
silesia.tar, small chain log, advanced streaming, 4915956 silesia.tar, small chain log, advanced streaming, 4915956
@ -1171,9 +1171,9 @@ github.tar, level 19 with dict copy, advanced
github.tar, level 19 with dict load, advanced streaming, 32428 github.tar, level 19 with dict load, advanced streaming, 32428
github.tar, no source size, advanced streaming, 38881 github.tar, no source size, advanced streaming, 38881
github.tar, no source size with dict, advanced streaming, 38111 github.tar, no source size with dict, advanced streaming, 38111
github.tar, long distance mode, advanced streaming, 38797 github.tar, long distance mode, advanced streaming, 38771
github.tar, multithreaded, advanced streaming, 38884 github.tar, multithreaded, advanced streaming, 38884
github.tar, multithreaded long distance mode, advanced streaming, 38797 github.tar, multithreaded long distance mode, advanced streaming, 38771
github.tar, small window log, advanced streaming, 199553 github.tar, small window log, advanced streaming, 199553
github.tar, small hash log, advanced streaming, 129870 github.tar, small hash log, advanced streaming, 129870
github.tar, small chain log, advanced streaming, 41669 github.tar, small chain log, advanced streaming, 41669

1 Data Config Method Total compressed size
111 silesia level 13 zstdcli 4488438
112 silesia level 16 zstdcli 4358150
113 silesia level 19 zstdcli 4265929
114 silesia long distance mode zstdcli 4828930 4827199
115 silesia multithreaded zstdcli 4833113
116 silesia multithreaded long distance mode zstdcli 4828930 4827199
117 silesia small window log zstdcli 7094528
118 silesia small hash log zstdcli 6527214
119 silesia small chain log zstdcli 4911647
137 silesia.tar level 16 zstdcli 4357018
138 silesia.tar level 19 zstdcli 4259593
139 silesia.tar no source size zstdcli 4836000
140 silesia.tar long distance mode zstdcli 4833141 4831415
141 silesia.tar multithreaded zstdcli 4836004
142 silesia.tar multithreaded long distance mode zstdcli 4833141 4831415
143 silesia.tar small window log zstdcli 7100110
144 silesia.tar small hash log zstdcli 6530127
145 silesia.tar small chain log zstdcli 4915865
217 github.tar level 19 with dict zstdcli 32705
218 github.tar no source size zstdcli 38885
219 github.tar no source size with dict zstdcli 38115
220 github.tar long distance mode zstdcli 38801 38775
221 github.tar multithreaded zstdcli 38888
222 github.tar multithreaded long distance mode zstdcli 38801 38775
223 github.tar small window log zstdcli 198539
224 github.tar small hash log zstdcli 129874
225 github.tar small chain log zstdcli 41673
251 silesia level 16 advanced one pass 4356799
252 silesia level 19 advanced one pass 4265851
253 silesia no source size advanced one pass 4832054
254 silesia long distance mode advanced one pass 4827748 4826152
255 silesia multithreaded advanced one pass 4833065
256 silesia multithreaded long distance mode advanced one pass 4828882 4827151
257 silesia small window log advanced one pass 7094480
258 silesia small hash log advanced one pass 6525510
259 silesia small chain log advanced one pass 4912248
285 silesia.tar level 16 advanced one pass 4355572
286 silesia.tar level 19 advanced one pass 4257629
287 silesia.tar no source size advanced one pass 4829268
288 silesia.tar long distance mode advanced one pass 4821065 4819329
289 silesia.tar multithreaded advanced one pass 4836000
290 silesia.tar multithreaded long distance mode advanced one pass 4833137 4831411
291 silesia.tar small window log advanced one pass 7100064
292 silesia.tar small hash log advanced one pass 6530222
293 silesia.tar small chain log advanced one pass 4915689
535 github.tar level 19 with dict load advanced one pass 32428
536 github.tar no source size advanced one pass 38884
537 github.tar no source size with dict advanced one pass 37995
538 github.tar long distance mode advanced one pass 38797 38771
539 github.tar multithreaded advanced one pass 38884
540 github.tar multithreaded long distance mode advanced one pass 38797 38771
541 github.tar small window log advanced one pass 198535
542 github.tar small hash log advanced one pass 129870
543 github.tar small chain log advanced one pass 41669
569 silesia level 16 advanced one pass small out 4356799
570 silesia level 19 advanced one pass small out 4265851
571 silesia no source size advanced one pass small out 4832054
572 silesia long distance mode advanced one pass small out 4827748 4826152
573 silesia multithreaded advanced one pass small out 4833065
574 silesia multithreaded long distance mode advanced one pass small out 4828882 4827151
575 silesia small window log advanced one pass small out 7094480
576 silesia small hash log advanced one pass small out 6525510
577 silesia small chain log advanced one pass small out 4912248
603 silesia.tar level 16 advanced one pass small out 4355572
604 silesia.tar level 19 advanced one pass small out 4257629
605 silesia.tar no source size advanced one pass small out 4829268
606 silesia.tar long distance mode advanced one pass small out 4821065 4819329
607 silesia.tar multithreaded advanced one pass small out 4836000
608 silesia.tar multithreaded long distance mode advanced one pass small out 4833137 4831411
609 silesia.tar small window log advanced one pass small out 7100064
610 silesia.tar small hash log advanced one pass small out 6530222
611 silesia.tar small chain log advanced one pass small out 4915689
853 github.tar level 19 with dict load advanced one pass small out 32428
854 github.tar no source size advanced one pass small out 38884
855 github.tar no source size with dict advanced one pass small out 37995
856 github.tar long distance mode advanced one pass small out 38797 38771
857 github.tar multithreaded advanced one pass small out 38884
858 github.tar multithreaded long distance mode advanced one pass small out 38797 38771
859 github.tar small window log advanced one pass small out 198535
860 github.tar small hash log advanced one pass small out 129870
861 github.tar small chain log advanced one pass small out 41669
887 silesia level 16 advanced streaming 4358094
888 silesia level 19 advanced streaming 4265908
889 silesia no source size advanced streaming 4835768
890 silesia long distance mode advanced streaming 4831544 4829919
891 silesia multithreaded advanced streaming 4833065
892 silesia multithreaded long distance mode advanced streaming 4828882 4827151
893 silesia small window log advanced streaming 7110591
894 silesia small hash log advanced streaming 6525259
895 silesia small chain log advanced streaming 4911577
921 silesia.tar level 16 advanced streaming 4358029
922 silesia.tar level 19 advanced streaming 4258228
923 silesia.tar no source size advanced streaming 4846779
924 silesia.tar long distance mode advanced streaming 4831119 4829404
925 silesia.tar multithreaded advanced streaming 4836000
926 silesia.tar multithreaded long distance mode advanced streaming 4833137 4831411
927 silesia.tar small window log advanced streaming 7117024
928 silesia.tar small hash log advanced streaming 6529503
929 silesia.tar small chain log advanced streaming 4915956
1171 github.tar level 19 with dict load advanced streaming 32428
1172 github.tar no source size advanced streaming 38881
1173 github.tar no source size with dict advanced streaming 38111
1174 github.tar long distance mode advanced streaming 38797 38771
1175 github.tar multithreaded advanced streaming 38884
1176 github.tar multithreaded long distance mode advanced streaming 38797 38771
1177 github.tar small window log advanced streaming 199553
1178 github.tar small hash log advanced streaming 129870
1179 github.tar small chain log advanced streaming 41669