bench: clean things and remove dependency on gsl

bench/Makefile

@@ -69,14 +69,14 @@ REL_IMPLEMENTATION_DIR = $(subst $(BIN)/,$(SRC)/,$(@D))
 ASSEMBLY_FILE = $(REL_IMPLEMENTATION_DIR)/$(OP_LOWERCASE).s
 
 #
-DEFINE      ?= -DRUNS=11 -DTIMINGS=10000
+DEFINE      ?= -DRUNS=3 -DTIMINGS=10000
 DEFINE_NS    = -DJADE_NAMESPACE=$(NS_UPPERCASE) -DJADE_NAMESPACE_LC=$(NS_LOWERCASE)
 INCLUDES     = -I$(REL_IMPLEMENTATION_DIR)/include/ -I$(COMMON)/ -Iinclude/
 
 RANDOMBYTES ?= $(EXT)/randombytes/librandombytes.a
 RANDOMBYTES_INCLUDE ?= -I$(EXT)/randombytes/
 
-BENCH_COMPILE = ($(CC) $(CFLAGS) -o $@ $(DEFINE) $(DEFINE_NS) $(INCLUDES) $(RANDOMBYTES_INCLUDE) $(COMMON)/crypto_$(OP_LOWERCASE).c $(ASSEMBLY_FILE) $(RANDOMBYTES) -lgsl) $(CI_CMD)
+BENCH_COMPILE = ($(CC) $(CFLAGS) -o $@ $(DEFINE) $(DEFINE_NS) $(INCLUDES) $(RANDOMBYTES_INCLUDE) $(COMMON)/crypto_$(OP_LOWERCASE).c $(ASSEMBLY_FILE) $(RANDOMBYTES)) $(CI_CMD)
 
 
 # -----------------------------------------------------------------------------

bench/common/config.h

@@ -7,10 +7,6 @@
 #define RUNS 1
 #endif
 
-#ifndef LOOPS
-#define LOOPS 1
-#endif
-
 #ifndef TIMINGS
 #define TIMINGS 10000
 #endif
@@ -43,25 +39,5 @@
 #define INC_OUTBYTES 2
 #endif
 
-//
-
-#if defined(ST_ON)
-
- #ifndef ST_MAX
- #define ST_MAX 5
- #endif
-
- // 0.1 %
- #ifndef ST_PER
- #define ST_PER 0.1
- #endif
-
- #ifndef ST_CHK
- #define ST_CHK (((double)ST_PER)/((double)100.0))
- #endif
-
-#endif
-//
-
 #endif
 

bench/common/cpucycles.c

@@ -34,5 +34,4 @@ static uint64_t cpucycles_median(uint64_t *cycles, size_t timings)
   return median(cycles, timings-1);
 }
 
-
 #endif

bench/common/crypto_scalarmult.c

@@ -20,31 +20,23 @@
 
 #include "config.h"
 #include "cpucycles.c"
-#include "increment.c"
 #include "printbench.c"
 #include "alignedcalloc.c"
 #include "benchrandombytes.c"
-#include "stability.c"
 
 //
 
 int main(int argc, char**argv)
 {
-  size_t run, loop, i;
+  size_t run, i;
   uint64_t cycles[TIMINGS];
-  uint64_t median_loops[OP1][LOOPS];
-
-#if defined(ST_ON)
   uint64_t median_runs[OP1][RUNS];
-  double   sd_runs[OP1], mean_runs[OP1];
-#endif
 
-  char *op1_str[] = {xstr(crypto_scalarmult_base,.csv),
-                     xstr(crypto_scalarmult,.csv)};
+  char *op1_str[] = { xstr(crypto_scalarmult_base,.csv),
+                      xstr(crypto_scalarmult,.csv)};
 
-  char *op1_str_short[] =
-                    { "scalarmult     ",
-                      "scalarmult_base"};
+  char *op1_str_short[] = { "scalarmult     ",
+                            "scalarmult_base" };
 
   uint8_t *_m, *m; // CRYPTO_SCALARBYTES
   uint8_t *_n, *n; // CRYPTO_SCALARBYTES
@@ -58,41 +50,25 @@ int main(int argc, char**argv)
   p = alignedcalloc(&_p, CRYPTO_BYTES);
   q = alignedcalloc(&_q, CRYPTO_BYTES);
 
-_st_while_b
-
   for(run = 0; run < RUNS; run++)
   {
-    _st_reset_randombytes
-
-    for(loop = 0; loop < LOOPS; loop++)
-    {
-      benchrandombytes(m, CRYPTO_SCALARBYTES);
-      benchrandombytes(n, CRYPTO_SCALARBYTES);
-
-      // scalarmult_base
-      for (i = 0; i < TIMINGS; i++)
-      { cycles[i] = cpucycles();
-        crypto_scalarmult_base(p,m); }
-      median_loops[1][loop] = cpucycles_median(cycles, TIMINGS);
-
-      // scalarmult
-      for (i = 0; i < TIMINGS; i++)
-      { cycles[i] = cpucycles();
-        crypto_scalarmult(q,n,p); }
-      median_loops[0][loop] = cpucycles_median(cycles, TIMINGS);
-    }
-
-    _st_ifnotst(pb_print_1(argc, median_loops, op1_str, op1_str_short))
-    _st_store_1(median_runs, run, median_loops)
+    benchrandombytes(m, CRYPTO_SCALARBYTES);
+    benchrandombytes(n, CRYPTO_SCALARBYTES);
+
+    // scalarmult_base
+    for (i = 0; i < TIMINGS; i++)
+    { cycles[i] = cpucycles();
+      crypto_scalarmult_base(p, m); }
+    median_runs[1][run] = cpucycles_median(cycles, TIMINGS);
+
+    // scalarmult
+    for (i = 0; i < TIMINGS; i++)
+    { cycles[i] = cpucycles();
+      crypto_scalarmult(q, n, p); }
+    median_runs[0][run] = cpucycles_median(cycles, TIMINGS);
   }
 
-  // all results must be within 'spec' at the same time
-  // does not save 'best' results
-  _st_check_1(sd_runs, mean_runs, median_runs)
-
-_st_while_e
-
-_st_print_1(argc, sd_runs, mean_runs, median_runs, op1_str, op1_str_short)
+  pb_print_1(argc, median_runs, op1_str, op1_str_short);
 
   free(_m);
   free(_n);

bench/common/increment.c

@@ -6,9 +6,6 @@
 #include "namespace.h"
 #include <stdlib.h>
 
-
-
-
 // iter by 1
 static size_t inc_1(size_t len)
 {
@@ -20,8 +17,6 @@ static size_t size_inc_1(size_t start, size_t end)
   return end - start + 1;
 }
 
-
-
 // iter by <<1
 static size_t inc_2(size_t len)
 {
@@ -38,8 +33,6 @@ static size_t size_inc_2(size_t start, size_t end)
   return r;
 }
 
-
-
 // iter 32 values in between each 2^n (plots)
 static size_t inc_3(size_t len)
 {
@@ -64,8 +57,6 @@ static size_t size_inc_3(size_t start, size_t end)
   return r;
 }
 
-
-
 #define inc_in EVALUATOR(inc,INC_INBYTES)
 #define size_inc_in EVALUATOR(size_inc,INC_INBYTES)