From: Elliot Gorokhovsky <embg@fb.com>
Date: Thu, 23 Jun 2022 20:58:03 +0000 (-0400)
Subject: Nits
X-Git-Tag: v1.5.4^2~192^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb9e3411292133c4e2b96ef331760eefdf895f23;p=thirdparty%2Fzstd.git

Nits
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index f8ca7d35e..b1f9bba8a 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -1943,6 +1943,7 @@ static size_t ZSTD_resetCCtx_internal(ZSTD_CCtx* zc,
 
         /* init params */
         zc->blockState.matchState.cParams = params->cParams;
+        zc->blockState.matchState.prefetchCDictTables = params->prefetchCDictTables == ZSTD_ps_enable;
         zc->pledgedSrcSizePlusOne = pledgedSrcSize+1;
         zc->consumedSrcSize = 0;
         zc->producedCSize = 0;
@@ -2928,7 +2929,6 @@ static size_t ZSTD_buildSeqStore(ZSTD_CCtx* zc, const void* src, size_t srcSize)
                                                                                     zc->appliedParams.useRowMatchFinder,
                                                                                     dictMode);
             ms->ldmSeqStore = NULL;
-            ms->prefetchCDictTables = zc->appliedParams.prefetchCDictTables == ZSTD_ps_enable;
             lastLLSize = blockCompressor(ms, &zc->seqStore, zc->blockState.nextCBlock->rep, src, srcSize);
         }
         {   const BYTE* const lastLiterals = (const BYTE*)src + srcSize - lastLLSize;
diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h
index 8c73007c8..4771b15ba 100644
--- a/lib/compress/zstd_compress_internal.h
+++ b/lib/compress/zstd_compress_internal.h
@@ -235,7 +235,11 @@ struct ZSTD_matchState_t {
     const ZSTD_matchState_t* dictMatchState;
     ZSTD_compressionParameters cParams;
     const rawSeqStore_t* ldmSeqStore;
-    int prefetchCDictTables;  /* Controls prefetching in some dictMatchState matchfinders */
+
+    /* Controls prefetching in some dictMatchState matchfinders.
+     * This behavior is controlled from the cctx ms.
+     * This parameter has no effect in the cdict ms. */
+    int prefetchCDictTables;
 };
 
 typedef struct {
diff --git a/lib/compress/zstd_double_fast.c b/lib/compress/zstd_double_fast.c
index a69fdc818..c2dbd54c1 100644
--- a/lib/compress/zstd_double_fast.c
+++ b/lib/compress/zstd_double_fast.c
@@ -346,10 +346,10 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
     assert(ms->window.dictLimit + (1U << cParams->windowLog) >= endIndex);
 
     if (ms->prefetchCDictTables) {
-        size_t const hashTableSize = ((size_t)1) << dictCParams->hashLog;
-        size_t const chainTableSize = ((size_t)1) << dictCParams->chainLog;
-        PREFETCH_AREA(dictHashLong, hashTableSize * sizeof(U32))
-        PREFETCH_AREA(dictHashSmall, chainTableSize * sizeof(U32))
+        size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32);
+        size_t const chainTableBytes = (((size_t)1) << dictCParams->chainLog) * sizeof(U32);
+        PREFETCH_AREA(dictHashLong, hashTableBytes)
+        PREFETCH_AREA(dictHashSmall, chainTableBytes)
     }
 
     /* init */
diff --git a/lib/compress/zstd_fast.c b/lib/compress/zstd_fast.c
index a44057988..291173449 100644
--- a/lib/compress/zstd_fast.c
+++ b/lib/compress/zstd_fast.c
@@ -501,8 +501,8 @@ size_t ZSTD_compressBlock_fast_dictMatchState_generic(
     assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
 
     if (ms->prefetchCDictTables) {
-        size_t const hashTableSize = ((size_t)1) << dictCParams->hashLog;
-        PREFETCH_AREA(dictHashTable, hashTableSize * sizeof(U32))
+        size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32);
+        PREFETCH_AREA(dictHashTable, hashTableBytes)
     }
 
     /* init */