Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks
authorBrian Demsky <bdemsky@uci.edu>
Fri, 15 Mar 2013 23:35:51 +0000 (16:35 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Fri, 15 Mar 2013 23:35:51 +0000 (16:35 -0700)
Conflicts:
bench.sh

1  2 
bench.sh

diff --cc bench.sh
+++ b/bench.sh
@@@ -16,21 -16,22 +16,27 @@@ BASEDIR=
  
  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+=" 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-rdwr-noinit"
- #TESTS+=" mpmc-queue/mpmc-queue-noinit"
+ TESTS+=" barrier/barrier"
+ TESTS+=" mcs-lock/mcs-lock"
+ TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+ TESTS+=" ms-queue/main"
  TESTS+=" linuxrwlocks/linuxrwlocks"
 -MODEL_ARGS="-y -m 2"
 +TESTS+=" chase-lev-deque/main"
 +TESTS+=" ms-queue/main"
 +
 +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 {