changes

diff --git a/Robust/src/Benchmarks/SingleTM/common/Makefile.builds b/Robust/src/Benchmarks/SingleTM/common/Makefile.builds
index 872ead19d3f6d36f2e04d3293b9865f2b4b8a38f..c296ff414dde08ef2093b36564f6117b36e4b450 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/common/Makefile.builds
+++ b/Robust/src/Benchmarks/SingleTM/common/Makefile.builds
@@ -1,9 +1,26 @@
-default: prep
-#      ../../../buildscript ${FLAGSLOCKNOJ} -o LOCKNOJ${MAINCLASS} ${SRC}
-#      ../../../buildscript ${FLAGSSTMNOJ} -o STMNOJ${MAINCLASS} ${SRC}
-#      ../../../buildscript ${FLAGSLOCK} -o LOCK${MAINCLASS} ${SRC}
+default: lock basestm lockjopt stmjopt stmopt fission
+
+lock: prep
+       ../../../buildscript ${FLAGSLOCKNOJ} -o LOCKNOJ${MAINCLASS} ${SRC}
+
+basestm: prep
+       ../../../buildscript ${FLAGSSTMNOJ} -o STMNOJ${MAINCLASS} ${SRC}
+
+lockjopt: prep
+       ../../../buildscript ${FLAGSLOCK} -o LOCK${MAINCLASS} ${SRC}
+
+stmjopt: prep
        ../../../buildscript ${FLAGSSTM} -o STM${MAINCLASS} ${SRC}
+
+stmopt: prep
        ../../../buildscript ${FLAGSOPTSTM} -o OPTSTM${MAINCLASS} ${SRC}
+
+fission: prep
        ../../../buildscript ${FLAGSFISSION} -o FIS${MAINCLASS} ${SRC}
-#      ../../../buildscript ${FLAGSSTATS} -o STATS${MAINCLASS} ${SRC}
+
+debug: prep
+       ../../../buildscript ${FLAGSDEBUG} -o DEB${MAINCLASS} ${SRC}
+
+stats: prep
+       ../../../buildscript ${FLAGSSTATS} -o STATS${MAINCLASS} ${SRC}
 

diff --git a/Robust/src/Benchmarks/SingleTM/common/Makefile.flags b/Robust/src/Benchmarks/SingleTM/common/Makefile.flags
index fce339a7fe26905b8593727a8363a4fb7a627064..a46856e2716eb15dd91feb8600fa3be638cfd451 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/common/Makefile.flags
+++ b/Robust/src/Benchmarks/SingleTM/common/Makefile.flags
@@ -2,6 +2,7 @@ FLAGSLOCK=-mainclass ${MAINCLASS} -thread -optimize -abcclose -64bit -debug -jop
 FLAGSLOCKNOJ=-mainclass ${MAINCLASS} -thread -optimize -abcclose -64bit -debug -arraypad
 FLAGSSTMNOJ=-mainclass ${MAINCLASS} -singleTM -optimize -64bit -debug -abcclose -transstats -arraypad
 FLAGSSTM=-mainclass ${MAINCLASS} -singleTM -optimize -joptimize -64bit -debug -abcclose -transstats -arraypad
-FLAGSOPTSTM=-mainclass ${MAINCLASS} -singleTM -optimize -joptimize -64bit -debug -abcclose -dcopts -transstats -arraypad
-FLAGSFISSION=-mainclass ${MAINCLASS} -singleTM -delaycomp -optimize -joptimize -abcclose -64bit -debug -transstats -inlineatomic 2 -minimize -readset -arraypad
+FLAGSOPTSTM=-mainclass ${MAINCLASS} -singleTM -optimize -joptimize -64bit -debug -abcclose -dcopts -transstats -arraypad -sandbox
+FLAGSFISSION=-mainclass ${MAINCLASS} -singleTM -delaycomp -optimize -joptimize -abcclose -64bit -debug -transstats -inlineatomic 2 -minimize -readset -arraypad -sandbox
 FLAGSSTATS=-mainclass ${MAINCLASS} -singleTM -optimize -debug -joptimize -64bit -abcclose -dcopts -transstats -arraypad -stmstats
+FLAGSDEBUG=-mainclass ${MAINCLASS} -singleTM -delaycomp -nooptimize -joptimize -abcclose -64bit -debug -transstats -inlineatomic 2 -minimize -readset -arraypad -stmarray -profile -sandbox