From: bdemsky <bdemsky>
Date: Tue, 25 Sep 2007 00:11:33 +0000 (+0000)
Subject:  prefetch changes
X-Git-Tag: preEdgeChange~418
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=42bfdc44b947bf4aac4773d9448d24ca279d30f1;p=IRC.git

 prefetch changes
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index a3c00332..3d97da60 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -405,12 +405,8 @@ public class BuildCode {
 	    outclassdefs.println("  int flag;");
 	    outclassdefs.println("  void * flagptr;");
 	    if(state.OPTIONAL){
-		outclassdefs.println("  int failedstatus;");
-		outclassdefs.println("  int hashcode;");
 		outclassdefs.println("  int numexitfses;");
 		outclassdefs.println("  int * exitfses;");
-		outclassdefs.println("  int numotds;");
-		outclassdefs.println("  struct optionaltaskdescriptor ** otds;");
 	    }
 	}
 	printClassStruct(typeutil.getClass(TypeUtil.ObjectClass), outclassdefs);
diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index 9df0cc32..8fb9d969 100644
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -43,6 +43,7 @@ public class State {
     public boolean WEBINTERFACE=false;
     public boolean TASK=false;
     public boolean DSM=false;
+    public boolean PREFETCH=false;
     public boolean TASKSTATE=false;
     public boolean OPTIONAL=false;
     public boolean THREAD=false;
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 3a371b05..126d21a5 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -19,6 +19,7 @@ import Analysis.TaskStateAnalysis.ExecutionGraph;
 import Analysis.TaskStateAnalysis.SafetyAnalysis;
 import Analysis.Locality.LocalityAnalysis;
 import Analysis.Locality.GenerateConversions;
+import Analysis.Prefetch.PrefetchAnalysis;
 import Interface.*;
 
 public class Main {
@@ -33,6 +34,8 @@ public class Main {
 	  String option=args[i];
 	  if (option.equals("-precise"))
 	      IR.Flat.BuildCode.GENERATEPRECISEGC=true;
+	  else if (option.equals("-prefetch"))
+	      state.PREFETCH=true;
 	  else if (option.equals("-dir"))
 	      IR.Flat.BuildCode.PREFIX=args[++i]+"/";
 	  else if (option.equals("-classlibrary"))
@@ -158,6 +161,9 @@ public class Main {
 
       if (state.DSM) {
 	  CallGraph callgraph=new CallGraph(state);
+	  if (state.PREFETCH) {
+	      PrefetchAnalysis pa=new PrefetchAnalysis(state, callgraph, tu);
+	  }
 	  LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
 	  GenerateConversions gc=new GenerateConversions(la, state);
 	  BuildCode bc=new BuildCode(state, bf.getMap(), tu, la);