From f5d91cf7e8345f4d4cd4747acfedbf6af80339b7 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Fri, 26 Jun 2009 19:39:08 +0000
Subject: [PATCH] lots of bug fixes

---
 Robust/src/Analysis/Liveness.java              |  2 +-
 .../Analysis/Locality/DelayComputation.java    | 13 +++++++++----
 Robust/src/Analysis/ReachingDefs.java          |  6 +++++-
 Robust/src/IR/Flat/FlatGlobalConvNode.java     |  5 ++++-
 Robust/src/IR/Flat/FlatMethod.java             | 18 ++++++++++++++++++
 Robust/src/IR/Flat/FlatNode.java               |  6 ++++--
 Robust/src/IR/Flat/TempDescriptor.java         |  7 +++++++
 Robust/src/Runtime/STM/stmlookup.c             |  2 ++
 8 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/Robust/src/Analysis/Liveness.java b/Robust/src/Analysis/Liveness.java
index 6fe3a671..5e9c7d99 100644
--- a/Robust/src/Analysis/Liveness.java
+++ b/Robust/src/Analysis/Liveness.java
@@ -9,7 +9,7 @@ import java.util.Hashtable;
 
 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) {
     Hashtable<FlatNode, Set<TempDescriptor>> nodetotemps=new Hashtable<FlatNode, Set<TempDescriptor>>();
diff --git a/Robust/src/Analysis/Locality/DelayComputation.java b/Robust/src/Analysis/Locality/DelayComputation.java
index 5e0ffd1d..93b0489b 100644
--- a/Robust/src/Analysis/Locality/DelayComputation.java
+++ b/Robust/src/Analysis/Locality/DelayComputation.java
@@ -102,7 +102,8 @@ public class DelayComputation {
     secondpart.retainAll(atomicnodes);
 
     Set<TempDescriptor> liveinto=new HashSet<TempDescriptor>();
-    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm);
+    
+    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm, Liveness.computeLiveTemps(fm));
     
     for(Iterator<FlatNode> fnit=secondpart.iterator();fnit.hasNext();) {
       FlatNode fn=fnit.next();
@@ -131,8 +132,8 @@ public class DelayComputation {
     FlatMethod fm=state.getMethodFlat(md);
     Set<FlatNode> exits=faen.getExits();
     Hashtable<FlatNode, Set<TempDescriptor>> livemap=Liveness.computeLiveTemps(fm);
-    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm);
-    
+    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm, Liveness.computeLiveTemps(fm));    
+
     Set<FlatNode> atomicnodes=faen.getReachableSet(faen.getExits());
 
     Set<FlatNode> secondpart=new HashSet<FlatNode>(getNotReady(lb));
@@ -176,7 +177,7 @@ public class DelayComputation {
     FlatMethod fm=state.getMethodFlat(md);
     Set<FlatNode> exits=faen.getExits();
     Hashtable<FlatNode, Set<TempDescriptor>> livemap=Liveness.computeLiveTemps(fm);
-    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm);
+    Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> reachingdefs=ReachingDefs.computeReachingDefs(fm, livemap);
     
     Set<FlatNode> atomicnodes=faen.getReachableSet(faen.getExits());
 
