From ac289415795f6d44f198bf5e11cbfc5e0d0e475d Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Fri, 2 Nov 2012 17:39:20 -0700
Subject: [PATCH] bench.sh: change max-reads=2, log to directory

Pass '-m 2' argument to the model-checker

bench.sh sends all logs to a date-named directory now
---
 bench.sh | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/bench.sh b/bench.sh
index 852c166..964cd28 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"
+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
-- 
2.34.1