Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

[model-checker-benchmarks.git] / bench.sh

diff --git a/bench.sh b/bench.sh
index e74d5c37d3d723e69f8d68c179432a284f26a396..a778416c2ad457468c6f643c290ede7c29276a9e 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -16,16 +16,27 @@ BASEDIR=.
 
 DIR="${BASEDIR}/run-${DATE}"
 
-TESTS="barrier/barrier"
-TESTS+=" mcs-lock/mcs-lock"
+TESTS="chase-lev-deque/main"
 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+=" mpmc-queue/mpmc-queue-rdwr"
+TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+TESTS+=" barrier/barrier"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+TESTS+=" ms-queue/main"
 TESTS+=" linuxrwlocks/linuxrwlocks"
+TESTS+=" chase-lev-deque/main"
+TESTS+=" ms-queue/main"
+
+MODEL_ARGS="-y -m 2 -u 3"
+
+#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="-f 10 -m 2 -e 1"
 COUNT=0
 
 function run_test {
@@ -40,18 +51,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
@@ -72,4 +72,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