1) allow to set the maximum threshold for the liveness analysis. if threashold is...

[IRC.git] / Robust / src / Analysis / Loops / CopyPropagation.java

diff --git a/Robust/src/Analysis/Loops/CopyPropagation.java b/Robust/src/Analysis/Loops/CopyPropagation.java
index 71c9e7ca96a472a60645dd5113b1030b790bea51..06cff5da07b7493018ff154e28c87b98d9cfd17e 100644 (file)
--- a/Robust/src/Analysis/Loops/CopyPropagation.java
+++ b/Robust/src/Analysis/Loops/CopyPropagation.java
@@ -6,6 +6,7 @@ import java.util.Hashtable;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Map;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Map;

+import Analysis.Liveness;

 
 public class CopyPropagation {
   public CopyPropagation() {
 
 public class CopyPropagation {
   public CopyPropagation() {


@@ -17,105 +18,117 @@ public class CopyPropagation {
     boolean changed=false;
     TempDescriptor bogustd=new TempDescriptor("bogus");
     do {
     boolean changed=false;
     TempDescriptor bogustd=new TempDescriptor("bogus");
     do {

+      Hashtable<FlatNode, Set<TempDescriptor>> livetemps=Liveness.computeLiveTemps(fm,1000);
+      if(livetemps==null){
+        System.out.println("Skipping CopyPropagation of "+fm.getMethod()+" due to size.");
+        return;
+      }

       changed=false;
       HashSet tovisit=new HashSet();
       tovisit.add(fm);
       while(!tovisit.isEmpty()) {
       changed=false;
       HashSet tovisit=new HashSet();
       tovisit.add(fm);
       while(!tovisit.isEmpty()) {

-       FlatNode fn=(FlatNode) tovisit.iterator().next();
-       tovisit.remove(fn);
+        FlatNode fn=(FlatNode) tovisit.iterator().next();
+        tovisit.remove(fn);
+        Hashtable<TempDescriptor, TempDescriptor> tab;
+        Set<TempDescriptor> liveset=livetemps.get(fn);

 
 

-       Hashtable<TempDescriptor, TempDescriptor> tab;
-       if (fn.numPrev()>=1&&table.containsKey(fn.getPrev(0)))
-         tab=new Hashtable<TempDescriptor, TempDescriptor>(table.get(fn.getPrev(0)));
-       else
-         tab=new Hashtable<TempDescriptor, TempDescriptor>();
-       //Compute intersection
+        if (fn.numPrev()>=1&&table.containsKey(fn.getPrev(0))) {
+          tab=new Hashtable<TempDescriptor, TempDescriptor>();
+          for(Map.Entry<TempDescriptor, TempDescriptor> entry:table.get(fn.getPrev(0)).entrySet()) {
+              if (liveset.contains(entry.getKey())) {
+                  tab.put(entry.getKey(), entry.getValue());
+              }
+          }
+        } else
+          tab=new Hashtable<TempDescriptor, TempDescriptor>();
+        //Compute intersection

 
 

-       for(int i=1;i<fn.numPrev();i++) {
-         Hashtable<TempDescriptor, TempDescriptor> tp=table.get(fn.getPrev(i));
-         if (tp==null)
-           continue;
-         for(Iterator tmpit=tp.entrySet().iterator();tmpit.hasNext();) {
-           Map.Entry t=(Map.Entry)tmpit.next();
-           TempDescriptor tmp=(TempDescriptor)t.getKey();
-           
-           if (!tab.containsKey(tmp))
-             tab.put(tmp, tp.get(tmp));
-           else if (tab.get(tmp)!=tp.get(tmp)) {
-             tab.put(tmp, bogustd);
-           }
-         }
-       }
+        for(int i=1; i<fn.numPrev(); i++) {
+          Hashtable<TempDescriptor, TempDescriptor> tp=table.get(fn.getPrev(i));
+          if (tp==null)
+            continue;
+          for(Iterator tmpit=tp.entrySet().iterator(); tmpit.hasNext(); ) {
+            Map.Entry t=(Map.Entry)tmpit.next();
+            TempDescriptor tmp=(TempDescriptor)t.getKey();
+            if (!liveset.contains(tmp))
+              continue;
+            TempDescriptor dsttmp=tp.get(tmp);
+            if (!tab.containsKey(tmp)) {
+                tab.put(tmp, dsttmp);
+            } else if (tab.get(tmp)!=dsttmp) {
+              tab.put(tmp, bogustd);
+            }
+          }
+        }
+        
+        HashSet<TempDescriptor> toremove=new HashSet<TempDescriptor>();
+        TempDescriptor[] writes=fn.writesTemps();
+        for(int i=0; i<writes.length; i++) {
+          TempDescriptor tmp=writes[i];
+          toremove.add(tmp);
+          for(Iterator<TempDescriptor> tmpit=tab.keySet().iterator(); tmpit.hasNext(); ) {
+            TempDescriptor tmp2=tmpit.next();
+            if (tmp==tab.get(tmp2))
+              toremove.add(tmp2);
+          }
+        }

 
 

-       HashSet<TempDescriptor> toremove=new HashSet<TempDescriptor>();
-       TempDescriptor[]writes=fn.writesTemps();
-       for(int i=0;i<writes.length;i++) {
-         TempDescriptor tmp=writes[i];
-         toremove.add(tmp);
-         for(Iterator<TempDescriptor> tmpit=tab.keySet().iterator();tmpit.hasNext();) {        
-           TempDescriptor tmp2=tmpit.next();
-           if (tmp==tab.get(tmp2))
-             toremove.add(tmp2);
-         }
-       }
+        for(Iterator<TempDescriptor> tmpit=toremove.iterator(); tmpit.hasNext(); ) {
+          TempDescriptor tmp=tmpit.next();
+          tab.put(tmp, bogustd);
+        }

 
 

-       for(Iterator<TempDescriptor> tmpit=toremove.iterator();tmpit.hasNext();) {
-         TempDescriptor tmp=tmpit.next();
-         tab.put(tmp, bogustd);
-       }
-
-       if (fn.kind()==FKind.FlatOpNode) {
-         FlatOpNode fon=(FlatOpNode)fn;
-         if (fon.getOp().getOp()==Operation.ASSIGN) {
-           tab.put(fon.getDest(), fon.getLeft());
-         }
-       }
-       if (!table.containsKey(fn)||!table.get(fn).equals(tab)) {
-         table.put(fn,tab);
-         changed=true;
-         for(int i=0;i<fn.numNext();i++) {
-           FlatNode nnext=fn.getNext(i);
-           tovisit.add(nnext);
-         }
-       }
+        if (fn.kind()==FKind.FlatOpNode) {
+          FlatOpNode fon=(FlatOpNode)fn;
+          if (fon.getOp().getOp()==Operation.ASSIGN) {
+            tab.put(fon.getDest(), fon.getLeft());
+          }
+        }
+        if (!table.containsKey(fn)||!table.get(fn).equals(tab)) {
+          table.put(fn,tab);
+          changed=true;
+          for(int i=0; i<fn.numNext(); i++) {
+            FlatNode nnext=fn.getNext(i);
+            tovisit.add(nnext);
+          }
+        }

       } //end of dataflow while loop
 
       Set<FlatNode> nodeset=fm.getNodeSet();
 
       } //end of dataflow while loop
 
       Set<FlatNode> nodeset=fm.getNodeSet();
 

-      for(Iterator<FlatNode> it=fm.getNodeSet().iterator();it.hasNext();) {
-       FlatNode fn=it.next();
-       if (fn.numPrev()==0)
-         continue;
+      for(Iterator<FlatNode> it=fm.getNodeSet().iterator(); it.hasNext(); ) {
+        FlatNode fn=it.next();
+        if (fn.numPrev()==0)
+          continue;
+
+        Hashtable<TempDescriptor, TempDescriptor> tab=new Hashtable<TempDescriptor, TempDescriptor>();

 
 

-       Hashtable<TempDescriptor, TempDescriptor> tab=new Hashtable<TempDescriptor, TempDescriptor>();
-       
-       for(int i=0;i<fn.numPrev();i++) {
-         Hashtable<TempDescriptor, TempDescriptor> tp=table.get(fn.getPrev(i));
+        for(int i=0; i<fn.numPrev(); i++) {
+          Hashtable<TempDescriptor, TempDescriptor> tp=table.get(fn.getPrev(i));
+          for(Iterator tmpit=tp.entrySet().iterator(); tmpit.hasNext(); ) {
+            Map.Entry t=(Map.Entry)tmpit.next();
+            TempDescriptor tmp=(TempDescriptor)t.getKey();

 
 

-         for(Iterator tmpit=tp.entrySet().iterator();tmpit.hasNext();) {
-           Map.Entry t=(Map.Entry)tmpit.next();
-           TempDescriptor tmp=(TempDescriptor)t.getKey();
-           
-           if (!tab.containsKey(tmp))
-             tab.put(tmp, tp.get(tmp));
-           else if (tab.get(tmp)!=tp.get(tmp)) {
-             tab.put(tmp, bogustd);
-           }
-         }
-       }
+            if (!tab.containsKey(tmp))
+              tab.put(tmp, tp.get(tmp));
+            else if (tab.get(tmp)!=tp.get(tmp)) {
+              tab.put(tmp, bogustd);
+            }
+          }
+        }

 
 

-       TempMap tmap=null;
-       TempDescriptor[]reads=fn.readsTemps();
-       for(int i=0;i<reads.length;i++) {
-         TempDescriptor tmp=reads[i];
-         if (tab.containsKey(tmp)&&tab.get(tmp)!=bogustd) {
-           if (tmap==null)
-             tmap=new TempMap();
-           tmap.addPair(tmp, tab.get(tmp));
-         }
-       }
-       if (tmap!=null)
-         fn.rewriteUse(tmap);
+        TempMap tmap=null;
+        TempDescriptor[] reads=fn.readsTemps();
+        for(int i=0; i<reads.length; i++) {
+          TempDescriptor tmp=reads[i];
+          if (tab.containsKey(tmp)&&tab.get(tmp)!=bogustd) {
+            if (tmap==null)
+              tmap=new TempMap();
+            tmap.addPair(tmp, tab.get(tmp));
+          }
+        }
+        if (tmap!=null)
+          fn.rewriteUse(tmap);

       } //end of remapping for loop
     } while(changed);
   }
       } //end of remapping for loop
     } while(changed);
   }