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

diff --git a/bench.sh b/bench.sh
index e7efc6d..4bce97e 100755
--- a/bench.sh
+++ b/bench.sh
@@ -20,12 +20,17 @@ TESTS="barrier/barrier"
 TESTS+=" mcs-lock/mcs-lock"
 TESTS+=" spsc-queue/spsc-queue"
 TESTS+=" spsc-bugfix/spsc-queue"
-TESTS+=" mpmc-queue/mpmc-2r1w"
-TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
-TESTS+=" mpmc-queue/mpmc-queue-noinit"
+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="-f 10 -m 2 -e 1"
+MODEL_ARGS="-y -m 2 -u 3"
 COUNT=0
 
 function run_test {
@@ -40,16 +45,7 @@ function run_test {
 	echo "Running test ${COUNT} (${t}): logging to ${LOG}"
 	echo "ARGS=${ARGS}"
 	echo "*******************************"
-	time ${RUN} ${t} ${ARGS} 2>&1 | tee ${LOG}
-	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
@@ -70,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