Benchmarks: Make sure we always build with the correct config

The current implementation of this is terrible, but seems to work.
This should probably be replaced with some compile-time defines.

4 files changed, 16 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index ada4b16..a473a20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,13 @@
 
 case-study:
+        sed -i "s/LITMUS 0/LITMUS 1/g" extra.h
         $(MAKE) -C baseline all
         $(MAKE) -C dis baseline
         $(MAKE) -C SD-VBS/benchmarks compile
 
+benchmarks:
+        sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
+        $(MAKE) -C baseline all
+        $(MAKE) -C all_pairs all
+        $(MAKE) -C dis pairs
+        $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
diff --git a/run_all_dis.sh b/run_all_dis.sh
index 588538d..3907789 100755
--- a/run_all_dis.sh
+++ b/run_all_dis.sh
@@ -16,6 +16,9 @@ if [[ "$EUID" != 0 ]]; then
 fi
 date
 
+# Configure libextra for benchmarking
+sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
+
 # Run the pairs baseline and some comparisons to examine the effect of less cache
 echo "Building benchmarks in unpaired configuration..."
 cd dis
diff --git a/run_all_sd-vbs.sh b/run_all_sd-vbs.sh
index 1f5948d..6be9c87 100755
--- a/run_all_sd-vbs.sh
+++ b/run_all_sd-vbs.sh
@@ -16,6 +16,9 @@ if [[ "$EUID" != 0 ]]; then
 fi
 date
 
+# Configure libextra for benchmarking
+sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
+
 # Run the pairs baseline and some comparisons to examine the effect of less cache
 echo "Building benchmarks in unpaired configuration..."
 cd SD-VBS/benchmarks
diff --git a/run_all_tacle.sh b/run_all_tacle.sh
index 51a9c24..4729ada 100755
--- a/run_all_tacle.sh
+++ b/run_all_tacle.sh
@@ -16,6 +16,9 @@ if [[ "$EUID" != 0 ]]; then
 fi
 date
 
+# Configure libextra for benchmarking
+sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
+
 # Run the pairs baseline and some comparisons to examine the effect of less cache
 cd baseline
 make all -j32