From: Yann Collet <cyan@fb.com>
Date: Tue, 28 Aug 2018 00:52:04 +0000 (-0700)
Subject: restored assert() in paramgrill
X-Git-Tag: v0.0.29~26^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0071e8348f20c91a7b9136e312d258d286370057;p=thirdparty%2Fzstd.git

restored assert() in paramgrill

assert() in paramgrill are not in the benchmark path.
They should remain active, as they don't impact measurements, and their runtime is insignificant.
---

diff --git a/tests/Makefile b/tests/Makefile
index 88a5d763c..d0d798fc3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -200,7 +200,7 @@ zstreamtest-dll : $(ZSTDDIR)/common/xxhash.c  # xxh symbols not exposed from dll
 zstreamtest-dll : $(ZSTREAM_LOCAL_FILES)
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(filter %.c,$^) $(LDFLAGS) -o $@$(EXT)
 
-paramgrill : DEBUGFLAGS = -DNDEBUG  # turn off assert() for speed measurements
+paramgrill : DEBUGFLAGS =  # turn off assert() by default for speed measurements
 paramgrill : $(ZSTD_FILES) $(PRGDIR)/bench.c $(PRGDIR)/datagen.c paramgrill.c
 	$(CC) $(FLAGS) $^ -lm -o $@$(EXT)
 
diff --git a/tests/paramgrill.c b/tests/paramgrill.c
index 9d769596c..0568626a8 100644
--- a/tests/paramgrill.c
+++ b/tests/paramgrill.c
@@ -1544,6 +1544,7 @@ static int allBench(BMK_benchResult_t* resultPtr,
     U64 loopDurationC = 0, loopDurationD = 0;
     double uncertaintyConstantC = 3., uncertaintyConstantD = 3.;
     double winnerRS;
+
     /* initial benchmarking, gives exact ratio and memory, warms up future runs */
     CBENCHMARK(1, benchres, tmp, BMK_both, 1);
 
@@ -1568,6 +1569,9 @@ static int allBench(BMK_benchResult_t* resultPtr,
         return WORSE_RESULT;
     }
 
+    assert(loopDurationC >= TIMELOOP_NANOSEC / 10);
+    assert(loopDurationD >= TIMELOOP_NANOSEC / 10);
+
     /* second run, if first run is too short, gives approximate cSpeed + dSpeed */
     CBENCHMARK(loopDurationC < TIMELOOP_NANOSEC / 10, benchres, tmp, BMK_compressOnly, 1);
     CBENCHMARK(loopDurationD < TIMELOOP_NANOSEC / 10, benchres, tmp, BMK_decodeOnly,   1);