@@ -195,6 +196,10 @@ public class DelayComputation {
       for(Iterator<TempDescriptor> tmpit=tempset.iterator();tmpit.hasNext();) {
 	TempDescriptor tmp=tmpit.next();
 	Set<FlatNode> fnset=reachmap.get(tmp);
+	if (fnset==null) {
+	  System.out.println("null temp set for"+fn+" tmp="+tmp);
+	  System.out.println(fm.printMethod());
+	}
 	for(Iterator<FlatNode> fnit2=fnset.iterator();fnit2.hasNext();) {
 	  FlatNode fn2=fnit2.next();
 	  if (secondpart.contains(fn2)) {
diff --git a/Robust/src/Analysis/ReachingDefs.java b/Robust/src/Analysis/ReachingDefs.java
index 56095d08..411017a7 100644
--- a/Robust/src/Analysis/ReachingDefs.java
+++ b/Robust/src/Analysis/ReachingDefs.java
@@ -10,7 +10,7 @@ public class ReachingDefs {
   /* This methods takes in a FlatMethod and returns a map from a
    * FlatNode to the set of live temps for that FlatNode.*/
 
-  public static Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> computeReachingDefs(FlatMethod fm) {
+  public static Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> computeReachingDefs(FlatMethod fm, Hashtable<FlatNode, Set<TempDescriptor>> livemap) {
     Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> nodetotemps=new Hashtable<FlatNode, Hashtable<TempDescriptor,Set<FlatNode>>>();
     
     Set<FlatNode> toprocess=fm.getNodeSet();
@@ -21,12 +21,16 @@ public class ReachingDefs {
       
       Hashtable<TempDescriptor, Set<FlatNode>> tempset=new Hashtable<TempDescriptor, Set<FlatNode>>();
 
+      Set<TempDescriptor> livetempset=livemap.get(fn);
+
       for(int i=0; i<fn.numPrev(); i++) {
 	FlatNode fnprev=fn.getPrev(i);
 	if (nodetotemps.containsKey(fnprev)) {
 	  Hashtable<TempDescriptor,Set<FlatNode>> prevtable=nodetotemps.get(fnprev);
 	  for(Iterator<TempDescriptor> tmpit=prevtable.keySet().iterator();tmpit.hasNext();) {
 	    TempDescriptor tmp=tmpit.next();
+	    if (!livetempset.contains(tmp))
+	      continue;
 	    if (!tempset.containsKey(tmp))
 	      tempset.put(tmp, new HashSet<FlatNode>());
 	    tempset.get(tmp).addAll(prevtable.get(tmp));
diff --git a/Robust/src/IR/Flat/FlatGlobalConvNode.java b/Robust/src/IR/Flat/FlatGlobalConvNode.java
index f03815c8..3076a2e5 100644
--- a/Robust/src/IR/Flat/FlatGlobalConvNode.java
+++ b/Robust/src/IR/Flat/FlatGlobalConvNode.java
@@ -64,6 +64,9 @@ public class FlatGlobalConvNode extends FlatNode {
   }
 
   public TempDescriptor [] readsTemps() {
-    return new TempDescriptor[] {src};
+    if (!makePtr&&!convert)
+      return new TempDescriptor[0];
+    else
+      return new TempDescriptor[] {src};
   }
 }
diff --git a/Robust/src/IR/Flat/FlatMethod.java b/Robust/src/IR/Flat/FlatMethod.java
index 6fdc29bb..96a83ade 100644
--- a/Robust/src/IR/Flat/FlatMethod.java
+++ b/Robust/src/IR/Flat/FlatMethod.java
@@ -94,6 +94,22 @@ public class FlatMethod extends FlatNode {
     return flatExit;
   }
 
+  public void check() {
+    Set<FlatNode> set=getNodeSet();
+    for(Iterator<FlatNode> setit=set.iterator();setit.hasNext();) {
+      FlatNode fn=setit.next();
+      for(int i=0;i<fn.numPrev();i++) {
+	FlatNode fnprev=fn.getPrev(i);
+	if (!set.contains(fnprev)) {
+	  System.out.println(fn+" has unreachable parent:"+i+"  "+fnprev);
+	  System.out.println(printMethod());
+	  throw new Error();
+
+	}
+      }
+    }
+  }
+
   /** This method returns a set of the nodes in this flat representation */
 
   public Set<FlatNode> getNodeSet() {
@@ -106,6 +122,8 @@ public class FlatMethod extends FlatNode {
       visited.add(fn);
       for(int i=0; i<fn.numNext(); i++) {
 	FlatNode nn=fn.getNext(i);
+	if (nn==null)
+	  continue;
 	if (!visited.contains(nn))
 	  tovisit.add(nn);
       }
diff --git a/Robust/src/IR/Flat/FlatNode.java b/Robust/src/IR/Flat/FlatNode.java
index 5bc5da96..ba2c3a8d 100644
--- a/Robust/src/IR/Flat/FlatNode.java
+++ b/Robust/src/IR/Flat/FlatNode.java
@@ -5,7 +5,7 @@ import java.util.Set;
 import java.util.Iterator;
 
 public class FlatNode {
-  protected Vector next;
+  public Vector next;
   protected Vector prev;
 
   public FlatNode() {
@@ -117,12 +117,14 @@ public class FlatNode {
     }
     for(int i=0;i<next.size();i++) {
       FlatNode nnext=(FlatNode)next.get(i);
-      fnnew.next.set(i,nnext);;
+      fnnew.next.set(i,nnext);
       for(int j=0;j<nnext.numPrev();j++) {
 	FlatNode n=nnext.getPrev(j);
 	if (n==this)
 	  nnext.prev.set(j, fnnew);
       }
     }
+    next=null;
+    prev=null;
   }
 }
diff --git a/Robust/src/IR/Flat/TempDescriptor.java b/Robust/src/IR/Flat/TempDescriptor.java
index d5eb728a..12657520 100644
--- a/Robust/src/IR/Flat/TempDescriptor.java
+++ b/Robust/src/IR/Flat/TempDescriptor.java
@@ -36,6 +36,13 @@ public class TempDescriptor extends Descriptor {
       return new TempDescriptor(name+"_"+currentid, type, tag);
   }
 
+  public TempDescriptor createNew(String x) {
+    if (tag==null)
+      return new TempDescriptor(name+"_"+currentid+"_"+x, type);
+    else
+      return new TempDescriptor(name+"_"+currentid+"_"+x, type, tag);
+  }
+
   public static TempDescriptor tempFactory() {
     return new TempDescriptor("temp_"+currentid);
   }
diff --git a/Robust/src/Runtime/STM/stmlookup.c b/Robust/src/Runtime/STM/stmlookup.c
index 40b8a9de..ab961244 100644
--- a/Robust/src/Runtime/STM/stmlookup.c
+++ b/Robust/src/Runtime/STM/stmlookup.c
@@ -70,6 +70,8 @@ void dc_t_chashreset() {
 void dc_t_chashInsertOnce(void * key, void *val) {
   chashlistnode_t *ptr;
 
+  if (key==NULL)
+    return;
 
   if(dc_c_numelements > (dc_c_threshold)) {
     //Resize
-- 
2.34.1