Make the run more flexible

Moves some programs to be configurable via env vars, for easier customisation.

diff --git a/Makefile b/Makefile
index 75fdbfeee2bffb2475b252dc4c06d5bc202454a9..2c261bbf695171f1778c69e03f14012c30d4889f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,8 @@ EXTRA_RUN = /bin/true
 
 REPS = 100
 
+PERF ?= perf
+
 all: $(PROGS) java/Null.class
 
 $(PROGS): Makefile
@@ -94,7 +96,7 @@ log: $(PROGS) $(SCRIPTS) java/Null.class Makefile
        for prog in $(PROGS:%=./%) $(SCRIPTS:%=./%) $(EXTRA_RUN) $(JAVA_INVOCS); do \
          echo $$prog; \
          for metric in $(METRICS); do \
-           LC_ALL=C perf stat -e "$$metric" -r $(REPS) -o log --append $$prog; \
+           LC_ALL=C $(PERF) stat -e "$$metric" -r $(REPS) -o log --append $$prog; \
          done; \
        done
 

diff --git a/run.sh b/run.sh
index 9872d173b71d43200515d6d8d1dff43a400ed4fd..b2733dd59ef2bf5f4166bfb73c8c64007092b55d 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 
+CHRT=${CHRT:-chrt -r 5}
+TASKSET=${TASKSET:-taskset -c 0}
+
 # rebuild everything
 make clean
 make
 # preseed filesystem cache
 make log REPS=2
 # now do the real run
-chrt -r 5 taskset -c 0 make log REPS=500
+$CHRT $TASKSET make log REPS=500
 LC_ALL=en_US.UTF-8 awk -f dump.awk log