changes

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

diff --git a/bench.sh b/bench.sh
index 3ccec5479e9e57f4d51c8b75de7fcdffe05e3282..7c9eec856f0b3158cc5997422ba9c7d56479aa98 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -1,30 +1,28 @@
 #!/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
-
-## Unfinished benchmarks - do not use
-# queue williams-queue
+# Runs all tests, with timing information
 
 DATECMD="date +%Y-%m-%d-%R"
 DATE="`${DATECMD}`"
-BASEDIR=.
-
-[ $# -gt 0 ] && [ -d "$1" ] && BASEDIR="$1" && shift
 
-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+=" dekker-fences/dekker-fences"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" mpmc-queue/mpmc-queue-rdwr"
+TESTS+=" ms-queue/main"
 TESTS+=" linuxrwlocks/linuxrwlocks"
 
-MODEL_ARGS="-f 10 -m 2 -e 1"
+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"
+
 COUNT=0
 
 function run_test {
@@ -32,25 +30,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} > ${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
        echo
        echo "Test done; sleeping for a few seconds"
        echo
@@ -70,5 +56,16 @@ function run_all_tests {
        #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
+# Check if git is available, and this is a git repository
+GIT=0
+which git &> /dev/null && git rev-parse &> /dev/null && GIT=1
+
+# Print out some git information, if available
+if [ ${GIT} -ne 0 ]; then
+       cd ..
+       git log --oneline -1
+       cd - > /dev/null
+       git log --oneline -1
+       echo
+fi
+run_all_tests