renamed benchmarks to tools

4 files changed, 25 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 43bc3e4..f5ea6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ clean:
 test: debugcube.o
         CUBETYPE=${CUBETYPE} TEST=${TEST} ./test/test.sh
 
-benchmark: cube.o
-        CUBETYPE=${CUBETYPE} ./benchmark/benchmark.sh
+tool: cube.o
+        CUBETYPE=${CUBETYPE} ./tools/run_tool.sh
 
 shell: cube.o
         mkdir -p tables
@@ -28,4 +28,4 @@ debugshell: debugcube.o
         mkdir -p tables
         ${CC} ${DBGFLAGS} -o run debugcube.o shell.c
 
-.PHONY: all clean test benchmark shell debugshell
+.PHONY: all clean test tool shell debugshell
diff --git a/benchmark/00_gendata_h48/gendata_h48_benchmark.c b/tools/benchmark_gendata_h48/benchmark_gendata_h48.c
index 1dc7c57..efb6f6f 100644
--- a/benchmark/00_gendata_h48/gendata_h48_benchmark.c
+++ b/tools/benchmark_gendata_h48/benchmark_gendata_h48.c
@@ -1,4 +1,4 @@
-#include "../benchmark.h"
+#include "../timerun.h"
 #include "../../src/cube.h"
 
 #define MAXDEPTH 10
@@ -6,10 +6,13 @@
 #define OPTIONS "2;10"
 #define LONGOPTIONS "h = 2, max depth = 10"
 
+#define COCSEPSIZE 1119792
+#define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (size_t)(h))
+
 char *buf;
 
 void run(void) {
-        uint32_t *buf32;
+        uint32_t *h48info;
         int i;
         int64_t s;
 
@@ -19,9 +22,9 @@ void run(void) {
                 printf("Error generating table\n");
         } else {
                 printf("Succesfully generated %" PRId64 " bytes. Table:\n", s);
-                buf32 = (uint32_t *)&buf[s-sizeof(uint32_t)*(MAXDEPTH+1)];
-                for (i = 0; i <= MAXDEPTH; i++)
-                        printf("%d:\t%" PRId32 "\n", i, buf32[i]);
+                h48info = (uint32_t *)buf + (ETABLESIZE(HVALUE) + COCSEPSIZE) / 4;
+                for (i = 0; i < MAXDEPTH+1; i++)
+                        printf("%d:\t%" PRIu32 "\n", i, h48info[i+1]);
         }
 }
 
@@ -36,7 +39,9 @@ int main() {
 
         buf = malloc(size);
 
-        time_benchmark(run, "gendata_h48 " LONGOPTIONS);
+        timerun(run, "benchmark gendata_h48 " LONGOPTIONS);
+
+        free(buf);
 
         return 0;
 }
diff --git a/benchmark/benchmark.sh b/tools/run_tool.sh
index 6de280c..21b6ce9 100755
--- a/benchmark/benchmark.sh
+++ b/tools/run_tool.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-re="${RUN:-$@}"
+if [ -z "$TOOL" ]; then
+        echo "No tool selected (TOOL variable must be set)"
+        exit 1
+fi
 
 CC="cc -std=c99 -pedantic -Wall -Wextra \
     -Wno-unused-parameter -Wno-unused-function -O3 -D$CUBETYPE \
@@ -8,20 +11,17 @@ CC="cc -std=c99 -pedantic -Wall -Wextra \
 
 [ "$CUBETYPE" = "CUBE_AVX2" ] && CC="$CC -mavx2"
 
-BIN="benchmark/run"
-RES="benchmark/results"
+BIN="tools/run"
 CUBEOBJ="cube.o"
 d="$(date +'%Y-%m-%d-%H-%M-%S')"
 
-mkdir -p "$RES"
-
-for t in benchmark/*; do
-        if [ -n "$re" ] && [ -z "$(echo "$t" | grep "$re")" ]; then
+for t in tools/*; do
+        if [ ! -d "$t" ] || [ -z "$(echo "$t" | grep "$TOOL")" ]; then
                 continue
         fi
-        if [ ! -d "$t" ] || [ "$t" = "benchmark/results" ]; then continue; fi
         $CC -o $BIN $t/*.c $CUBEOBJ || exit 1;
-        $BIN | tee "$RES/results-$d.txt" "$RES/results-last.txt"
+        $BIN
+        break
 done
 
 rm -rf $BIN $CUBEOBJ
diff --git a/benchmark/benchmark.h b/tools/timerun.h
index e9361a8..dabfde0 100644
--- a/benchmark/benchmark.h
+++ b/tools/timerun.h
@@ -5,7 +5,7 @@
 #include <time.h>
 
 double
-time_benchmark(void (*run)(void), char *name)
+timerun(void (*run)(void), char *name)
 {
         struct timespec start, end;
         double tdiff, tdsec, tdnano;
@@ -19,7 +19,7 @@ time_benchmark(void (*run)(void), char *name)
                 return -1.0;
         }
 
-        printf("Benchmark: %s\n\n", name);
+        printf("Running tool: %s\n", name);
         printf("==========\n");
         fflush(stdout);