support for turning on/off detecting conflict optimizations

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 528c9782194cad53751a0313f52f8cb8b5602668..32311738476b235b808571ced9efdfc362976443 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -83,7 +83,7 @@ public class BuildCode {
       this.backuptable=new Hashtable<LocalityBinding, Hashtable<TempDescriptor, TempDescriptor>>();
       this.wb=new WriteBarrier(locality, st);
     }
-    if (state.SINGLETM) {
+    if (state.SINGLETM&&state.DCOPTS) {
       this.dc=new DiscoverConflicts(locality, st);
       dc.doAnalysis();
     }

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index 48e33c4c5098d7d63eeafbf5e7624dc664bc9725..7a56b5570d5752ac09ef74da5478ff8982394efd 100644 (file)
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -100,6 +100,7 @@ public class State {
   private int numtasks=0;
   private int arraycount=0;
   public boolean OPTIMIZE=false;
+  public boolean DCOPTS=false;
 
 
   private Hashtable<ClassDescriptor, Hashtable<OptionalTaskDescriptor, OptionalTaskDescriptor>> optionaltaskdescriptors;

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index cb8bf768501a1bda095d1cabb30f4c949a924c5f..743d309c7fdc6043202920daba4184855ad32b66 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -133,6 +133,8 @@ public class Main {
        state.OPTIONAL=true;
       else if (option.equals("-optimize"))
        state.OPTIMIZE=true;
+      else if (option.equals("-dcopts"))
+       state.DCOPTS=true;
       else if (option.equals("-raw"))
        state.RAW=true;
       else if (option.equals("-scheduling"))

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index aed6fc0cda395b844f6c2833151ea2548b3520cb..2a016acdba145a031273ab95dcf201e845e66b77 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -11,6 +11,8 @@ echo -mac distributed shared memory mac support
 echo -check generate check code
 echo -dmalloc link in dmalloc
 echo -64bit compile for 64 bit machine
+echo -joptimize java compiler optimizations
+echo -dcopts conflict optimizations for transactional memory
 echo -recover compile task code
 echo -fastcheck fast checkpointing for Bristlecone
 echo -specdir directory
@@ -234,15 +236,15 @@ JAVAOPTS="$JAVAOPTS -instructionfailures"
 elif [[ $1 = '-joptimize' ]]
 then
 JAVAOPTS="$JAVAOPTS -optimize"
-
+elif [[ $1 = '-dcopts' ]]
+then
+JAVAOPTS="$JAVAOPTS -dcopts"
 elif [[ $1 = '-mlp' ]]
 then
 JAVAOPTS="$JAVAOPTS -mlp"
-
 elif [[ $1 = '-mlpdebug' ]]
 then
 JAVAOPTS="$JAVAOPTS -mlpdebug"
-
 elif [[ $1 = '-check' ]]
 then
 CHECKFLAG=true