From: Yann Collet <cyan@fb.com>
Date: Mon, 21 Oct 2024 00:16:17 +0000 (-0700)
Subject: minor split optimization
X-Git-Tag: v1.5.7^2~71^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c62e714ab9f53aefd6478e033ce448597b68fab;p=thirdparty%2Fzstd.git

minor split optimization

let's fill the initial stats directly into target fingerprint
---

diff --git a/lib/compress/zstd_preSplit.c b/lib/compress/zstd_preSplit.c
index ceac5c91f..f831dabde 100644
--- a/lib/compress/zstd_preSplit.c
+++ b/lib/compress/zstd_preSplit.c
@@ -18,7 +18,7 @@
 #define BLOCKSIZE_MIN 3500
 #define THRESHOLD_PENALTY_RATE 16
 #define THRESHOLD_BASE (THRESHOLD_PENALTY_RATE - 2)
-#define THRESHOLD_PENALTY 4
+#define THRESHOLD_PENALTY 3
 
 #define HASHLENGTH 2
 #define HASHLOG 10
@@ -84,8 +84,8 @@ static int compareFingerprints(const FingerPrint* ref,
                             const FingerPrint* newfp,
                             int penalty)
 {
-    if (ref->nbEvents <= BLOCKSIZE_MIN)
-        return 0;
+    assert(ref->nbEvents > 0);
+    assert(newfp->nbEvents > 0);
     {   S64 p50 = ref->nbEvents * newfp->nbEvents;
         S64 deviation = fpDistance(ref, newfp);
         S64 threshold = p50 * (THRESHOLD_BASE + penalty) / THRESHOLD_PENALTY_RATE;
@@ -140,7 +140,8 @@ size_t ZSTD_splitBlock_4k(const void* src, size_t srcSize,
     assert(wkspSize >= sizeof(FPStats)); (void)wkspSize;
 
     initStats(fpstats);
-    for (pos = 0; pos < blockSizeMax;) {
+    recordFingerprint(&fpstats->pastEvents, p, CHUNKSIZE);
+    for (pos = CHUNKSIZE; pos < blockSizeMax; pos += CHUNKSIZE) {
         assert(pos <= blockSizeMax - CHUNKSIZE);
         recordFingerprint(&fpstats->newEvents, p + pos, CHUNKSIZE);
         if (compareFingerprints(&fpstats->pastEvents, &fpstats->newEvents, penalty)) {
@@ -150,7 +151,6 @@ size_t ZSTD_splitBlock_4k(const void* src, size_t srcSize,
             ZSTD_memset(&fpstats->newEvents, 0, sizeof(fpstats->newEvents));
             penalty = penalty - 1 + (penalty == 0);
         }
-        pos += CHUNKSIZE;
     }
     return blockSizeMax;
     (void)flushEvents; (void)removeEvents;
diff --git a/lib/compress/zstd_preSplit.h b/lib/compress/zstd_preSplit.h
index b0b6bb762..7b6aadd0b 100644
--- a/lib/compress/zstd_preSplit.h
+++ b/lib/compress/zstd_preSplit.h
@@ -22,6 +22,10 @@ extern "C" {
 /* note:
  * @workspace must be aligned on 8-bytes boundaries
  * @wkspSize must be at least >= ZSTD_SLIPBLOCK_WORKSPACESIZE
+ * note2:
+ * for the time being, this function only accepts full 128 KB blocks,
+ * therefore @blockSizeMax must be == 128 KB.
+ * This could be extended to smaller sizes in the future.
  */
 size_t ZSTD_splitBlock_4k(const void* src, size_t srcSize, size_t blockSizeMax, void* workspace, size_t wkspSize);