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: don't automatically log to file
[model-checker-benchmarks.git]
/
bench.sh
diff --git
a/bench.sh
b/bench.sh
index c32924b8b68080a13ac39739d944a54e0571ac2d..195e72d25e2541877078223073d17223d200ea92 100755
(executable)
--- a/
bench.sh
+++ b/
bench.sh
@@
-1,32
+1,31
@@
#!/bin/bash
# A (work-in-progress) test script for running our benchmarks
#!/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}`"
## Unfinished benchmarks - do not use
# queue williams-queue
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+=" spsc-bugfix/spsc-queue"
TESTS+=" spsc-queue/spsc-queue"
TESTS+=" spsc-bugfix/spsc-queue"
+TESTS+=" barrier/barrier"
TESTS+=" dekker-fences/dekker-fences"
TESTS+=" dekker-fences/dekker-fences"
-TESTS+=" m
pmc-queue/mpmc-2r1w
"
-TESTS+=" mpmc-queue/mpmc-
1r2w-noinit
"
-TESTS+=" m
pmc-queue/mpmc-queue-noinit
"
+TESTS+=" m
cs-lock/mcs-lock
"
+TESTS+=" mpmc-queue/mpmc-
queue-rdwr
"
+TESTS+=" m
s-queue/main
"
TESTS+=" linuxrwlocks/linuxrwlocks"
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 {
COUNT=0
function run_test {
@@
-34,14
+33,13
@@
function run_test {
shift
ARGS="$@"
RUN="./run.sh"
shift
ARGS="$@"
RUN="./run.sh"
- LOG=${DIR}/log-${COUNT}
echo "-----------------------------------------------"
echo "*******************************"
echo "-----------------------------------------------"
echo "*******************************"
- echo "Running test ${COUNT} (${t})
: logging to ${LOG}
"
+ echo "Running test ${COUNT} (${t})"
echo "ARGS=${ARGS}"
echo "*******************************"
echo "ARGS=${ARGS}"
echo "*******************************"
- (time ${RUN} ${t} ${ARGS} 2>&1) 2>&1
| tee ${LOG}
+ (time ${RUN} ${t} ${ARGS} 2>&1) 2>&1
echo
echo "Test done; sleeping for a few seconds"
echo
echo
echo "Test done; sleeping for a few seconds"
echo
@@
-61,5
+59,9
@@
function run_all_tests {
#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 2
}
#run_test mpmc-queue/mpmc-queue ${MODEL_ARGS} -- -r 2 -w 2
}
-mkdir ${DIR}
-(cd ..; git log --oneline -1; cd - > /dev/null; 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