From: daniellerozenblit <48103643+daniellerozenblit@users.noreply.github.com> Date: Wed, 15 Mar 2023 00:36:56 +0000 (-0400) Subject: patch-from speed optimization (#3545) X-Git-Tag: v1.5.5~2^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53bad103ce61fd2c170bf49bf335201a8a51f72f;p=thirdparty%2Fzstd.git patch-from speed optimization (#3545) * patch-from speed optimization: only load portion of dictionary into normal matchfinders * test regression for x8 multiplier * fix off-by-one error for bit shift bound * restrict patchfrom speed optimization to strategy < ZSTD_btultra * update results.csv * update regression test --- diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 77cb82e21..38064e21c 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -4693,7 +4693,8 @@ static size_t ZSTD_loadDictionaryContent(ZSTD_matchState_t* ms, ip = iend - maxDictSize; src = ip; srcSize = maxDictSize; - } } + } + } if (srcSize > ZSTD_CHUNKSIZE_MAX) { /* We must have cleared our windows when our source is this large. */ @@ -4702,22 +4703,31 @@ static size_t ZSTD_loadDictionaryContent(ZSTD_matchState_t* ms, } DEBUGLOG(4, "ZSTD_loadDictionaryContent(): useRowMatchFinder=%d", (int)params->useRowMatchFinder); - ZSTD_window_update(&ms->window, src, srcSize, /* forceNonContiguous */ 0); - ms->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ms->window.base); - ms->forceNonContiguous = params->deterministicRefPrefix; - if (loadLdmDict) { + if (loadLdmDict) { /* Load the entire dict into LDM matchfinders. */ ZSTD_window_update(&ls->window, src, srcSize, /* forceNonContiguous */ 0); ls->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ls->window.base); + ZSTD_ldm_fillHashTable(ls, ip, iend, ¶ms->ldmParams); + } + + /* If the dict is larger than we can reasonably index in our tables, only load the suffix. */ + if (params->cParams.strategy < ZSTD_btultra) { + U32 maxDictSize = 8U << MIN(MAX(params->cParams.hashLog, params->cParams.chainLog), 27); + if (srcSize > maxDictSize) { + ip = iend - maxDictSize; + src = ip; + srcSize = maxDictSize; + } } + ZSTD_window_update(&ms->window, src, srcSize, /* forceNonContiguous */ 0); + ms->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ms->window.base); + ms->forceNonContiguous = params->deterministicRefPrefix; + if (srcSize <= HASH_READ_SIZE) return 0; ZSTD_overflowCorrectIfNeeded(ms, ws, params, ip, iend); - if (loadLdmDict) - ZSTD_ldm_fillHashTable(ls, ip, iend, ¶ms->ldmParams); - switch(params->cParams.strategy) { case ZSTD_fast: diff --git a/tests/regression/results.csv b/tests/regression/results.csv index 9de32fdc6..926417def 100644 --- a/tests/regression/results.csv +++ b/tests/regression/results.csv @@ -59,15 +59,15 @@ silesia, uncompressed literals optimal, compress silesia, huffman literals, compress cctx, 6172202 silesia, multithreaded with advanced params, compress cctx, 4842075 github, level -5, compress cctx, 204407 -github, level -5 with dict, compress cctx, 52059 +github, level -5 with dict, compress cctx, 47581 github, level -3, compress cctx, 193253 -github, level -3 with dict, compress cctx, 46787 +github, level -3 with dict, compress cctx, 43043 github, level -1, compress cctx, 175468 -github, level -1 with dict, compress cctx, 43585 +github, level -1 with dict, compress cctx, 42044 github, level 0, compress cctx, 136332 github, level 0 with dict, compress cctx, 41534 github, level 1, compress cctx, 142365 -github, level 1 with dict, compress cctx, 42259 +github, level 1 with dict, compress cctx, 41715 github, level 3, compress cctx, 136332 github, level 3 with dict, compress cctx, 41534 github, level 4, compress cctx, 136199 @@ -149,15 +149,15 @@ silesia.tar, uncompressed literals optimal, zstdcli, silesia.tar, huffman literals, zstdcli, 5342074 silesia.tar, multithreaded with advanced params, zstdcli, 5122571 github, level -5, zstdcli, 206407 -github, level -5 with dict, zstdcli, 48718 +github, level -5 with dict, zstdcli, 47832 github, level -3, zstdcli, 195253 -github, level -3 with dict, zstdcli, 47395 +github, level -3 with dict, zstdcli, 46671 github, level -1, zstdcli, 177468 -github, level -1 with dict, zstdcli, 45170 +github, level -1 with dict, zstdcli, 43825 github, level 0, zstdcli, 138332 github, level 0 with dict, zstdcli, 43148 github, level 1, zstdcli, 144365 -github, level 1 with dict, zstdcli, 43682 +github, level 1 with dict, zstdcli, 43266 github, level 3, zstdcli, 138332 github, level 3 with dict, zstdcli, 43148 github, level 4, zstdcli, 138199 @@ -188,15 +188,15 @@ github, uncompressed literals optimal, zstdcli, github, huffman literals, zstdcli, 144365 github, multithreaded with advanced params, zstdcli, 167911 github.tar, level -5, zstdcli, 52119 -github.tar, level -5 with dict, zstdcli, 50978 +github.tar, level -5 with dict, zstdcli, 51101 github.tar, level -3, zstdcli, 45682 -github.tar, level -3 with dict, zstdcli, 44660 +github.tar, level -3 with dict, zstdcli, 44738 github.tar, level -1, zstdcli, 42564 -github.tar, level -1 with dict, zstdcli, 41155 +github.tar, level -1 with dict, zstdcli, 41357 github.tar, level 0, zstdcli, 38835 github.tar, level 0 with dict, zstdcli, 37999 github.tar, level 1, zstdcli, 39204 -github.tar, level 1 with dict, zstdcli, 38093 +github.tar, level 1 with dict, zstdcli, 38123 github.tar, level 3, zstdcli, 38835 github.tar, level 3 with dict, zstdcli, 37999 github.tar, level 4, zstdcli, 38897 @@ -297,57 +297,57 @@ silesia.tar, uncompressed literals optimal, advanced silesia.tar, huffman literals, advanced one pass, 5341705 silesia.tar, multithreaded with advanced params, advanced one pass, 5122567 github, level -5, advanced one pass, 204407 -github, level -5 with dict, advanced one pass, 46718 +github, level -5 with dict, advanced one pass, 45832 github, level -3, advanced one pass, 193253 -github, level -3 with dict, advanced one pass, 45395 +github, level -3 with dict, advanced one pass, 44671 github, level -1, advanced one pass, 175468 -github, level -1 with dict, advanced one pass, 43170 +github, level -1 with dict, advanced one pass, 41825 github, level 0, advanced one pass, 136332 github, level 0 with dict, advanced one pass, 41148 github, level 0 with dict dms, advanced one pass, 41148 github, level 0 with dict dds, advanced one pass, 41148 github, level 0 with dict copy, advanced one pass, 41124 -github, level 0 with dict load, advanced one pass, 42252 +github, level 0 with dict load, advanced one pass, 41847 github, level 1, advanced one pass, 142365 -github, level 1 with dict, advanced one pass, 41682 -github, level 1 with dict dms, advanced one pass, 41682 -github, level 1 with dict dds, advanced one pass, 41682 -github, level 1 with dict copy, advanced one pass, 41698 -github, level 1 with dict load, advanced one pass, 43814 +github, level 1 with dict, advanced one pass, 41266 +github, level 1 with dict dms, advanced one pass, 41266 +github, level 1 with dict dds, advanced one pass, 41266 +github, level 1 with dict copy, advanced one pass, 41279 +github, level 1 with dict load, advanced one pass, 43331 github, level 3, advanced one pass, 136332 github, level 3 with dict, advanced one pass, 41148 github, level 3 with dict dms, advanced one pass, 41148 github, level 3 with dict dds, advanced one pass, 41148 github, level 3 with dict copy, advanced one pass, 41124 -github, level 3 with dict load, advanced one pass, 42252 +github, level 3 with dict load, advanced one pass, 41847 github, level 4, advanced one pass, 136199 github, level 4 with dict, advanced one pass, 41251 github, level 4 with dict dms, advanced one pass, 41251 github, level 4 with dict dds, advanced one pass, 41251 github, level 4 with dict copy, advanced one pass, 41216 -github, level 4 with dict load, advanced one pass, 41159 +github, level 4 with dict load, advanced one pass, 41548 github, level 5 row 1, advanced one pass, 134584 github, level 5 row 1 with dict dms, advanced one pass, 38754 github, level 5 row 1 with dict dds, advanced one pass, 38728 github, level 5 row 1 with dict copy, advanced one pass, 38755 -github, level 5 row 1 with dict load, advanced one pass, 41895 +github, level 5 row 1 with dict load, advanced one pass, 41899 github, level 5 row 2, advanced one pass, 135121 github, level 5 row 2 with dict dms, advanced one pass, 38938 github, level 5 row 2 with dict dds, advanced one pass, 38732 github, level 5 row 2 with dict copy, advanced one pass, 38934 -github, level 5 row 2 with dict load, advanced one pass, 40725 +github, level 5 row 2 with dict load, advanced one pass, 41248 github, level 5, advanced one pass, 135121 github, level 5 with dict, advanced one pass, 38754 github, level 5 with dict dms, advanced one pass, 38754 github, level 5 with dict dds, advanced one pass, 38728 github, level 5 with dict copy, advanced one pass, 38755 -github, level 5 with dict load, advanced one pass, 40725 +github, level 5 with dict load, advanced one pass, 41248 github, level 6, advanced one pass, 135122 github, level 6 with dict, advanced one pass, 38669 github, level 6 with dict dms, advanced one pass, 38669 github, level 6 with dict dds, advanced one pass, 38638 github, level 6 with dict copy, advanced one pass, 38665 -github, level 6 with dict load, advanced one pass, 40695 +github, level 6 with dict load, advanced one pass, 41153 github, level 7 row 1, advanced one pass, 134584 github, level 7 row 1 with dict dms, advanced one pass, 38765 github, level 7 row 1 with dict dds, advanced one pass, 38749 @@ -357,39 +357,39 @@ github, level 7 row 2, advanced github, level 7 row 2 with dict dms, advanced one pass, 38860 github, level 7 row 2 with dict dds, advanced one pass, 38766 github, level 7 row 2 with dict copy, advanced one pass, 38834 -github, level 7 row 2 with dict load, advanced one pass, 40695 +github, level 7 row 2 with dict load, advanced one pass, 41153 github, level 7, advanced one pass, 135122 github, level 7 with dict, advanced one pass, 38765 github, level 7 with dict dms, advanced one pass, 38765 github, level 7 with dict dds, advanced one pass, 38749 github, level 7 with dict copy, advanced one pass, 38759 -github, level 7 with dict load, advanced one pass, 40695 +github, level 7 with dict load, advanced one pass, 41153 github, level 9, advanced one pass, 135122 github, level 9 with dict, advanced one pass, 39439 github, level 9 with dict dms, advanced one pass, 39439 github, level 9 with dict dds, advanced one pass, 39393 github, level 9 with dict copy, advanced one pass, 39362 -github, level 9 with dict load, advanced one pass, 41710 +github, level 9 with dict load, advanced one pass, 42148 github, level 11 row 1, advanced one pass, 135367 github, level 11 row 1 with dict dms, advanced one pass, 39671 github, level 11 row 1 with dict dds, advanced one pass, 39671 github, level 11 row 1 with dict copy, advanced one pass, 39651 -github, level 11 row 1 with dict load, advanced one pass, 41360 +github, level 11 row 1 with dict load, advanced one pass, 41744 github, level 11 row 2, advanced one pass, 135367 github, level 11 row 2 with dict dms, advanced one pass, 39671 github, level 11 row 2 with dict dds, advanced one pass, 39671 github, level 11 row 2 with dict copy, advanced one pass, 39651 -github, level 11 row 2 with dict load, advanced one pass, 41360 +github, level 11 row 2 with dict load, advanced one pass, 41744 github, level 12 row 1, advanced one pass, 134402 github, level 12 row 1 with dict dms, advanced one pass, 39677 github, level 12 row 1 with dict dds, advanced one pass, 39677 github, level 12 row 1 with dict copy, advanced one pass, 39677 -github, level 12 row 1 with dict load, advanced one pass, 41166 +github, level 12 row 1 with dict load, advanced one pass, 41553 github, level 12 row 2, advanced one pass, 134402 github, level 12 row 2 with dict dms, advanced one pass, 39677 github, level 12 row 2 with dict dds, advanced one pass, 39677 github, level 12 row 2 with dict copy, advanced one pass, 39677 -github, level 12 row 2 with dict load, advanced one pass, 41166 +github, level 12 row 2 with dict load, advanced one pass, 41553 github, level 13, advanced one pass, 132878 github, level 13 with dict, advanced one pass, 39900 github, level 13 with dict dms, advanced one pass, 39900 @@ -422,11 +422,11 @@ github, uncompressed literals optimal, advanced github, huffman literals, advanced one pass, 142365 github, multithreaded with advanced params, advanced one pass, 165911 github.tar, level -5, advanced one pass, 52115 -github.tar, level -5 with dict, advanced one pass, 50974 +github.tar, level -5 with dict, advanced one pass, 51097 github.tar, level -3, advanced one pass, 45678 -github.tar, level -3 with dict, advanced one pass, 44656 +github.tar, level -3 with dict, advanced one pass, 44734 github.tar, level -1, advanced one pass, 42560 -github.tar, level -1 with dict, advanced one pass, 41151 +github.tar, level -1 with dict, advanced one pass, 41353 github.tar, level 0, advanced one pass, 38831 github.tar, level 0 with dict, advanced one pass, 37995 github.tar, level 0 with dict dms, advanced one pass, 38003 @@ -434,10 +434,10 @@ github.tar, level 0 with dict dds, advanced github.tar, level 0 with dict copy, advanced one pass, 37995 github.tar, level 0 with dict load, advanced one pass, 37956 github.tar, level 1, advanced one pass, 39200 -github.tar, level 1 with dict, advanced one pass, 38089 -github.tar, level 1 with dict dms, advanced one pass, 38294 -github.tar, level 1 with dict dds, advanced one pass, 38294 -github.tar, level 1 with dict copy, advanced one pass, 38089 +github.tar, level 1 with dict, advanced one pass, 38119 +github.tar, level 1 with dict dms, advanced one pass, 38406 +github.tar, level 1 with dict dds, advanced one pass, 38406 +github.tar, level 1 with dict copy, advanced one pass, 38119 github.tar, level 1 with dict load, advanced one pass, 38364 github.tar, level 3, advanced one pass, 38831 github.tar, level 3 with dict, advanced one pass, 37995 @@ -615,57 +615,57 @@ silesia.tar, uncompressed literals optimal, advanced silesia.tar, huffman literals, advanced one pass small out, 5341705 silesia.tar, multithreaded with advanced params, advanced one pass small out, 5122567 github, level -5, advanced one pass small out, 204407 -github, level -5 with dict, advanced one pass small out, 46718 +github, level -5 with dict, advanced one pass small out, 45832 github, level -3, advanced one pass small out, 193253 -github, level -3 with dict, advanced one pass small out, 45395 +github, level -3 with dict, advanced one pass small out, 44671 github, level -1, advanced one pass small out, 175468 -github, level -1 with dict, advanced one pass small out, 43170 +github, level -1 with dict, advanced one pass small out, 41825 github, level 0, advanced one pass small out, 136332 github, level 0 with dict, advanced one pass small out, 41148 github, level 0 with dict dms, advanced one pass small out, 41148 github, level 0 with dict dds, advanced one pass small out, 41148 github, level 0 with dict copy, advanced one pass small out, 41124 -github, level 0 with dict load, advanced one pass small out, 42252 +github, level 0 with dict load, advanced one pass small out, 41847 github, level 1, advanced one pass small out, 142365 -github, level 1 with dict, advanced one pass small out, 41682 -github, level 1 with dict dms, advanced one pass small out, 41682 -github, level 1 with dict dds, advanced one pass small out, 41682 -github, level 1 with dict copy, advanced one pass small out, 41698 -github, level 1 with dict load, advanced one pass small out, 43814 +github, level 1 with dict, advanced one pass small out, 41266 +github, level 1 with dict dms, advanced one pass small out, 41266 +github, level 1 with dict dds, advanced one pass small out, 41266 +github, level 1 with dict copy, advanced one pass small out, 41279 +github, level 1 with dict load, advanced one pass small out, 43331 github, level 3, advanced one pass small out, 136332 github, level 3 with dict, advanced one pass small out, 41148 github, level 3 with dict dms, advanced one pass small out, 41148 github, level 3 with dict dds, advanced one pass small out, 41148 github, level 3 with dict copy, advanced one pass small out, 41124 -github, level 3 with dict load, advanced one pass small out, 42252 +github, level 3 with dict load, advanced one pass small out, 41847 github, level 4, advanced one pass small out, 136199 github, level 4 with dict, advanced one pass small out, 41251 github, level 4 with dict dms, advanced one pass small out, 41251 github, level 4 with dict dds, advanced one pass small out, 41251 github, level 4 with dict copy, advanced one pass small out, 41216 -github, level 4 with dict load, advanced one pass small out, 41159 +github, level 4 with dict load, advanced one pass small out, 41548 github, level 5 row 1, advanced one pass small out, 134584 github, level 5 row 1 with dict dms, advanced one pass small out, 38754 github, level 5 row 1 with dict dds, advanced one pass small out, 38728 github, level 5 row 1 with dict copy, advanced one pass small out, 38755 -github, level 5 row 1 with dict load, advanced one pass small out, 41895 +github, level 5 row 1 with dict load, advanced one pass small out, 41899 github, level 5 row 2, advanced one pass small out, 135121 github, level 5 row 2 with dict dms, advanced one pass small out, 38938 github, level 5 row 2 with dict dds, advanced one pass small out, 38732 github, level 5 row 2 with dict copy, advanced one pass small out, 38934 -github, level 5 row 2 with dict load, advanced one pass small out, 40725 +github, level 5 row 2 with dict load, advanced one pass small out, 41248 github, level 5, advanced one pass small out, 135121 github, level 5 with dict, advanced one pass small out, 38754 github, level 5 with dict dms, advanced one pass small out, 38754 github, level 5 with dict dds, advanced one pass small out, 38728 github, level 5 with dict copy, advanced one pass small out, 38755 -github, level 5 with dict load, advanced one pass small out, 40725 +github, level 5 with dict load, advanced one pass small out, 41248 github, level 6, advanced one pass small out, 135122 github, level 6 with dict, advanced one pass small out, 38669 github, level 6 with dict dms, advanced one pass small out, 38669 github, level 6 with dict dds, advanced one pass small out, 38638 github, level 6 with dict copy, advanced one pass small out, 38665 -github, level 6 with dict load, advanced one pass small out, 40695 +github, level 6 with dict load, advanced one pass small out, 41153 github, level 7 row 1, advanced one pass small out, 134584 github, level 7 row 1 with dict dms, advanced one pass small out, 38765 github, level 7 row 1 with dict dds, advanced one pass small out, 38749 @@ -675,39 +675,39 @@ github, level 7 row 2, advanced github, level 7 row 2 with dict dms, advanced one pass small out, 38860 github, level 7 row 2 with dict dds, advanced one pass small out, 38766 github, level 7 row 2 with dict copy, advanced one pass small out, 38834 -github, level 7 row 2 with dict load, advanced one pass small out, 40695 +github, level 7 row 2 with dict load, advanced one pass small out, 41153 github, level 7, advanced one pass small out, 135122 github, level 7 with dict, advanced one pass small out, 38765 github, level 7 with dict dms, advanced one pass small out, 38765 github, level 7 with dict dds, advanced one pass small out, 38749 github, level 7 with dict copy, advanced one pass small out, 38759 -github, level 7 with dict load, advanced one pass small out, 40695 +github, level 7 with dict load, advanced one pass small out, 41153 github, level 9, advanced one pass small out, 135122 github, level 9 with dict, advanced one pass small out, 39439 github, level 9 with dict dms, advanced one pass small out, 39439 github, level 9 with dict dds, advanced one pass small out, 39393 github, level 9 with dict copy, advanced one pass small out, 39362 -github, level 9 with dict load, advanced one pass small out, 41710 +github, level 9 with dict load, advanced one pass small out, 42148 github, level 11 row 1, advanced one pass small out, 135367 github, level 11 row 1 with dict dms, advanced one pass small out, 39671 github, level 11 row 1 with dict dds, advanced one pass small out, 39671 github, level 11 row 1 with dict copy, advanced one pass small out, 39651 -github, level 11 row 1 with dict load, advanced one pass small out, 41360 +github, level 11 row 1 with dict load, advanced one pass small out, 41744 github, level 11 row 2, advanced one pass small out, 135367 github, level 11 row 2 with dict dms, advanced one pass small out, 39671 github, level 11 row 2 with dict dds, advanced one pass small out, 39671 github, level 11 row 2 with dict copy, advanced one pass small out, 39651 -github, level 11 row 2 with dict load, advanced one pass small out, 41360 +github, level 11 row 2 with dict load, advanced one pass small out, 41744 github, level 12 row 1, advanced one pass small out, 134402 github, level 12 row 1 with dict dms, advanced one pass small out, 39677 github, level 12 row 1 with dict dds, advanced one pass small out, 39677 github, level 12 row 1 with dict copy, advanced one pass small out, 39677 -github, level 12 row 1 with dict load, advanced one pass small out, 41166 +github, level 12 row 1 with dict load, advanced one pass small out, 41553 github, level 12 row 2, advanced one pass small out, 134402 github, level 12 row 2 with dict dms, advanced one pass small out, 39677 github, level 12 row 2 with dict dds, advanced one pass small out, 39677 github, level 12 row 2 with dict copy, advanced one pass small out, 39677 -github, level 12 row 2 with dict load, advanced one pass small out, 41166 +github, level 12 row 2 with dict load, advanced one pass small out, 41553 github, level 13, advanced one pass small out, 132878 github, level 13 with dict, advanced one pass small out, 39900 github, level 13 with dict dms, advanced one pass small out, 39900 @@ -740,11 +740,11 @@ github, uncompressed literals optimal, advanced github, huffman literals, advanced one pass small out, 142365 github, multithreaded with advanced params, advanced one pass small out, 165911 github.tar, level -5, advanced one pass small out, 52115 -github.tar, level -5 with dict, advanced one pass small out, 50974 +github.tar, level -5 with dict, advanced one pass small out, 51097 github.tar, level -3, advanced one pass small out, 45678 -github.tar, level -3 with dict, advanced one pass small out, 44656 +github.tar, level -3 with dict, advanced one pass small out, 44734 github.tar, level -1, advanced one pass small out, 42560 -github.tar, level -1 with dict, advanced one pass small out, 41151 +github.tar, level -1 with dict, advanced one pass small out, 41353 github.tar, level 0, advanced one pass small out, 38831 github.tar, level 0 with dict, advanced one pass small out, 37995 github.tar, level 0 with dict dms, advanced one pass small out, 38003 @@ -752,10 +752,10 @@ github.tar, level 0 with dict dds, advanced github.tar, level 0 with dict copy, advanced one pass small out, 37995 github.tar, level 0 with dict load, advanced one pass small out, 37956 github.tar, level 1, advanced one pass small out, 39200 -github.tar, level 1 with dict, advanced one pass small out, 38089 -github.tar, level 1 with dict dms, advanced one pass small out, 38294 -github.tar, level 1 with dict dds, advanced one pass small out, 38294 -github.tar, level 1 with dict copy, advanced one pass small out, 38089 +github.tar, level 1 with dict, advanced one pass small out, 38119 +github.tar, level 1 with dict dms, advanced one pass small out, 38406 +github.tar, level 1 with dict dds, advanced one pass small out, 38406 +github.tar, level 1 with dict copy, advanced one pass small out, 38119 github.tar, level 1 with dict load, advanced one pass small out, 38364 github.tar, level 3, advanced one pass small out, 38831 github.tar, level 3 with dict, advanced one pass small out, 37995 @@ -933,57 +933,57 @@ silesia.tar, uncompressed literals optimal, advanced silesia.tar, huffman literals, advanced streaming, 5341712 silesia.tar, multithreaded with advanced params, advanced streaming, 5122567 github, level -5, advanced streaming, 204407 -github, level -5 with dict, advanced streaming, 46718 +github, level -5 with dict, advanced streaming, 45832 github, level -3, advanced streaming, 193253 -github, level -3 with dict, advanced streaming, 45395 +github, level -3 with dict, advanced streaming, 44671 github, level -1, advanced streaming, 175468 -github, level -1 with dict, advanced streaming, 43170 +github, level -1 with dict, advanced streaming, 41825 github, level 0, advanced streaming, 136332 github, level 0 with dict, advanced streaming, 41148 github, level 0 with dict dms, advanced streaming, 41148 github, level 0 with dict dds, advanced streaming, 41148 github, level 0 with dict copy, advanced streaming, 41124 -github, level 0 with dict load, advanced streaming, 42252 +github, level 0 with dict load, advanced streaming, 41847 github, level 1, advanced streaming, 142365 -github, level 1 with dict, advanced streaming, 41682 -github, level 1 with dict dms, advanced streaming, 41682 -github, level 1 with dict dds, advanced streaming, 41682 -github, level 1 with dict copy, advanced streaming, 41698 -github, level 1 with dict load, advanced streaming, 43814 +github, level 1 with dict, advanced streaming, 41266 +github, level 1 with dict dms, advanced streaming, 41266 +github, level 1 with dict dds, advanced streaming, 41266 +github, level 1 with dict copy, advanced streaming, 41279 +github, level 1 with dict load, advanced streaming, 43331 github, level 3, advanced streaming, 136332 github, level 3 with dict, advanced streaming, 41148 github, level 3 with dict dms, advanced streaming, 41148 github, level 3 with dict dds, advanced streaming, 41148 github, level 3 with dict copy, advanced streaming, 41124 -github, level 3 with dict load, advanced streaming, 42252 +github, level 3 with dict load, advanced streaming, 41847 github, level 4, advanced streaming, 136199 github, level 4 with dict, advanced streaming, 41251 github, level 4 with dict dms, advanced streaming, 41251 github, level 4 with dict dds, advanced streaming, 41251 github, level 4 with dict copy, advanced streaming, 41216 -github, level 4 with dict load, advanced streaming, 41159 +github, level 4 with dict load, advanced streaming, 41548 github, level 5 row 1, advanced streaming, 134584 github, level 5 row 1 with dict dms, advanced streaming, 38754 github, level 5 row 1 with dict dds, advanced streaming, 38728 github, level 5 row 1 with dict copy, advanced streaming, 38755 -github, level 5 row 1 with dict load, advanced streaming, 41895 +github, level 5 row 1 with dict load, advanced streaming, 41899 github, level 5 row 2, advanced streaming, 135121 github, level 5 row 2 with dict dms, advanced streaming, 38938 github, level 5 row 2 with dict dds, advanced streaming, 38732 github, level 5 row 2 with dict copy, advanced streaming, 38934 -github, level 5 row 2 with dict load, advanced streaming, 40725 +github, level 5 row 2 with dict load, advanced streaming, 41248 github, level 5, advanced streaming, 135121 github, level 5 with dict, advanced streaming, 38754 github, level 5 with dict dms, advanced streaming, 38754 github, level 5 with dict dds, advanced streaming, 38728 github, level 5 with dict copy, advanced streaming, 38755 -github, level 5 with dict load, advanced streaming, 40725 +github, level 5 with dict load, advanced streaming, 41248 github, level 6, advanced streaming, 135122 github, level 6 with dict, advanced streaming, 38669 github, level 6 with dict dms, advanced streaming, 38669 github, level 6 with dict dds, advanced streaming, 38638 github, level 6 with dict copy, advanced streaming, 38665 -github, level 6 with dict load, advanced streaming, 40695 +github, level 6 with dict load, advanced streaming, 41153 github, level 7 row 1, advanced streaming, 134584 github, level 7 row 1 with dict dms, advanced streaming, 38765 github, level 7 row 1 with dict dds, advanced streaming, 38749 @@ -993,39 +993,39 @@ github, level 7 row 2, advanced github, level 7 row 2 with dict dms, advanced streaming, 38860 github, level 7 row 2 with dict dds, advanced streaming, 38766 github, level 7 row 2 with dict copy, advanced streaming, 38834 -github, level 7 row 2 with dict load, advanced streaming, 40695 +github, level 7 row 2 with dict load, advanced streaming, 41153 github, level 7, advanced streaming, 135122 github, level 7 with dict, advanced streaming, 38765 github, level 7 with dict dms, advanced streaming, 38765 github, level 7 with dict dds, advanced streaming, 38749 github, level 7 with dict copy, advanced streaming, 38759 -github, level 7 with dict load, advanced streaming, 40695 +github, level 7 with dict load, advanced streaming, 41153 github, level 9, advanced streaming, 135122 github, level 9 with dict, advanced streaming, 39439 github, level 9 with dict dms, advanced streaming, 39439 github, level 9 with dict dds, advanced streaming, 39393 github, level 9 with dict copy, advanced streaming, 39362 -github, level 9 with dict load, advanced streaming, 41710 +github, level 9 with dict load, advanced streaming, 42148 github, level 11 row 1, advanced streaming, 135367 github, level 11 row 1 with dict dms, advanced streaming, 39671 github, level 11 row 1 with dict dds, advanced streaming, 39671 github, level 11 row 1 with dict copy, advanced streaming, 39651 -github, level 11 row 1 with dict load, advanced streaming, 41360 +github, level 11 row 1 with dict load, advanced streaming, 41744 github, level 11 row 2, advanced streaming, 135367 github, level 11 row 2 with dict dms, advanced streaming, 39671 github, level 11 row 2 with dict dds, advanced streaming, 39671 github, level 11 row 2 with dict copy, advanced streaming, 39651 -github, level 11 row 2 with dict load, advanced streaming, 41360 +github, level 11 row 2 with dict load, advanced streaming, 41744 github, level 12 row 1, advanced streaming, 134402 github, level 12 row 1 with dict dms, advanced streaming, 39677 github, level 12 row 1 with dict dds, advanced streaming, 39677 github, level 12 row 1 with dict copy, advanced streaming, 39677 -github, level 12 row 1 with dict load, advanced streaming, 41166 +github, level 12 row 1 with dict load, advanced streaming, 41553 github, level 12 row 2, advanced streaming, 134402 github, level 12 row 2 with dict dms, advanced streaming, 39677 github, level 12 row 2 with dict dds, advanced streaming, 39677 github, level 12 row 2 with dict copy, advanced streaming, 39677 -github, level 12 row 2 with dict load, advanced streaming, 41166 +github, level 12 row 2 with dict load, advanced streaming, 41553 github, level 13, advanced streaming, 132878 github, level 13 with dict, advanced streaming, 39900 github, level 13 with dict dms, advanced streaming, 39900 @@ -1058,11 +1058,11 @@ github, uncompressed literals optimal, advanced github, huffman literals, advanced streaming, 142365 github, multithreaded with advanced params, advanced streaming, 165911 github.tar, level -5, advanced streaming, 52152 -github.tar, level -5 with dict, advanced streaming, 51045 +github.tar, level -5 with dict, advanced streaming, 51181 github.tar, level -3, advanced streaming, 45678 -github.tar, level -3 with dict, advanced streaming, 44656 +github.tar, level -3 with dict, advanced streaming, 44734 github.tar, level -1, advanced streaming, 42560 -github.tar, level -1 with dict, advanced streaming, 41151 +github.tar, level -1 with dict, advanced streaming, 41353 github.tar, level 0, advanced streaming, 38831 github.tar, level 0 with dict, advanced streaming, 37995 github.tar, level 0 with dict dms, advanced streaming, 38003 @@ -1070,10 +1070,10 @@ github.tar, level 0 with dict dds, advanced github.tar, level 0 with dict copy, advanced streaming, 37995 github.tar, level 0 with dict load, advanced streaming, 37956 github.tar, level 1, advanced streaming, 39200 -github.tar, level 1 with dict, advanced streaming, 38089 -github.tar, level 1 with dict dms, advanced streaming, 38294 -github.tar, level 1 with dict dds, advanced streaming, 38294 -github.tar, level 1 with dict copy, advanced streaming, 38089 +github.tar, level 1 with dict, advanced streaming, 38119 +github.tar, level 1 with dict dms, advanced streaming, 38406 +github.tar, level 1 with dict dds, advanced streaming, 38406 +github.tar, level 1 with dict copy, advanced streaming, 38119 github.tar, level 1 with dict load, advanced streaming, 38364 github.tar, level 3, advanced streaming, 38831 github.tar, level 3 with dict, advanced streaming, 37995 @@ -1219,15 +1219,15 @@ silesia.tar, uncompressed literals, old stre silesia.tar, uncompressed literals optimal, old streaming, 4265911 silesia.tar, huffman literals, old streaming, 6179056 github, level -5, old streaming, 204407 -github, level -5 with dict, old streaming, 46718 +github, level -5 with dict, old streaming, 45832 github, level -3, old streaming, 193253 -github, level -3 with dict, old streaming, 45395 +github, level -3 with dict, old streaming, 44671 github, level -1, old streaming, 175468 -github, level -1 with dict, old streaming, 43170 +github, level -1 with dict, old streaming, 41825 github, level 0, old streaming, 136332 github, level 0 with dict, old streaming, 41148 github, level 1, old streaming, 142365 -github, level 1 with dict, old streaming, 41682 +github, level 1 with dict, old streaming, 41266 github, level 3, old streaming, 136332 github, level 3 with dict, old streaming, 41148 github, level 4, old streaming, 136199 @@ -1252,15 +1252,15 @@ github, uncompressed literals, old stre github, uncompressed literals optimal, old streaming, 132879 github, huffman literals, old streaming, 175468 github.tar, level -5, old streaming, 52152 -github.tar, level -5 with dict, old streaming, 51045 +github.tar, level -5 with dict, old streaming, 51181 github.tar, level -3, old streaming, 45678 -github.tar, level -3 with dict, old streaming, 44656 +github.tar, level -3 with dict, old streaming, 44734 github.tar, level -1, old streaming, 42560 -github.tar, level -1 with dict, old streaming, 41151 +github.tar, level -1 with dict, old streaming, 41353 github.tar, level 0, old streaming, 38831 github.tar, level 0 with dict, old streaming, 37995 github.tar, level 1, old streaming, 39200 -github.tar, level 1 with dict, old streaming, 38089 +github.tar, level 1 with dict, old streaming, 38119 github.tar, level 3, old streaming, 38831 github.tar, level 3 with dict, old streaming, 37995 github.tar, level 4, old streaming, 38893 @@ -1337,11 +1337,11 @@ silesia.tar, uncompressed literals optimal, old stre silesia.tar, huffman literals, old streaming advanced, 6179056 silesia.tar, multithreaded with advanced params, old streaming advanced, 4859271 github, level -5, old streaming advanced, 213265 -github, level -5 with dict, old streaming advanced, 49562 +github, level -5 with dict, old streaming advanced, 46708 github, level -3, old streaming advanced, 196126 -github, level -3 with dict, old streaming advanced, 44956 +github, level -3 with dict, old streaming advanced, 45476 github, level -1, old streaming advanced, 181107 -github, level -1 with dict, old streaming advanced, 42383 +github, level -1 with dict, old streaming advanced, 42060 github, level 0, old streaming advanced, 141104 github, level 0 with dict, old streaming advanced, 41113 github, level 1, old streaming advanced, 143693 @@ -1378,11 +1378,11 @@ github, uncompressed literals optimal, old stre github, huffman literals, old streaming advanced, 181107 github, multithreaded with advanced params, old streaming advanced, 141104 github.tar, level -5, old streaming advanced, 52152 -github.tar, level -5 with dict, old streaming advanced, 50988 +github.tar, level -5 with dict, old streaming advanced, 51129 github.tar, level -3, old streaming advanced, 45678 -github.tar, level -3 with dict, old streaming advanced, 44729 +github.tar, level -3 with dict, old streaming advanced, 44986 github.tar, level -1, old streaming advanced, 42560 -github.tar, level -1 with dict, old streaming advanced, 41589 +github.tar, level -1 with dict, old streaming advanced, 41650 github.tar, level 0, old streaming advanced, 38831 github.tar, level 0 with dict, old streaming advanced, 38013 github.tar, level 1, old streaming advanced, 39200 @@ -1418,11 +1418,11 @@ github.tar, uncompressed literals, old stre github.tar, uncompressed literals optimal, old streaming advanced, 32276 github.tar, huffman literals, old streaming advanced, 42560 github.tar, multithreaded with advanced params, old streaming advanced, 38831 -github, level -5 with dict, old streaming cdict, 46718 -github, level -3 with dict, old streaming cdict, 45395 -github, level -1 with dict, old streaming cdict, 43170 +github, level -5 with dict, old streaming cdict, 45832 +github, level -3 with dict, old streaming cdict, 44671 +github, level -1 with dict, old streaming cdict, 41825 github, level 0 with dict, old streaming cdict, 41148 -github, level 1 with dict, old streaming cdict, 41682 +github, level 1 with dict, old streaming cdict, 41266 github, level 3 with dict, old streaming cdict, 41148 github, level 4 with dict, old streaming cdict, 41251 github, level 5 with dict, old streaming cdict, 38754 @@ -1433,9 +1433,9 @@ github, level 13 with dict, old stre github, level 16 with dict, old streaming cdict, 37577 github, level 19 with dict, old streaming cdict, 37576 github, no source size with dict, old streaming cdict, 40654 -github.tar, level -5 with dict, old streaming cdict, 51191 -github.tar, level -3 with dict, old streaming cdict, 44821 -github.tar, level -1 with dict, old streaming cdict, 41775 +github.tar, level -5 with dict, old streaming cdict, 51286 +github.tar, level -3 with dict, old streaming cdict, 45147 +github.tar, level -1 with dict, old streaming cdict, 41865 github.tar, level 0 with dict, old streaming cdict, 37956 github.tar, level 1 with dict, old streaming cdict, 38364 github.tar, level 3 with dict, old streaming cdict, 37956 @@ -1448,9 +1448,9 @@ github.tar, level 13 with dict, old stre github.tar, level 16 with dict, old streaming cdict, 39081 github.tar, level 19 with dict, old streaming cdict, 32479 github.tar, no source size with dict, old streaming cdict, 38000 -github, level -5 with dict, old streaming advanced cdict, 49562 -github, level -3 with dict, old streaming advanced cdict, 44956 -github, level -1 with dict, old streaming advanced cdict, 42383 +github, level -5 with dict, old streaming advanced cdict, 46708 +github, level -3 with dict, old streaming advanced cdict, 45476 +github, level -1 with dict, old streaming advanced cdict, 42060 github, level 0 with dict, old streaming advanced cdict, 41113 github, level 1 with dict, old streaming advanced cdict, 42430 github, level 3 with dict, old streaming advanced cdict, 41113 @@ -1463,9 +1463,9 @@ github, level 13 with dict, old stre github, level 16 with dict, old streaming advanced cdict, 40789 github, level 19 with dict, old streaming advanced cdict, 37576 github, no source size with dict, old streaming advanced cdict, 40608 -github.tar, level -5 with dict, old streaming advanced cdict, 50854 -github.tar, level -3 with dict, old streaming advanced cdict, 44571 -github.tar, level -1 with dict, old streaming advanced cdict, 41477 +github.tar, level -5 with dict, old streaming advanced cdict, 50791 +github.tar, level -3 with dict, old streaming advanced cdict, 44926 +github.tar, level -1 with dict, old streaming advanced cdict, 41482 github.tar, level 0 with dict, old streaming advanced cdict, 38013 github.tar, level 1 with dict, old streaming advanced cdict, 38168 github.tar, level 3 with dict, old streaming advanced cdict, 38013