bench.c: force at least one compression and decompression loop

fix for -i0 with small files

diff --git a/.gitignore b/.gitignore
index 6ca7f8a7e24dda63d3700de999a607af69098948..8af4bbe967b116c4a94061c5db61f5e2f932b025 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ ipch/
 .directory
 _codelite
 _zstdbench
+zlib_wrapper

diff --git a/lib/zstd_opt.h b/lib/zstd_opt.h
index 553465e0652c14fed7514203b6051aabe8d7afc8..f584cf43081874cbc5630d818aa83f2106bc4bc4 100644 (file)
--- a/lib/zstd_opt.h
+++ b/lib/zstd_opt.h
@@ -53,9 +53,10 @@ MEM_STATIC void ZSTD_rescaleFreqs(seqStore_t* ssPtr)
 {
     unsigned u;
 
+    ssPtr->cachedLiterals = NULL;
+    ssPtr->cachedPrice = ssPtr->cachedLitLength = 0;
+
     if (ssPtr->litLengthSum == 0) {
-        ssPtr->cachedLiterals = NULL;
-        ssPtr->cachedPrice = ssPtr->cachedLitLength = 0;
         ssPtr->litSum = (2<<Litbits);
         ssPtr->litLengthSum = MaxLL+1;
         ssPtr->matchLengthSum = MaxML+1;

diff --git a/programs/bench.c b/programs/bench.c
index de9e16e95e63d21bf8b41ce3110527e986b612a9..2892ef7420a9195f0ac866e749581da7ee250e85 100644 (file)
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -307,7 +307,7 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
         DISPLAYLEVEL(2, "\r%79s\r", "");
         for (testNb = 1; testNb <= (g_nbIterations + !g_nbIterations); testNb++) {
             BMK_time_t clockStart, clockEnd;
-            U64 clockLoop = g_nbIterations ? TIMELOOP_S*1000000ULL : 10;
+            U64 clockLoop = g_nbIterations ? TIMELOOP_S*1000000ULL : 1;
 
             /* overheat protection */
             if (BMK_clockSpan(coolTime, ticksPerSecond) > ACTIVEPERIOD_S*1000000ULL) {
@@ -326,8 +326,8 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
             while (BMK_getSpanTimeNano(ticksPerSecond, clockStart, clockEnd) == 0);
             BMK_getTime(clockStart);
 
-            {   U32 nbLoops;
-                for (nbLoops = 0 ; BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop ; nbLoops++) {
+            {   U32 nbLoops = 0;
+                do {
                     U32 blockNb;
                     {   ZSTD_parameters params;
                         params.cParams = ZSTD_getCParams(cLevel, blockSize, dictBufferSize);
@@ -342,7 +342,9 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                                             blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize);
                         if (ZSTD_isError(rSize)) EXM_THROW(1, "ZSTD_compress_usingPreparedCCtx() failed : %s", ZSTD_getErrorName(rSize));
                         blockTable[blockNb].cSize = rSize;
-                }   }
+                    }
+                    nbLoops++;
+                } while (BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop);
                 {   U64 const clockSpan = BMK_clockSpan(clockStart, ticksPerSecond);
                     if (clockSpan < fastestC*nbLoops) fastestC = clockSpan / nbLoops;
             }   }
@@ -365,8 +367,8 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
             while (BMK_getSpanTimeNano(ticksPerSecond, clockStart, clockEnd) == 0);
             BMK_getTime(clockStart);
 
-            {   U32 nbLoops;
-                for (nbLoops = 0 ; BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop ; nbLoops++) {
+            {   U32 nbLoops = 0;
+                do {
                     U32 blockNb;
                     ZSTD_decompressBegin_usingDict(refDCtx, dictBuffer, dictBufferSize);
                     for (blockNb=0; blockNb<nbBlocks; blockNb++) {
@@ -380,7 +382,9 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                             break;
                         }
                         blockTable[blockNb].resSize = regenSize;
-                }   }
+                    }
+                    nbLoops++;
+                } while (BMK_clockSpan(clockStart, ticksPerSecond) < clockLoop);
                 {   U64 const clockSpan = BMK_clockSpan(clockStart, ticksPerSecond);
                     if (clockSpan < fastestD*nbLoops) fastestD = clockSpan / nbLoops;
             }   }