From 61d0f76257f30866bcbe843d65054c19ade21d55 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Mon, 13 Apr 2009 20:37:31 +0000
Subject: [PATCH] support for turning on/off detecting conflict optimizations

---
 Robust/src/IR/Flat/BuildCode.java | 2 +-
 Robust/src/IR/State.java          | 1 +
 Robust/src/Main/Main.java         | 2 ++
 Robust/src/buildscript            | 8 +++++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 528c9782..32311738 100644
--- 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 48e33c4c..7a56b557 100644
--- 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 cb8bf768..743d309c 100644
--- 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 aed6fc0c..2a016acd 100755
--- 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
-- 
2.34.1