ms-queue: remove more externs and unintended shared data

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

diff --git a/bench.sh b/bench.sh
index e74d5c37d3d723e69f8d68c179432a284f26a396..c32924b8b68080a13ac39739d944a54e0571ac2d 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -20,6 +20,7 @@ TESTS="barrier/barrier"
 TESTS+=" mcs-lock/mcs-lock"
 TESTS+=" spsc-queue/spsc-queue"
 TESTS+=" spsc-bugfix/spsc-queue"
+TESTS+=" dekker-fences/dekker-fences"
 TESTS+=" mpmc-queue/mpmc-2r1w"
 TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
 TESTS+=" mpmc-queue/mpmc-queue-noinit"
@@ -40,18 +41,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 +62,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