From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 15 Mar 2013 23:35:51 +0000 (-0700)
Subject: Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks
X-Git-Tag: oopsla2013-final~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=commitdiff_plain;h=eb1ce023cf7eadae53e3abefddc561da3f965600;hp=fb9a61229a1a5d954c04c303d1860d3cd8b65d23

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 4bce97e..a778416 100755
--- 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 f4a7135..4b20d5b 100644
--- 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