X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=blobdiff_plain;f=bench.sh;h=a42fee7978acb35fe669ffed47f26806fcc91860;hp=852c1663fdb3176a1f0c7e5b4d33059a6c734511;hb=69779fd7948b7b286d28ef17ed5abd655a73c52e;hpb=c111347c69f21c5363938e598451571109ed9dbe

diff --git a/bench.sh b/bench.sh
index 852c166..a42fee7 100755
--- a/bench.sh
+++ b/bench.sh
@@ -1,23 +1,27 @@
 #!/bin/bash
 
 # A (work-in-progress) test script for running our benchmarks
+# Runs all tests, logging output to a directory named 'run-<date-time>'
 
 ## Unfinished benchmarks - do not use
 # queue williams-queue
 
-RUN="./run.sh"
-DATE="date +%Y-%m-%d-%R"
-
-${DATE}
+DATECMD="date +%Y-%m-%d-%R"
+DATE="`${DATECMD}`"
+DIR="run-${DATE}"
 
+TESTS="barrier/barrier mcs-lock/mcs-lock spsc-queue/spsc-queue mpmc-queue/mpmc-1r2w mpmc-queue/mpmc-2r1w mpmc-queue/mpmc-queue linuxrwlocks/linuxrwlocks"
+MODEL_ARGS="-f 4 -m 2"
 COUNT=0
 
 function run_test {
 	t=$1
 	shift
 	ARGS="$@"
+	RUN="./run.sh"
+	LOG=${DIR}/log-${COUNT}
+
 	echo "-----------------------------------------------"
-	LOG=log-${COUNT}
 	echo "*******************************"
 	echo "Running test ${COUNT} (${t}): logging to ${LOG}"
 	echo "ARGS=${ARGS}"
@@ -41,12 +45,17 @@ function run_test {
 	let COUNT++
 }
 
-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 1"
-for t in ${TESTS}
-do
-	run_test ${t} ${MODEL_ARGS}
-done
-#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 1
-#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 1 -w 2
-#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 2
+function run_all_tests {
+	echo ${DATE}
+
+	for t in ${TESTS}
+	do
+		run_test ${t} ${MODEL_ARGS}
+	done
+	#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 1
+	#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 1 -w 2
+	#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 2
+}
+
+mkdir ${DIR}
+(git log --oneline -1; echo; run_all_tests) | tee ${DIR}/timing.log