bench.sh: don't automatically log to file

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

diff --git a/bench.sh b/bench.sh
index 8886bccaf385f502c22a2d3ee904744d730a1000..195e72d25e2541877078223073d17223d200ea92 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -1,23 +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
+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-queue-rdwr"
+TESTS+=" ms-queue/main"
+TESTS+=" linuxrwlocks/linuxrwlocks"
 
-DIR="${BASEDIR}/run-${DATE}"
+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"
 
-TESTS="barrier/barrier mcs-lock/mcs-lock spsc-queue/spsc-queue mpmc-queue/mpmc-1r2w mpmc-queue/mpmc-2r1w mpmc-queue/mpmc-queue linuxrwlocks/linuxrwlocks"
-MODEL_ARGS="-f 4 -m 2"
 COUNT=0
 
 function run_test {
@@ -25,25 +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} > ${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
@@ -63,5 +59,9 @@ 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
+cd ..
+git log --oneline -1
+cd - > /dev/null
+git log --oneline -1
+echo
+run_all_tests