[Bugfix] row hash tries to match position 0 (#3548)

#3543 decreases the size of the tagTable by a factor of 2, which requires using the first tag position in each row for head position instead of a tag.
Although position 0 stopped being a valid match, it still persisted in mask calculation resulting in the matches loops possibly terminating before it should have. The fix skips position 0 to solve this problem.

diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c
index 19b4722afacad28beb9526d8cb78ea6e586fffd7..d41478e99fe7b0ca1d669316f3c799e61d09bb57 100644 (file)
--- a/lib/compress/zstd_lazy.c
+++ b/lib/compress/zstd_lazy.c
@@ -1211,9 +1211,10 @@ size_t ZSTD_RowFindBestMatch(
         ZSTD_VecMask matches = ZSTD_row_getMatchMask(tagRow, (BYTE)tag, headGrouped, rowEntries);
 
         /* Cycle through the matches and prefetch */
-        for (; (matches > 0) && (nbAttempts > 0); --nbAttempts, matches &= (matches - 1)) {
+        for (; (matches > 0) && (nbAttempts > 0); matches &= (matches - 1)) {
             U32 const matchPos = ((headGrouped + ZSTD_VecMask_next(matches)) / groupWidth) & rowMask;
             U32 const matchIndex = row[matchPos];
+            if(matchPos == 0) continue;
             assert(numMatches < rowEntries);
             if (matchIndex < lowLimit)
                 break;
@@ -1223,6 +1224,7 @@ size_t ZSTD_RowFindBestMatch(
                 PREFETCH_L1(dictBase + matchIndex);
             }
             matchBuffer[numMatches++] = matchIndex;
+            --nbAttempts;
         }
 
         /* Speed opt: insert current byte into hashtable too. This allows us to avoid one iteration of the loop
@@ -1280,13 +1282,15 @@ size_t ZSTD_RowFindBestMatch(
             size_t currMatch = 0;
             ZSTD_VecMask matches = ZSTD_row_getMatchMask(dmsTagRow, (BYTE)dmsTag, headGrouped, rowEntries);
 
-            for (; (matches > 0) && (nbAttempts > 0); --nbAttempts, matches &= (matches - 1)) {
+            for (; (matches > 0) && (nbAttempts > 0); matches &= (matches - 1)) {
                 U32 const matchPos = ((headGrouped + ZSTD_VecMask_next(matches)) / groupWidth) & rowMask;
                 U32 const matchIndex = dmsRow[matchPos];
+                if(matchPos == 0) continue;
                 if (matchIndex < dmsLowestIndex)
                     break;
                 PREFETCH_L1(dmsBase + matchIndex);
                 matchBuffer[numMatches++] = matchIndex;
+                --nbAttempts;
             }
 
             /* Return the longest match */

diff --git a/tests/regression/results.csv b/tests/regression/results.csv
index 2a63b60c2b2966cee314eb5ed480b4fa873d73b1..9de32fdc60091ab59f5ea4234bea33d358e54f56 100644 (file)
--- a/tests/regression/results.csv
+++ b/tests/regression/results.csv
@@ -6,10 +6,10 @@ silesia.tar,                        level 0,                            compress
 silesia.tar,                        level 1,                            compress simple,                    5327717
 silesia.tar,                        level 3,                            compress simple,                    4854086
 silesia.tar,                        level 4,                            compress simple,                    4791503
-silesia.tar,                        level 5,                            compress simple,                    4679468
-silesia.tar,                        level 6,                            compress simple,                    4615035
-silesia.tar,                        level 7,                            compress simple,                    4579781
-silesia.tar,                        level 9,                            compress simple,                    4555406
+silesia.tar,                        level 5,                            compress simple,                    4679219
+silesia.tar,                        level 6,                            compress simple,                    4614874
+silesia.tar,                        level 7,                            compress simple,                    4579642
+silesia.tar,                        level 9,                            compress simple,                    4555245
 silesia.tar,                        level 13,                           compress simple,                    4502956
 silesia.tar,                        level 16,                           compress simple,                    4360546
 silesia.tar,                        level 19,                           compress simple,                    4265911
@@ -26,7 +26,7 @@ github.tar,                         level 4,                            compress
 github.tar,                         level 5,                            compress simple,                    39651
 github.tar,                         level 6,                            compress simple,                    39282
 github.tar,                         level 7,                            compress simple,                    38005
-github.tar,                         level 9,                            compress simple,                    36722
+github.tar,                         level 9,                            compress simple,                    36723
 github.tar,                         level 13,                           compress simple,                    35501
 github.tar,                         level 16,                           compress simple,                    40466
 github.tar,                         level 19,                           compress simple,                    32276
@@ -40,10 +40,10 @@ silesia,                            level 0,                            compress
 silesia,                            level 1,                            compress cctx,                      5306632
 silesia,                            level 3,                            compress cctx,                      4842075
 silesia,                            level 4,                            compress cctx,                      4779186
-silesia,                            level 5,                            compress cctx,                      4668076
-silesia,                            level 6,                            compress cctx,                      4604785
-silesia,                            level 7,                            compress cctx,                      4570098
-silesia,                            level 9,                            compress cctx,                      4545658
+silesia,                            level 5,                            compress cctx,                      4667825
+silesia,                            level 6,                            compress cctx,                      4604587
+silesia,                            level 7,                            compress cctx,                      4569976
+silesia,                            level 9,                            compress cctx,                      4545538
 silesia,                            level 13,                           compress cctx,                      4493990
 silesia,                            level 16,                           compress cctx,                      4360041
 silesia,                            level 19,                           compress cctx,                      4296055
@@ -53,7 +53,7 @@ silesia,                            multithreaded long distance mode,   compress
 silesia,                            small window log,                   compress cctx,                      7082951
 silesia,                            small hash log,                     compress cctx,                      6526141
 silesia,                            small chain log,                    compress cctx,                      4912197
-silesia,                            explicit params,                    compress cctx,                      4794138
+silesia,                            explicit params,                    compress cctx,                      4794128
 silesia,                            uncompressed literals,              compress cctx,                      4842075
 silesia,                            uncompressed literals optimal,      compress cctx,                      4296055
 silesia,                            huffman literals,                   compress cctx,                      6172202
@@ -104,10 +104,10 @@ silesia,                            level 0,                            zstdcli,
 silesia,                            level 1,                            zstdcli,                            5306680
 silesia,                            level 3,                            zstdcli,                            4842123
 silesia,                            level 4,                            zstdcli,                            4779234
-silesia,                            level 5,                            zstdcli,                            4668124
-silesia,                            level 6,                            zstdcli,                            4604833
-silesia,                            level 7,                            zstdcli,                            4570146
-silesia,                            level 9,                            zstdcli,                            4545706
+silesia,                            level 5,                            zstdcli,                            4667873
+silesia,                            level 6,                            zstdcli,                            4604635
+silesia,                            level 7,                            zstdcli,                            4570024
+silesia,                            level 9,                            zstdcli,                            4545586
 silesia,                            level 13,                           zstdcli,                            4494038
 silesia,                            level 16,                           zstdcli,                            4360089
 silesia,                            level 19,                           zstdcli,                            4296103
@@ -117,7 +117,7 @@ silesia,                            multithreaded long distance mode,   zstdcli,
 silesia,                            small window log,                   zstdcli,                            7095048
 silesia,                            small hash log,                     zstdcli,                            6526189
 silesia,                            small chain log,                    zstdcli,                            4912245
-silesia,                            explicit params,                    zstdcli,                            4795730
+silesia,                            explicit params,                    zstdcli,                            4795654
 silesia,                            uncompressed literals,              zstdcli,                            5120614
 silesia,                            uncompressed literals optimal,      zstdcli,                            4319566
 silesia,                            huffman literals,                   zstdcli,                            5321417
@@ -129,10 +129,10 @@ silesia.tar,                        level 0,                            zstdcli,
 silesia.tar,                        level 1,                            zstdcli,                            5329010
 silesia.tar,                        level 3,                            zstdcli,                            4854164
 silesia.tar,                        level 4,                            zstdcli,                            4792352
-silesia.tar,                        level 5,                            zstdcli,                            4680350
-silesia.tar,                        level 6,                            zstdcli,                            4615867
-silesia.tar,                        level 7,                            zstdcli,                            4581663
-silesia.tar,                        level 9,                            zstdcli,                            4555410
+silesia.tar,                        level 5,                            zstdcli,                            4680075
+silesia.tar,                        level 6,                            zstdcli,                            4615668
+silesia.tar,                        level 7,                            zstdcli,                            4581604
+silesia.tar,                        level 9,                            zstdcli,                            4555249
 silesia.tar,                        level 13,                           zstdcli,                            4502960
 silesia.tar,                        level 16,                           zstdcli,                            4360550
 silesia.tar,                        level 19,                           zstdcli,                            4265915
@@ -143,7 +143,7 @@ silesia.tar,                        multithreaded long distance mode,   zstdcli,
 silesia.tar,                        small window log,                   zstdcli,                            7100701
 silesia.tar,                        small hash log,                     zstdcli,                            6529264
 silesia.tar,                        small chain log,                    zstdcli,                            4917022
-silesia.tar,                        explicit params,                    zstdcli,                            4820970
+silesia.tar,                        explicit params,                    zstdcli,                            4820917
 silesia.tar,                        uncompressed literals,              zstdcli,                            5122571
 silesia.tar,                        uncompressed literals optimal,      zstdcli,                            4310145
 silesia.tar,                        huffman literals,                   zstdcli,                            5342074
@@ -207,8 +207,8 @@ github.tar,                         level 6,                            zstdcli,
 github.tar,                         level 6 with dict,                  zstdcli,                            38647
 github.tar,                         level 7,                            zstdcli,                            38009
 github.tar,                         level 7 with dict,                  zstdcli,                            37861
-github.tar,                         level 9,                            zstdcli,                            36726
-github.tar,                         level 9 with dict,                  zstdcli,                            36689
+github.tar,                         level 9,                            zstdcli,                            36727
+github.tar,                         level 9 with dict,                  zstdcli,                            36686
 github.tar,                         level 13,                           zstdcli,                            35505
 github.tar,                         level 13 with dict,                 zstdcli,                            37134
 github.tar,                         level 16,                           zstdcli,                            40470
@@ -235,17 +235,17 @@ silesia,                            level 0,                            advanced
 silesia,                            level 1,                            advanced one pass,                  5306632
 silesia,                            level 3,                            advanced one pass,                  4842075
 silesia,                            level 4,                            advanced one pass,                  4779186
-silesia,                            level 5 row 1,                      advanced one pass,                  4668076
+silesia,                            level 5 row 1,                      advanced one pass,                  4667825
 silesia,                            level 5 row 2,                      advanced one pass,                  4670136
-silesia,                            level 5,                            advanced one pass,                  4668076
-silesia,                            level 6,                            advanced one pass,                  4604785
-silesia,                            level 7 row 1,                      advanced one pass,                  4570098
+silesia,                            level 5,                            advanced one pass,                  4667825
+silesia,                            level 6,                            advanced one pass,                  4604587
+silesia,                            level 7 row 1,                      advanced one pass,                  4569976
 silesia,                            level 7 row 2,                      advanced one pass,                  4564868
-silesia,                            level 7,                            advanced one pass,                  4570098
-silesia,                            level 9,                            advanced one pass,                  4545658
-silesia,                            level 11 row 1,                     advanced one pass,                  4505448
+silesia,                            level 7,                            advanced one pass,                  4569976
+silesia,                            level 9,                            advanced one pass,                  4545538
+silesia,                            level 11 row 1,                     advanced one pass,                  4505351
 silesia,                            level 11 row 2,                     advanced one pass,                  4503116
-silesia,                            level 12 row 1,                     advanced one pass,                  4505448
+silesia,                            level 12 row 1,                     advanced one pass,                  4505351
 silesia,                            level 12 row 2,                     advanced one pass,                  4503116
 silesia,                            level 13,                           advanced one pass,                  4493990
 silesia,                            level 16,                           advanced one pass,                  4360041
@@ -257,7 +257,7 @@ silesia,                            multithreaded long distance mode,   advanced
 silesia,                            small window log,                   advanced one pass,                  7095000
 silesia,                            small hash log,                     advanced one pass,                  6526141
 silesia,                            small chain log,                    advanced one pass,                  4912197
-silesia,                            explicit params,                    advanced one pass,                  4795730
+silesia,                            explicit params,                    advanced one pass,                  4795654
 silesia,                            uncompressed literals,              advanced one pass,                  5120566
 silesia,                            uncompressed literals optimal,      advanced one pass,                  4319518
 silesia,                            huffman literals,                   advanced one pass,                  5321369
@@ -269,17 +269,17 @@ silesia.tar,                        level 0,                            advanced
 silesia.tar,                        level 1,                            advanced one pass,                  5327717
 silesia.tar,                        level 3,                            advanced one pass,                  4854086
 silesia.tar,                        level 4,                            advanced one pass,                  4791503
-silesia.tar,                        level 5 row 1,                      advanced one pass,                  4679468
+silesia.tar,                        level 5 row 1,                      advanced one pass,                  4679219
 silesia.tar,                        level 5 row 2,                      advanced one pass,                  4682161
-silesia.tar,                        level 5,                            advanced one pass,                  4679468
-silesia.tar,                        level 6,                            advanced one pass,                  4615035
-silesia.tar,                        level 7 row 1,                      advanced one pass,                  4579781
+silesia.tar,                        level 5,                            advanced one pass,                  4679219
+silesia.tar,                        level 6,                            advanced one pass,                  4614874
+silesia.tar,                        level 7 row 1,                      advanced one pass,                  4579642
 silesia.tar,                        level 7 row 2,                      advanced one pass,                  4575393
-silesia.tar,                        level 7,                            advanced one pass,                  4579781
-silesia.tar,                        level 9,                            advanced one pass,                  4555406
-silesia.tar,                        level 11 row 1,                     advanced one pass,                  4514873
+silesia.tar,                        level 7,                            advanced one pass,                  4579642
+silesia.tar,                        level 9,                            advanced one pass,                  4555245
+silesia.tar,                        level 11 row 1,                     advanced one pass,                  4514753
 silesia.tar,                        level 11 row 2,                     advanced one pass,                  4513604
-silesia.tar,                        level 12 row 1,                     advanced one pass,                  4514344
+silesia.tar,                        level 12 row 1,                     advanced one pass,                  4514309
 silesia.tar,                        level 12 row 2,                     advanced one pass,                  4513797
 silesia.tar,                        level 13,                           advanced one pass,                  4502956
 silesia.tar,                        level 16,                           advanced one pass,                  4360546
@@ -291,7 +291,7 @@ silesia.tar,                        multithreaded long distance mode,   advanced
 silesia.tar,                        small window log,                   advanced one pass,                  7100655
 silesia.tar,                        small hash log,                     advanced one pass,                  6529206
 silesia.tar,                        small chain log,                    advanced one pass,                  4917041
-silesia.tar,                        explicit params,                    advanced one pass,                  4807152
+silesia.tar,                        explicit params,                    advanced one pass,                  4807078
 silesia.tar,                        uncompressed literals,              advanced one pass,                  5122473
 silesia.tar,                        uncompressed literals optimal,      advanced one pass,                  4310141
 silesia.tar,                        huffman literals,                   advanced one pass,                  5341705
@@ -330,7 +330,7 @@ github,                             level 5 row 1,                      advanced
 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,                  41896
+github,                             level 5 row 1 with dict load,       advanced one pass,                  41895
 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
@@ -352,7 +352,7 @@ github,                             level 7 row 1,                      advanced
 github,                             level 7 row 1 with dict dms,        advanced one pass,                  38765
 github,                             level 7 row 1 with dict dds,        advanced one pass,                  38749
 github,                             level 7 row 1 with dict copy,       advanced one pass,                  38759
-github,                             level 7 row 1 with dict load,       advanced one pass,                  43231
+github,                             level 7 row 1 with dict load,       advanced one pass,                  43227
 github,                             level 7 row 2,                      advanced one pass,                  135122
 github,                             level 7 row 2 with dict dms,        advanced one pass,                  38860
 github,                             level 7 row 2 with dict dds,        advanced one pass,                  38766
@@ -489,27 +489,27 @@ github.tar,                         level 7 with dict dms,              advanced
 github.tar,                         level 7 with dict dds,              advanced one pass,                  37857
 github.tar,                         level 7 with dict copy,             advanced one pass,                  37839
 github.tar,                         level 7 with dict load,             advanced one pass,                  37286
-github.tar,                         level 9,                            advanced one pass,                  36722
-github.tar,                         level 9 with dict,                  advanced one pass,                  36527
-github.tar,                         level 9 with dict dms,              advanced one pass,                  36619
-github.tar,                         level 9 with dict dds,              advanced one pass,                  36685
-github.tar,                         level 9 with dict copy,             advanced one pass,                  36527
-github.tar,                         level 9 with dict load,             advanced one pass,                  36298
-github.tar,                         level 11 row 1,                     advanced one pass,                  36086
+github.tar,                         level 9,                            advanced one pass,                  36723
+github.tar,                         level 9 with dict,                  advanced one pass,                  36531
+github.tar,                         level 9 with dict dms,              advanced one pass,                  36615
+github.tar,                         level 9 with dict dds,              advanced one pass,                  36682
+github.tar,                         level 9 with dict copy,             advanced one pass,                  36531
+github.tar,                         level 9 with dict load,             advanced one pass,                  36322
+github.tar,                         level 11 row 1,                     advanced one pass,                  36085
 github.tar,                         level 11 row 1 with dict dms,       advanced one pass,                  36963
 github.tar,                         level 11 row 1 with dict dds,       advanced one pass,                  36963
 github.tar,                         level 11 row 1 with dict copy,      advanced one pass,                  36557
-github.tar,                         level 11 row 1 with dict load,      advanced one pass,                  36421
+github.tar,                         level 11 row 1 with dict load,      advanced one pass,                  36423
 github.tar,                         level 11 row 2,                     advanced one pass,                  36110
 github.tar,                         level 11 row 2 with dict dms,       advanced one pass,                  36963
 github.tar,                         level 11 row 2 with dict dds,       advanced one pass,                  36963
 github.tar,                         level 11 row 2 with dict copy,      advanced one pass,                  36557
 github.tar,                         level 11 row 2 with dict load,      advanced one pass,                  36459
-github.tar,                         level 12 row 1,                     advanced one pass,                  36086
+github.tar,                         level 12 row 1,                     advanced one pass,                  36085
 github.tar,                         level 12 row 1 with dict dms,       advanced one pass,                  36986
 github.tar,                         level 12 row 1 with dict dds,       advanced one pass,                  36986
 github.tar,                         level 12 row 1 with dict copy,      advanced one pass,                  36609
-github.tar,                         level 12 row 1 with dict load,      advanced one pass,                  36421
+github.tar,                         level 12 row 1 with dict load,      advanced one pass,                  36423
 github.tar,                         level 12 row 2,                     advanced one pass,                  36110
 github.tar,                         level 12 row 2 with dict dms,       advanced one pass,                  36986
 github.tar,                         level 12 row 2 with dict dds,       advanced one pass,                  36986
@@ -553,17 +553,17 @@ silesia,                            level 0,                            advanced
 silesia,                            level 1,                            advanced one pass small out,        5306632
 silesia,                            level 3,                            advanced one pass small out,        4842075
 silesia,                            level 4,                            advanced one pass small out,        4779186
-silesia,                            level 5 row 1,                      advanced one pass small out,        4668076
+silesia,                            level 5 row 1,                      advanced one pass small out,        4667825
 silesia,                            level 5 row 2,                      advanced one pass small out,        4670136
-silesia,                            level 5,                            advanced one pass small out,        4668076
-silesia,                            level 6,                            advanced one pass small out,        4604785
-silesia,                            level 7 row 1,                      advanced one pass small out,        4570098
+silesia,                            level 5,                            advanced one pass small out,        4667825
+silesia,                            level 6,                            advanced one pass small out,        4604587
+silesia,                            level 7 row 1,                      advanced one pass small out,        4569976
 silesia,                            level 7 row 2,                      advanced one pass small out,        4564868
-silesia,                            level 7,                            advanced one pass small out,        4570098
-silesia,                            level 9,                            advanced one pass small out,        4545658
-silesia,                            level 11 row 1,                     advanced one pass small out,        4505448
+silesia,                            level 7,                            advanced one pass small out,        4569976
+silesia,                            level 9,                            advanced one pass small out,        4545538
+silesia,                            level 11 row 1,                     advanced one pass small out,        4505351
 silesia,                            level 11 row 2,                     advanced one pass small out,        4503116
-silesia,                            level 12 row 1,                     advanced one pass small out,        4505448
+silesia,                            level 12 row 1,                     advanced one pass small out,        4505351
 silesia,                            level 12 row 2,                     advanced one pass small out,        4503116
 silesia,                            level 13,                           advanced one pass small out,        4493990
 silesia,                            level 16,                           advanced one pass small out,        4360041
@@ -575,7 +575,7 @@ silesia,                            multithreaded long distance mode,   advanced
 silesia,                            small window log,                   advanced one pass small out,        7095000
 silesia,                            small hash log,                     advanced one pass small out,        6526141
 silesia,                            small chain log,                    advanced one pass small out,        4912197
-silesia,                            explicit params,                    advanced one pass small out,        4795730
+silesia,                            explicit params,                    advanced one pass small out,        4795654
 silesia,                            uncompressed literals,              advanced one pass small out,        5120566
 silesia,                            uncompressed literals optimal,      advanced one pass small out,        4319518
 silesia,                            huffman literals,                   advanced one pass small out,        5321369
@@ -587,17 +587,17 @@ silesia.tar,                        level 0,                            advanced
 silesia.tar,                        level 1,                            advanced one pass small out,        5327717
 silesia.tar,                        level 3,                            advanced one pass small out,        4854086
 silesia.tar,                        level 4,                            advanced one pass small out,        4791503
-silesia.tar,                        level 5 row 1,                      advanced one pass small out,        4679468
+silesia.tar,                        level 5 row 1,                      advanced one pass small out,        4679219
 silesia.tar,                        level 5 row 2,                      advanced one pass small out,        4682161
-silesia.tar,                        level 5,                            advanced one pass small out,        4679468
-silesia.tar,                        level 6,                            advanced one pass small out,        4615035
-silesia.tar,                        level 7 row 1,                      advanced one pass small out,        4579781
+silesia.tar,                        level 5,                            advanced one pass small out,        4679219
+silesia.tar,                        level 6,                            advanced one pass small out,        4614874
+silesia.tar,                        level 7 row 1,                      advanced one pass small out,        4579642
 silesia.tar,                        level 7 row 2,                      advanced one pass small out,        4575393
-silesia.tar,                        level 7,                            advanced one pass small out,        4579781
-silesia.tar,                        level 9,                            advanced one pass small out,        4555406
-silesia.tar,                        level 11 row 1,                     advanced one pass small out,        4514873
+silesia.tar,                        level 7,                            advanced one pass small out,        4579642
+silesia.tar,                        level 9,                            advanced one pass small out,        4555245
+silesia.tar,                        level 11 row 1,                     advanced one pass small out,        4514753
 silesia.tar,                        level 11 row 2,                     advanced one pass small out,        4513604
-silesia.tar,                        level 12 row 1,                     advanced one pass small out,        4514344
+silesia.tar,                        level 12 row 1,                     advanced one pass small out,        4514309
 silesia.tar,                        level 12 row 2,                     advanced one pass small out,        4513797
 silesia.tar,                        level 13,                           advanced one pass small out,        4502956
 silesia.tar,                        level 16,                           advanced one pass small out,        4360546
@@ -609,7 +609,7 @@ silesia.tar,                        multithreaded long distance mode,   advanced
 silesia.tar,                        small window log,                   advanced one pass small out,        7100655
 silesia.tar,                        small hash log,                     advanced one pass small out,        6529206
 silesia.tar,                        small chain log,                    advanced one pass small out,        4917041
-silesia.tar,                        explicit params,                    advanced one pass small out,        4807152
+silesia.tar,                        explicit params,                    advanced one pass small out,        4807078
 silesia.tar,                        uncompressed literals,              advanced one pass small out,        5122473
 silesia.tar,                        uncompressed literals optimal,      advanced one pass small out,        4310141
 silesia.tar,                        huffman literals,                   advanced one pass small out,        5341705
@@ -648,7 +648,7 @@ github,                             level 5 row 1,                      advanced
 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,        41896
+github,                             level 5 row 1 with dict load,       advanced one pass small out,        41895
 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
@@ -670,7 +670,7 @@ github,                             level 7 row 1,                      advanced
 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
 github,                             level 7 row 1 with dict copy,       advanced one pass small out,        38759
-github,                             level 7 row 1 with dict load,       advanced one pass small out,        43231
+github,                             level 7 row 1 with dict load,       advanced one pass small out,        43227
 github,                             level 7 row 2,                      advanced one pass small out,        135122
 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
@@ -807,27 +807,27 @@ github.tar,                         level 7 with dict dms,              advanced
 github.tar,                         level 7 with dict dds,              advanced one pass small out,        37857
 github.tar,                         level 7 with dict copy,             advanced one pass small out,        37839
 github.tar,                         level 7 with dict load,             advanced one pass small out,        37286
-github.tar,                         level 9,                            advanced one pass small out,        36722
-github.tar,                         level 9 with dict,                  advanced one pass small out,        36527
-github.tar,                         level 9 with dict dms,              advanced one pass small out,        36619
-github.tar,                         level 9 with dict dds,              advanced one pass small out,        36685
-github.tar,                         level 9 with dict copy,             advanced one pass small out,        36527
-github.tar,                         level 9 with dict load,             advanced one pass small out,        36298
-github.tar,                         level 11 row 1,                     advanced one pass small out,        36086
+github.tar,                         level 9,                            advanced one pass small out,        36723
+github.tar,                         level 9 with dict,                  advanced one pass small out,        36531
+github.tar,                         level 9 with dict dms,              advanced one pass small out,        36615
+github.tar,                         level 9 with dict dds,              advanced one pass small out,        36682
+github.tar,                         level 9 with dict copy,             advanced one pass small out,        36531
+github.tar,                         level 9 with dict load,             advanced one pass small out,        36322
+github.tar,                         level 11 row 1,                     advanced one pass small out,        36085
 github.tar,                         level 11 row 1 with dict dms,       advanced one pass small out,        36963
 github.tar,                         level 11 row 1 with dict dds,       advanced one pass small out,        36963
 github.tar,                         level 11 row 1 with dict copy,      advanced one pass small out,        36557
-github.tar,                         level 11 row 1 with dict load,      advanced one pass small out,        36421
+github.tar,                         level 11 row 1 with dict load,      advanced one pass small out,        36423
 github.tar,                         level 11 row 2,                     advanced one pass small out,        36110
 github.tar,                         level 11 row 2 with dict dms,       advanced one pass small out,        36963
 github.tar,                         level 11 row 2 with dict dds,       advanced one pass small out,        36963
 github.tar,                         level 11 row 2 with dict copy,      advanced one pass small out,        36557
 github.tar,                         level 11 row 2 with dict load,      advanced one pass small out,        36459
-github.tar,                         level 12 row 1,                     advanced one pass small out,        36086
+github.tar,                         level 12 row 1,                     advanced one pass small out,        36085
 github.tar,                         level 12 row 1 with dict dms,       advanced one pass small out,        36986
 github.tar,                         level 12 row 1 with dict dds,       advanced one pass small out,        36986
 github.tar,                         level 12 row 1 with dict copy,      advanced one pass small out,        36609
-github.tar,                         level 12 row 1 with dict load,      advanced one pass small out,        36421
+github.tar,                         level 12 row 1 with dict load,      advanced one pass small out,        36423
 github.tar,                         level 12 row 2,                     advanced one pass small out,        36110
 github.tar,                         level 12 row 2 with dict dms,       advanced one pass small out,        36986
 github.tar,                         level 12 row 2 with dict dds,       advanced one pass small out,        36986
@@ -871,17 +871,17 @@ silesia,                            level 0,                            advanced
 silesia,                            level 1,                            advanced streaming,                 5306388
 silesia,                            level 3,                            advanced streaming,                 4842075
 silesia,                            level 4,                            advanced streaming,                 4779186
-silesia,                            level 5 row 1,                      advanced streaming,                 4668076
+silesia,                            level 5 row 1,                      advanced streaming,                 4667825
 silesia,                            level 5 row 2,                      advanced streaming,                 4670136
-silesia,                            level 5,                            advanced streaming,                 4668076
-silesia,                            level 6,                            advanced streaming,                 4604785
-silesia,                            level 7 row 1,                      advanced streaming,                 4570098
+silesia,                            level 5,                            advanced streaming,                 4667825
+silesia,                            level 6,                            advanced streaming,                 4604587
+silesia,                            level 7 row 1,                      advanced streaming,                 4569976
 silesia,                            level 7 row 2,                      advanced streaming,                 4564868
-silesia,                            level 7,                            advanced streaming,                 4570098
-silesia,                            level 9,                            advanced streaming,                 4545658
-silesia,                            level 11 row 1,                     advanced streaming,                 4505448
+silesia,                            level 7,                            advanced streaming,                 4569976
+silesia,                            level 9,                            advanced streaming,                 4545538
+silesia,                            level 11 row 1,                     advanced streaming,                 4505351
 silesia,                            level 11 row 2,                     advanced streaming,                 4503116
-silesia,                            level 12 row 1,                     advanced streaming,                 4505448
+silesia,                            level 12 row 1,                     advanced streaming,                 4505351
 silesia,                            level 12 row 2,                     advanced streaming,                 4503116
 silesia,                            level 13,                           advanced streaming,                 4493990
 silesia,                            level 16,                           advanced streaming,                 4360041
@@ -893,7 +893,7 @@ silesia,                            multithreaded long distance mode,   advanced
 silesia,                            small window log,                   advanced streaming,                 7111103
 silesia,                            small hash log,                     advanced streaming,                 6526141
 silesia,                            small chain log,                    advanced streaming,                 4912197
-silesia,                            explicit params,                    advanced streaming,                 4795747
+silesia,                            explicit params,                    advanced streaming,                 4795672
 silesia,                            uncompressed literals,              advanced streaming,                 5120566
 silesia,                            uncompressed literals optimal,      advanced streaming,                 4319518
 silesia,                            huffman literals,                   advanced streaming,                 5321370
@@ -905,17 +905,17 @@ silesia.tar,                        level 0,                            advanced
 silesia.tar,                        level 1,                            advanced streaming,                 5327708
 silesia.tar,                        level 3,                            advanced streaming,                 4859271
 silesia.tar,                        level 4,                            advanced streaming,                 4797470
-silesia.tar,                        level 5 row 1,                      advanced streaming,                 4679473
+silesia.tar,                        level 5 row 1,                      advanced streaming,                 4679226
 silesia.tar,                        level 5 row 2,                      advanced streaming,                 4682169
-silesia.tar,                        level 5,                            advanced streaming,                 4679473
-silesia.tar,                        level 6,                            advanced streaming,                 4615035
-silesia.tar,                        level 7 row 1,                      advanced streaming,                 4579778
+silesia.tar,                        level 5,                            advanced streaming,                 4679226
+silesia.tar,                        level 6,                            advanced streaming,                 4614873
+silesia.tar,                        level 7 row 1,                      advanced streaming,                 4579641
 silesia.tar,                        level 7 row 2,                      advanced streaming,                 4575394
-silesia.tar,                        level 7,                            advanced streaming,                 4579778
-silesia.tar,                        level 9,                            advanced streaming,                 4555406
-silesia.tar,                        level 11 row 1,                     advanced streaming,                 4514873
+silesia.tar,                        level 7,                            advanced streaming,                 4579641
+silesia.tar,                        level 9,                            advanced streaming,                 4555246
+silesia.tar,                        level 11 row 1,                     advanced streaming,                 4514754
 silesia.tar,                        level 11 row 2,                     advanced streaming,                 4513604
-silesia.tar,                        level 12 row 1,                     advanced streaming,                 4514344
+silesia.tar,                        level 12 row 1,                     advanced streaming,                 4514309
 silesia.tar,                        level 12 row 2,                     advanced streaming,                 4513797
 silesia.tar,                        level 13,                           advanced streaming,                 4502956
 silesia.tar,                        level 16,                           advanced streaming,                 4360546
@@ -927,7 +927,7 @@ silesia.tar,                        multithreaded long distance mode,   advanced
 silesia.tar,                        small window log,                   advanced streaming,                 7117559
 silesia.tar,                        small hash log,                     advanced streaming,                 6529209
 silesia.tar,                        small chain log,                    advanced streaming,                 4917021
-silesia.tar,                        explicit params,                    advanced streaming,                 4807173
+silesia.tar,                        explicit params,                    advanced streaming,                 4807102
 silesia.tar,                        uncompressed literals,              advanced streaming,                 5127423
 silesia.tar,                        uncompressed literals optimal,      advanced streaming,                 4310141
 silesia.tar,                        huffman literals,                   advanced streaming,                 5341712
@@ -966,7 +966,7 @@ github,                             level 5 row 1,                      advanced
 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,                 41896
+github,                             level 5 row 1 with dict load,       advanced streaming,                 41895
 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
@@ -988,7 +988,7 @@ github,                             level 7 row 1,                      advanced
 github,                             level 7 row 1 with dict dms,        advanced streaming,                 38765
 github,                             level 7 row 1 with dict dds,        advanced streaming,                 38749
 github,                             level 7 row 1 with dict copy,       advanced streaming,                 38759
-github,                             level 7 row 1 with dict load,       advanced streaming,                 43231
+github,                             level 7 row 1 with dict load,       advanced streaming,                 43227
 github,                             level 7 row 2,                      advanced streaming,                 135122
 github,                             level 7 row 2 with dict dms,        advanced streaming,                 38860
 github,                             level 7 row 2 with dict dds,        advanced streaming,                 38766
@@ -1125,27 +1125,27 @@ github.tar,                         level 7 with dict dms,              advanced
 github.tar,                         level 7 with dict dds,              advanced streaming,                 37857
 github.tar,                         level 7 with dict copy,             advanced streaming,                 37839
 github.tar,                         level 7 with dict load,             advanced streaming,                 37286
-github.tar,                         level 9,                            advanced streaming,                 36722
-github.tar,                         level 9 with dict,                  advanced streaming,                 36527
-github.tar,                         level 9 with dict dms,              advanced streaming,                 36619
-github.tar,                         level 9 with dict dds,              advanced streaming,                 36685
-github.tar,                         level 9 with dict copy,             advanced streaming,                 36527
-github.tar,                         level 9 with dict load,             advanced streaming,                 36298
-github.tar,                         level 11 row 1,                     advanced streaming,                 36086
+github.tar,                         level 9,                            advanced streaming,                 36723
+github.tar,                         level 9 with dict,                  advanced streaming,                 36531
+github.tar,                         level 9 with dict dms,              advanced streaming,                 36615
+github.tar,                         level 9 with dict dds,              advanced streaming,                 36682
+github.tar,                         level 9 with dict copy,             advanced streaming,                 36531
+github.tar,                         level 9 with dict load,             advanced streaming,                 36322
+github.tar,                         level 11 row 1,                     advanced streaming,                 36085
 github.tar,                         level 11 row 1 with dict dms,       advanced streaming,                 36963
 github.tar,                         level 11 row 1 with dict dds,       advanced streaming,                 36963
 github.tar,                         level 11 row 1 with dict copy,      advanced streaming,                 36557
-github.tar,                         level 11 row 1 with dict load,      advanced streaming,                 36421
+github.tar,                         level 11 row 1 with dict load,      advanced streaming,                 36423
 github.tar,                         level 11 row 2,                     advanced streaming,                 36110
 github.tar,                         level 11 row 2 with dict dms,       advanced streaming,                 36963
 github.tar,                         level 11 row 2 with dict dds,       advanced streaming,                 36963
 github.tar,                         level 11 row 2 with dict copy,      advanced streaming,                 36557
 github.tar,                         level 11 row 2 with dict load,      advanced streaming,                 36459
-github.tar,                         level 12 row 1,                     advanced streaming,                 36086
+github.tar,                         level 12 row 1,                     advanced streaming,                 36085
 github.tar,                         level 12 row 1 with dict dms,       advanced streaming,                 36986
 github.tar,                         level 12 row 1 with dict dds,       advanced streaming,                 36986
 github.tar,                         level 12 row 1 with dict copy,      advanced streaming,                 36609
-github.tar,                         level 12 row 1 with dict load,      advanced streaming,                 36421
+github.tar,                         level 12 row 1 with dict load,      advanced streaming,                 36423
 github.tar,                         level 12 row 2,                     advanced streaming,                 36110
 github.tar,                         level 12 row 2 with dict dms,       advanced streaming,                 36986
 github.tar,                         level 12 row 2 with dict dds,       advanced streaming,                 36986
@@ -1189,10 +1189,10 @@ silesia,                            level 0,                            old stre
 silesia,                            level 1,                            old streaming,                      5306388
 silesia,                            level 3,                            old streaming,                      4842075
 silesia,                            level 4,                            old streaming,                      4779186
-silesia,                            level 5,                            old streaming,                      4668076
-silesia,                            level 6,                            old streaming,                      4604785
-silesia,                            level 7,                            old streaming,                      4570098
-silesia,                            level 9,                            old streaming,                      4545658
+silesia,                            level 5,                            old streaming,                      4667825
+silesia,                            level 6,                            old streaming,                      4604587
+silesia,                            level 7,                            old streaming,                      4569976
+silesia,                            level 9,                            old streaming,                      4545538
 silesia,                            level 13,                           old streaming,                      4493990
 silesia,                            level 16,                           old streaming,                      4360041
 silesia,                            level 19,                           old streaming,                      4296055
@@ -1207,10 +1207,10 @@ silesia.tar,                        level 0,                            old stre
 silesia.tar,                        level 1,                            old streaming,                      5327708
 silesia.tar,                        level 3,                            old streaming,                      4859271
 silesia.tar,                        level 4,                            old streaming,                      4797470
-silesia.tar,                        level 5,                            old streaming,                      4679473
-silesia.tar,                        level 6,                            old streaming,                      4615035
-silesia.tar,                        level 7,                            old streaming,                      4579778
-silesia.tar,                        level 9,                            old streaming,                      4555406
+silesia.tar,                        level 5,                            old streaming,                      4679226
+silesia.tar,                        level 6,                            old streaming,                      4614873
+silesia.tar,                        level 7,                            old streaming,                      4579641
+silesia.tar,                        level 9,                            old streaming,                      4555246
 silesia.tar,                        level 13,                           old streaming,                      4502956
 silesia.tar,                        level 16,                           old streaming,                      4360546
 silesia.tar,                        level 19,                           old streaming,                      4265911
@@ -1271,8 +1271,8 @@ github.tar,                         level 6,                            old stre
 github.tar,                         level 6 with dict,                  old streaming,                      38656
 github.tar,                         level 7,                            old streaming,                      38005
 github.tar,                         level 7 with dict,                  old streaming,                      37839
-github.tar,                         level 9,                            old streaming,                      36722
-github.tar,                         level 9 with dict,                  old streaming,                      36527
+github.tar,                         level 9,                            old streaming,                      36723
+github.tar,                         level 9 with dict,                  old streaming,                      36531
 github.tar,                         level 13,                           old streaming,                      35501
 github.tar,                         level 13 with dict,                 old streaming,                      37130
 github.tar,                         level 16,                           old streaming,                      40466
@@ -1291,10 +1291,10 @@ silesia,                            level 0,                            old stre
 silesia,                            level 1,                            old streaming advanced,             5306388
 silesia,                            level 3,                            old streaming advanced,             4842075
 silesia,                            level 4,                            old streaming advanced,             4779186
-silesia,                            level 5,                            old streaming advanced,             4668076
-silesia,                            level 6,                            old streaming advanced,             4604785
-silesia,                            level 7,                            old streaming advanced,             4570098
-silesia,                            level 9,                            old streaming advanced,             4545658
+silesia,                            level 5,                            old streaming advanced,             4667825
+silesia,                            level 6,                            old streaming advanced,             4604587
+silesia,                            level 7,                            old streaming advanced,             4569976
+silesia,                            level 9,                            old streaming advanced,             4545538
 silesia,                            level 13,                           old streaming advanced,             4493990
 silesia,                            level 16,                           old streaming advanced,             4360041
 silesia,                            level 19,                           old streaming advanced,             4296055
@@ -1305,7 +1305,7 @@ silesia,                            multithreaded long distance mode,   old stre
 silesia,                            small window log,                   old streaming advanced,             7111103
 silesia,                            small hash log,                     old streaming advanced,             6526141
 silesia,                            small chain log,                    old streaming advanced,             4912197
-silesia,                            explicit params,                    old streaming advanced,             4795747
+silesia,                            explicit params,                    old streaming advanced,             4795672
 silesia,                            uncompressed literals,              old streaming advanced,             4842075
 silesia,                            uncompressed literals optimal,      old streaming advanced,             4296055
 silesia,                            huffman literals,                   old streaming advanced,             6172207
@@ -1317,10 +1317,10 @@ silesia.tar,                        level 0,                            old stre
 silesia.tar,                        level 1,                            old streaming advanced,             5327708
 silesia.tar,                        level 3,                            old streaming advanced,             4859271
 silesia.tar,                        level 4,                            old streaming advanced,             4797470
-silesia.tar,                        level 5,                            old streaming advanced,             4679473
-silesia.tar,                        level 6,                            old streaming advanced,             4615035
-silesia.tar,                        level 7,                            old streaming advanced,             4579778
-silesia.tar,                        level 9,                            old streaming advanced,             4555406
+silesia.tar,                        level 5,                            old streaming advanced,             4679226
+silesia.tar,                        level 6,                            old streaming advanced,             4614873
+silesia.tar,                        level 7,                            old streaming advanced,             4579641
+silesia.tar,                        level 9,                            old streaming advanced,             4555246
 silesia.tar,                        level 13,                           old streaming advanced,             4502956
 silesia.tar,                        level 16,                           old streaming advanced,             4360546
 silesia.tar,                        level 19,                           old streaming advanced,             4265911
@@ -1331,7 +1331,7 @@ silesia.tar,                        multithreaded long distance mode,   old stre
 silesia.tar,                        small window log,                   old streaming advanced,             7117562
 silesia.tar,                        small hash log,                     old streaming advanced,             6529209
 silesia.tar,                        small chain log,                    old streaming advanced,             4917021
-silesia.tar,                        explicit params,                    old streaming advanced,             4807173
+silesia.tar,                        explicit params,                    old streaming advanced,             4807102
 silesia.tar,                        uncompressed literals,              old streaming advanced,             4859271
 silesia.tar,                        uncompressed literals optimal,      old streaming advanced,             4265911
 silesia.tar,                        huffman literals,                   old streaming advanced,             6179056
@@ -1397,7 +1397,7 @@ github.tar,                         level 6,                            old stre
 github.tar,                         level 6 with dict,                  old streaming advanced,             38635
 github.tar,                         level 7,                            old streaming advanced,             38005
 github.tar,                         level 7 with dict,                  old streaming advanced,             37264
-github.tar,                         level 9,                            old streaming advanced,             36722
+github.tar,                         level 9,                            old streaming advanced,             36723
 github.tar,                         level 9 with dict,                  old streaming advanced,             36241
 github.tar,                         level 13,                           old streaming advanced,             35501
 github.tar,                         level 13 with dict,                 old streaming advanced,             35807
@@ -1443,7 +1443,7 @@ github.tar,                         level 4 with dict,                  old stre
 github.tar,                         level 5 with dict,                  old streaming cdict,                39000
 github.tar,                         level 6 with dict,                  old streaming cdict,                38647
 github.tar,                         level 7 with dict,                  old streaming cdict,                37286
-github.tar,                         level 9 with dict,                  old streaming cdict,                36298
+github.tar,                         level 9 with dict,                  old streaming cdict,                36322
 github.tar,                         level 13 with dict,                 old streaming cdict,                36010
 github.tar,                         level 16 with dict,                 old streaming cdict,                39081
 github.tar,                         level 19 with dict,                 old streaming cdict,                32479