projects
/
model-checker-benchmarks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bench.sh: fixup Brian D.'s script change
[model-checker-benchmarks.git]
/
bench.sh
diff --git
a/bench.sh
b/bench.sh
index 71fff6567935bde2732ee29b9ecc3af2aea032b5..f7c5cdb7dc0579c20a2ebeaf2770506ce18957c7 100755
(executable)
--- a/
bench.sh
+++ b/
bench.sh
@@
-16,16
+16,23
@@
BASEDIR=.
DIR="${BASEDIR}/run-${DATE}"
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+=" 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+=" barrier/barrier"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" mpmc-queue/mpmc-queue-rdwr"
+TESTS+=" ms-queue/main"
TESTS+=" linuxrwlocks/linuxrwlocks"
TESTS+=" linuxrwlocks/linuxrwlocks"
-MODEL_ARGS="-f 10 -m 2 -e 1"
+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"
+
COUNT=0
function run_test {
COUNT=0
function run_test {
@@
-40,7
+47,7
@@
function run_test {
echo "Running test ${COUNT} (${t}): logging to ${LOG}"
echo "ARGS=${ARGS}"
echo "*******************************"
echo "Running test ${COUNT} (${t}): logging to ${LOG}"
echo "ARGS=${ARGS}"
echo "*******************************"
-
time ${RUN} ${t} ${ARGS}
2>&1 | tee ${LOG}
+
(time ${RUN} ${t} ${ARGS} 2>&1)
2>&1 | tee ${LOG}
echo
echo "Test done; sleeping for a few seconds"
echo
echo
echo "Test done; sleeping for a few seconds"
echo
@@
-61,4
+68,4
@@
function run_all_tests {
}
mkdir ${DIR}
}
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