X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=bench.sh;h=4bce97ebd2c735d0dbcd9750c8881dab39a27c2e;hb=fb9a61229a1a5d954c04c303d1860d3cd8b65d23;hp=964cd28ee5c23e5d5ecda95dfcc15b1590c8e10b;hpb=ac289415795f6d44f198bf5e11cbfc5e0d0e475d;p=model-checker-benchmarks.git

diff --git a/bench.sh b/bench.sh
index 964cd28..4bce97e 100755
--- a/bench.sh
+++ b/bench.sh
@@ -1,17 +1,36 @@
 #!/bin/bash
 
 # A (work-in-progress) test script for running our benchmarks
-# Runs all tests, logging output to a directory named 'run-<date-time>'
+# Runs all tests, logging output to a directory named
+# '${BASEDIR}/run-<date-time>', where ${BASEDIR} is either the current
+# directory or the first parameter to this script
 
 ## Unfinished benchmarks - do not use
 # queue williams-queue
 
 DATECMD="date +%Y-%m-%d-%R"
 DATE="`${DATECMD}`"
-DIR="run-${DATE}"
+BASEDIR=.
 
-TESTS="barrier/barrier mcs-lock/mcs-lock spsc-queue/spsc-queue mpmc-queue/mpmc-1r2w mpmc-queue/mpmc-2r1w mpmc-queue/mpmc-queue"
-MODEL_ARGS="-f 4 -m 2"
+[ $# -gt 0 ] && [ -d "$1" ] && BASEDIR="$1" && shift
+
+DIR="${BASEDIR}/run-${DATE}"
+
+TESTS="barrier/barrier"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" spsc-queue/spsc-queue"
+TESTS+=" spsc-bugfix/spsc-queue"
+TESTS+=" dekker-fences/dekker-fences"
+#TESTS+=" mpmc-queue/mpmc-2r1w"
+#TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
+TESTS+=" mpmc-queue/mpmc-queue-rdwr"
+TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+#TESTS+=" mpmc-queue/mpmc-queue-noinit"
+TESTS+=" linuxrwlocks/linuxrwlocks"
+TESTS+=" chase-lev-deque/main"
+TESTS+=" ms-queue/main"
+
+MODEL_ARGS="-y -m 2 -u 3"
 COUNT=0
 
 function run_test {
@@ -26,18 +45,7 @@ function run_test {
 	echo "Running test ${COUNT} (${t}): logging to ${LOG}"
 	echo "ARGS=${ARGS}"
 	echo "*******************************"
-	time ${RUN} ${t} ${ARGS} > ${LOG} 2>&1
-	echo
-	grep -A 2 "Number of executions" ${LOG} | tail -3
-	echo
-	echo "Test done; sleeping for a few seconds"
-	echo
-	sleep 3
-
-	echo "*******************************"
-	echo "Re-running test for timing data"
-	echo "*******************************"
-	time ${RUN} ${t} ${ARGS} > /dev/null 2>&1
+	(time ${RUN} ${t} ${ARGS} 2>&1) 2>&1 | tee ${LOG}
 	echo
 	echo "Test done; sleeping for a few seconds"
 	echo
@@ -58,4 +66,4 @@ function run_all_tests {
 }
 
 mkdir ${DIR}
-(git log --oneline -1; echo; run_all_tests) | tee ${DIR}/timing.log
+(cd ..; git log --oneline -1; cd - > /dev/null; git log --oneline -1; echo; run_all_tests) | tee ${DIR}/timing.log