From: Yann Collet <cyan@fb.com>
Date: Fri, 24 Aug 2018 19:40:10 +0000 (-0700)
Subject: fixed fullbench behavior
X-Git-Tag: v0.0.29~26^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b23cc4d1e076b815be521f6d66fc974532f344e;p=thirdparty%2Fzstd.git

fixed fullbench behavior

now same as v1.3.5
---

diff --git a/tests/fullbench.c b/tests/fullbench.c
index 9d6654d73..a564819a4 100644
--- a/tests/fullbench.c
+++ b/tests/fullbench.c
@@ -514,24 +514,39 @@ static size_t benchMem(U32 benchNb,
     { size_t i; for (i=0; i<dstBuffSize; i++) dstBuff[i]=(BYTE)i; }
 
     /* benchmark loop */
-    {   void* dstBuffv = dstBuff;
-        BMK_runOutcome_t const outcome = BMK_benchFunction(
-                    benchFunction, buff2,
-                    NULL, NULL,   /* initFn */
-                    1,  /* blockCount */
-                    &src, &srcSize,
-                    &dstBuffv, &dstBuffSize,
-                    NULL,
-                    g_nbIterations);
-        if (!BMK_isSuccessful_runOutcome(outcome)) {
-            DISPLAY("ERROR benchmarking function ! ! \n");
-            errorcode = 1;
-            goto _cleanOut;
-        }
+    {   BMK_timedFnState_t* const tfs = BMK_createTimedFnState(g_nbIterations);
+        BMK_runTime_t bestResult;
+        bestResult.sumOfReturn = 0;
+        bestResult.nanoSecPerRun = (unsigned long long)(-1LL);
+        for (;;) {
+            void* const dstBuffv = dstBuff;
+            BMK_timedFnOutcome_t const bOutcome =
+                    BMK_benchFunctionTimed( tfs,
+                            benchFunction, buff2,
+                            NULL, NULL,   /* initFn */
+                            1,  /* blockCount */
+                            &src, &srcSize,
+                            &dstBuffv, &dstBuffSize,
+                            NULL);
+
+            if (!BMK_isSuccessful_timedFnOutcome(bOutcome)) {
+                DISPLAY("ERROR benchmarking function ! ! \n");
+                errorcode = 1;
+                goto _cleanOut;
+            }
+
+            {   BMK_runTime_t const newResult = BMK_extract_timedFnResult(bOutcome);
+                if (newResult.nanoSecPerRun < bestResult.nanoSecPerRun )
+                    bestResult.nanoSecPerRun = newResult.nanoSecPerRun;
+                DISPLAY("\r%2u#%-29.29s:%8.1f MB/s  (%8u) ",
+                        benchNb, benchName,
+                        (double)srcSize * TIMELOOP_NANOSEC / bestResult.nanoSecPerRun / MB_UNIT,
+                        (unsigned)newResult.sumOfReturn );
+            }
 
-        {   BMK_runTime_t const result = BMK_extract_runTime(outcome);
-            DISPLAY("%2u#%-25.25s:%7.1f MB/s (%7u) \n", benchNb, benchName, (double)srcSize * TIMELOOP_NANOSEC / result.nanoSecPerRun / MB_UNIT, (unsigned)result.sumOfReturn );
+            if ( BMK_isCompleted_timedFnOutcome(bOutcome) ) break;
     }   }
+    DISPLAY("\n");
 
 _cleanOut:
     free(buff1);