move benchmark definitions into src/benchmarks

bench now loads all *.py files from src/benchmarks as benchmarks

7 files changed, 6 insertions, 4 deletions

diff --git a/bench.py b/bench.py
index 412597f..90bd0bf 100755
--- a/bench.py
+++ b/bench.py
@@ -14,7 +14,9 @@ import src.globalvars
 from src.util import *
 
 
-benchmarks = ["loop", "mysql", "falsesharing", "dj_trace", "larson"]
+bench_dir = "src/benchmarks"
+benchmarks = [e[:-3] for e in os.listdir(bench_dir)
+                     if e[-3:] == ".py" and e != "__init__.py"]
 
 parser = argparse.ArgumentParser(description="benchmark memory allocators")
 parser.add_argument("-ds, --dont-save", action='store_true', dest="dont_save",
@@ -143,7 +145,7 @@ def main():
             continue
 
         try:
-            bench = eval("importlib.import_module('src.{0}').{0}".format(bench))
+            bench = eval("importlib.import_module('src.benchmarks.{0}').{0}".format(bench))
 
             if args.load:
                 bench.load(path=args.load)
diff --git a/src/benchmarks/__init__.py b/src/benchmarks/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/benchmarks/__init__.py
diff --git a/src/dj_trace.py b/src/benchmarks/dj_trace.py
index 062f34c..062f34c 100644
--- a/src/dj_trace.py
+++ b/src/benchmarks/dj_trace.py
diff --git a/src/falsesharing.py b/src/benchmarks/falsesharing.py
index f6375a6..f6375a6 100644
--- a/src/falsesharing.py
+++ b/src/benchmarks/falsesharing.py
diff --git a/src/larson.py b/src/benchmarks/larson.py
index e070b7b..e070b7b 100644
--- a/src/larson.py
+++ b/src/benchmarks/larson.py
diff --git a/src/loop.py b/src/benchmarks/loop.py
index a8459da..4683549 100644
--- a/src/loop.py
+++ b/src/benchmarks/loop.py
@@ -17,7 +17,7 @@ class Benchmark_Loop(Benchmark):
 
     def summary(self):
         # Speed
-        self.plot_fixed_arg("perm.nthreads / (float({task-clock})/1000)",
+        self.plot_fixed_arg("perm.nthreads / ({task-clock}/1000)",
                             ylabel='"MOPS/cpu-second"',
                             title='"Loop: " + arg + " " + str(arg_value)',
                             filepostfix="time")
@@ -29,7 +29,7 @@ class Benchmark_Loop(Benchmark):
                             filepostfix="l1misses")
 
         # Speed Matrix
-        self.write_best_doublearg_tex_table("perm.nthreads / (float({task-clock})/1000)",
+        self.write_best_doublearg_tex_table("perm.nthreads / ({task-clock}/1000)",
                                             filepostfix="memusage.matrix")
 
 
diff --git a/src/mysql.py b/src/benchmarks/mysql.py
index e3f1f0f..e3f1f0f 100644
--- a/src/mysql.py
+++ b/src/benchmarks/mysql.py