Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

Conflicts:
	bench.sh

diff --git a/bench.sh b/bench.sh
index 4bce97ebd2c735d0dbcd9750c8881dab39a27c2e..a778416c2ad457468c6f643c290ede7c29276a9e 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -16,21 +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"
 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 {

diff --git a/mpmc-queue/.gitignore b/mpmc-queue/.gitignore
index f4a7135b57cb17f60878a990e510bd8dbcb572ec..4b20d5b3f3dd9a00447a6d046c26d73aa4e70e1c 100644 (file)
--- a/mpmc-queue/.gitignore
+++ b/mpmc-queue/.gitignore
@@ -4,3 +4,5 @@
 /mpmc-queue-noinit
 /mpmc-1r2w-noinit
 /mpmc-2r1w-noinit
+/mpmc-queue-rdwr
+/mpmc-rdwr-noinit