X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=bench.sh;h=195e72d25e2541877078223073d17223d200ea92;hb=4eab9d83c884ccc10963379c79ed5d80627ded23;hp=6f55ff586c67fcd09eccf5bcfe86cd2406245c67;hpb=ff4cd01eb602228cbd4091539c3f9754cb946dda;p=model-checker-benchmarks.git

diff --git a/bench.sh b/bench.sh
index 6f55ff5..195e72d 100755
--- a/bench.sh
+++ b/bench.sh
@@ -1,37 +1,31 @@
 #!/bin/bash
 
 # A (work-in-progress) test script for running our benchmarks
-# 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
+# Runs all tests, with timing information
 
 ## Unfinished benchmarks - do not use
 # queue williams-queue
 
 DATECMD="date +%Y-%m-%d-%R"
 DATE="`${DATECMD}`"
-BASEDIR=.
-
-[ $# -gt 0 ] && [ -d "$1" ] && BASEDIR="$1" && shift
-
-DIR="${BASEDIR}/run-${DATE}"
 
 TESTS="chase-lev-deque/main"
 TESTS+=" spsc-queue/spsc-queue"
 TESTS+=" spsc-bugfix/spsc-queue"
 TESTS+=" barrier/barrier"
+TESTS+=" dekker-fences/dekker-fences"
 TESTS+=" mcs-lock/mcs-lock"
-TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+TESTS+=" mpmc-queue/mpmc-queue-rdwr"
 TESTS+=" ms-queue/main"
 TESTS+=" linuxrwlocks/linuxrwlocks"
 
-#TESTS+=" dekker-fences/dekker-fences"
+MODEL_ARGS="-y -m 2 -u 3"
+
 #TESTS+=" mpmc-queue/mpmc-2r1w"
 #TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
 #TESTS+=" mpmc-queue/mpmc-queue-rdwr"
 #TESTS+=" mpmc-queue/mpmc-queue-noinit"
 
-MODEL_ARGS="-y -m 2"
 COUNT=0
 
 function run_test {
@@ -39,14 +33,13 @@ function run_test {
 	shift
 	ARGS="$@"
 	RUN="./run.sh"
-	LOG=${DIR}/log-${COUNT}
 
 	echo "-----------------------------------------------"
 	echo "*******************************"
-	echo "Running test ${COUNT} (${t}): logging to ${LOG}"
+	echo "Running test ${COUNT} (${t})"
 	echo "ARGS=${ARGS}"
 	echo "*******************************"
-	(time ${RUN} ${t} ${ARGS} 2>&1) 2>&1 | tee ${LOG}
+	(time ${RUN} ${t} ${ARGS} 2>&1) 2>&1
 	echo
 	echo "Test done; sleeping for a few seconds"
 	echo
@@ -66,5 +59,9 @@ function run_all_tests {
 	#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 2
 }
 
-mkdir ${DIR}
-(cd ..; git log --oneline -1; cd - > /dev/null; 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