fix a bug for Taint similar to ReachState, when either is an element of an ExistPred...

[IRC.git] / Robust / src / Analysis / Liveness.java

diff --git a/Robust/src/Analysis/Liveness.java b/Robust/src/Analysis/Liveness.java
index 6fe3a671839072246c222ed932d04fce3d2a029c..1374b24e14c265e91f5b86cfc711a58622a6dfd4 100644 (file)
--- a/Robust/src/Analysis/Liveness.java
+++ b/Robust/src/Analysis/Liveness.java
@@ -4,14 +4,19 @@ import IR.Flat.*;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Hashtable;
+import Analysis.Locality.*;
 
 public class Liveness {
   /* This methods takes in a FlatMethod and returns a map from a
-   * FlatNode to the set of live temps for that FlatNode.*/
+   * FlatNode to the set of temps that are live into the FlatNode.*/
 
-  public static Hashtable<FlatNode, Set<TempDescriptor>> computeLiveTemps(FlatMethod fm) {
+  public static Hashtable<FlatNode, Set<TempDescriptor>> computeLiveTemps(FlatMethod fm, int threshold) {
+    return computeLiveTemps(fm, null, threshold);
+  }
+  public static Hashtable<FlatNode, Set<TempDescriptor>> computeLiveTemps(FlatMethod fm, LocalityBinding lb, int threshold) {
     Hashtable<FlatNode, Set<TempDescriptor>> nodetotemps=new Hashtable<FlatNode, Set<TempDescriptor>>();
     
     Set<FlatNode> toprocess=fm.getNodeSet();
@@ -29,11 +34,17 @@ public class Liveness {
        if (nodetotemps.containsKey(fnnext))
          tempset.addAll(nodetotemps.get(fnnext));
       }
-      tempset.removeAll(writes);
-      tempset.addAll(reads);
+      if ((lb==null)||(!(fn instanceof FlatGlobalConvNode))||
+         ((FlatGlobalConvNode)fn).getLocality()==lb) {
+       tempset.removeAll(writes);
+       tempset.addAll(reads);
+      }
       if (!nodetotemps.containsKey(fn)||
           !nodetotemps.get(fn).equals(tempset)) {
        nodetotemps.put(fn, tempset);
+       if(threshold!=-1 && nodetotemps.size()>threshold){
+         return null;
+       }
        for(int i=0; i<fn.numPrev(); i++)
          toprocess.add(fn.getPrev(i));
       }
@@ -41,4 +52,47 @@ public class Liveness {
     return nodetotemps;
   }
   
+  public static Hashtable<FlatNode, Set<TempDescriptor>> computeLiveOut(FlatMethod fm) {
+    return computeLiveOut(fm, null);
+  }
+
+  public static Hashtable<FlatNode, Set<TempDescriptor>> computeLiveOut(FlatMethod fm, LocalityBinding lb) {
+    Hashtable<FlatNode, Set<TempDescriptor>> liveinmap=computeLiveTemps(fm, lb,-1);
+    Hashtable<FlatNode, Set<TempDescriptor>> liveoutmap=new Hashtable<FlatNode, Set<TempDescriptor>>();
+    
+    for(Iterator<FlatNode> fnit=fm.getNodeSet().iterator(); fnit.hasNext();) {
+      FlatNode fn=fnit.next();
+      liveoutmap.put(fn, new HashSet<TempDescriptor>());
+      for(int i=0;i<fn.numNext();i++) {
+       FlatNode fn2=fn.getNext(i);
+       liveoutmap.get(fn).addAll(liveinmap.get(fn2));
+      }
+    }
+    return liveoutmap;
+  }
+
+
+  // Also allow an instantiation of this object that memoizes results
+  protected Hashtable< FlatMethod, Hashtable< FlatNode, Set<TempDescriptor> > > fm2liveMap;
+
+  protected Hashtable< FlatMethod, Hashtable< FlatNode, Set<TempDescriptor> > > fm2liveOutMap;
+
+  public Liveness() {
+    fm2liveMap = new Hashtable< FlatMethod, Hashtable< FlatNode, Set<TempDescriptor> > >();
+    fm2liveOutMap = new Hashtable< FlatMethod, Hashtable< FlatNode, Set<TempDescriptor> > >();
+  }
+
+  public Set<TempDescriptor> getLiveOutTemps( FlatMethod fm, FlatNode fn ) {
+    if( !fm2liveOutMap.containsKey( fm ) ) {
+      fm2liveOutMap.put( fm, Liveness.computeLiveOut( fm ) );
+    }
+    return fm2liveOutMap.get( fm ).get( fn );
+  }
+
+  public Set<TempDescriptor> getLiveInTemps( FlatMethod fm, FlatNode fn ) {
+    if( !fm2liveMap.containsKey( fm ) ) {
+      fm2liveMap.put( fm, Liveness.computeLiveTemps( fm,-1 ) );
+    }
+    return fm2liveMap.get( fm ).get( fn );
+  }
 }
\ No newline at end of file