X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=blobdiff_plain;f=bench.sh;h=6f55ff586c67fcd09eccf5bcfe86cd2406245c67;hp=3ccec5479e9e57f4d51c8b75de7fcdffe05e3282;hb=ff4cd01eb602228cbd4091539c3f9754cb946dda;hpb=449c04945deadfe6706a4aec44dfcd0fd1d0e1f1

diff --git a/bench.sh b/bench.sh
index 3ccec54..6f55ff5 100755
--- a/bench.sh
+++ b/bench.sh
@@ -16,15 +16,22 @@ BASEDIR=.
 
 DIR="${BASEDIR}/run-${DATE}"
 
-TESTS="barrier/barrier"
-TESTS+=" mcs-lock/mcs-lock"
+TESTS="chase-lev-deque/main"
 TESTS+=" spsc-queue/spsc-queue"
-TESTS+=" mpmc-queue/mpmc-2r1w"
-TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
-TESTS+=" mpmc-queue/mpmc-queue-noinit"
+TESTS+=" spsc-bugfix/spsc-queue"
+TESTS+=" barrier/barrier"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+TESTS+=" ms-queue/main"
 TESTS+=" linuxrwlocks/linuxrwlocks"
 
-MODEL_ARGS="-f 10 -m 2 -e 1"
+#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-queue-noinit"
+
+MODEL_ARGS="-y -m 2"
 COUNT=0
 
 function run_test {
@@ -39,18 +46,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) 2>&1
+	(time ${RUN} ${t} ${ARGS} 2>&1) 2>&1 | tee ${LOG}
 	echo
 	echo "Test done; sleeping for a few seconds"
 	echo
@@ -71,4 +67,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