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 88a5d763c915fa313f2b175f478e441fdaf93eeb..d0d798fc39d077103646078eabfcb4f3bdf24bcf 100644 (file)
--- 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 9d769596c427a6ba04d238a8df0077bac56d1889..0568626a86e6a55d32ad497d1deeab9c6710c645 100644 (file)
--- 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);