X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Repair%2FRepairCompiler%2FMCC%2FIR%2FTermination.java;h=689a5d2382169d166d58fc60a370cb68c663e303;hb=445c4854d296285d0ed336f8cb9002ab2e3e75bc;hp=0b01ab9a6db5071153e26041c366fa6c4242cd41;hpb=30816378d0198b3cdeac43ad5bf80df3b7646406;p=repair.git

diff --git a/Repair/RepairCompiler/MCC/IR/Termination.java b/Repair/RepairCompiler/MCC/IR/Termination.java
index 0b01ab9..689a5d2 100755
--- a/Repair/RepairCompiler/MCC/IR/Termination.java
+++ b/Repair/RepairCompiler/MCC/IR/Termination.java
@@ -15,6 +15,10 @@ public class Termination {
     Hashtable scopesatisfy;
     Hashtable scopefalsify;
     Hashtable consequence;
+    Hashtable abstractadd;
+    Hashtable abstractremove;
+    Hashtable conjtonodemap;
+    Set removedset;
 
     State state;
 
@@ -29,11 +33,15 @@ public class Termination {
 	consequence=new Hashtable();
 	updatenodes=new HashSet();
 	consequencenodes=new HashSet();
+	abstractadd=new Hashtable();
+	abstractremove=new Hashtable();
+	conjtonodemap=new Hashtable();
 
 	generateconjunctionnodes();
 	generatescopenodes();
 	generaterepairnodes();
 	generatedatastructureupdatenodes();
+	generatecompensationnodes();
 
 	generateabstractedges();
 	generatescopeedges();
@@ -41,16 +49,31 @@ public class Termination {
 
 	HashSet superset=new HashSet();
 	superset.addAll(conjunctions);
-	superset.addAll(abstractrepair);
-	superset.addAll(updatenodes);
-	superset.addAll(scopenodes);
-	superset.addAll(consequencenodes);
+	//superset.addAll(abstractrepair);
+	//superset.addAll(updatenodes);
+	//superset.addAll(scopenodes);
+	//superset.addAll(consequencenodes);
+	GraphNode.computeclosure(superset,null);
 	try {
 	    GraphNode.DOTVisitor.visit(new FileOutputStream("graph.dot"),superset);
 	} catch (Exception e) {
 	    e.printStackTrace();
 	    System.exit(-1);
 	}
+	for(Iterator it=updatenodes.iterator();it.hasNext();) {
+	    GraphNode gn=(GraphNode)it.next();
+	    TermNode tn=(TermNode)gn.getOwner();
+	    MultUpdateNode mun=tn.getUpdate();
+	    System.out.println(gn.getTextLabel());
+	    System.out.println(mun.toString());
+	}
+	GraphAnalysis ga=new GraphAnalysis(this);
+	removedset=ga.doAnalysis();
+	System.out.println("Removing:");
+	for(Iterator it=removedset.iterator();it.hasNext();) {
+	    GraphNode gn=(GraphNode)it.next();
+	    System.out.println(gn.getTextLabel());
+	}
     }
     
     void generateconjunctionnodes() {
@@ -64,7 +87,10 @@ public class Termination {
 					   "Conj ("+i+","+j+") "+dnf.get(j).name()
 					   ,tn);
 		conjunctions.add(gn);
-		conjunctionmap.put(c,gn);
+		if (!conjunctionmap.containsKey(c))
+		    conjunctionmap.put(c,new HashSet());
+		((Set)conjunctionmap.get(c)).add(gn);
+		conjtonodemap.put(dnf.get(j),gn);
 	    }
 	}
     }
@@ -101,15 +127,28 @@ public class Termination {
 		GraphNode gn2=(GraphNode)conjiterator.next();
 		TermNode tn2=(TermNode)gn2.getOwner();
 		Conjunction conj=tn2.getConjunction();
+		Constraint cons=tn2.getConstraint();
+
 		for(int i=0;i<conj.size();i++) {
 		    DNFPredicate dp=conj.get(i);
-		    if (AbstractInterferes.interferes(ar,dp)) {
+		    if (AbstractInterferes.interferes(ar,cons)||
+			AbstractInterferes.interferes(ar,dp)) {
 			GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
 			gn.addEdge(e);
 			break;
 		    }
 		}
 	    }
+
+	    for(Iterator scopeiterator=scopenodes.iterator();scopeiterator.hasNext();) {
+		GraphNode gn2=(GraphNode)scopeiterator.next();
+		TermNode tn2=(TermNode)gn2.getOwner();
+		ScopeNode sn2=tn2.getScope();
+		if (AbstractInterferes.interferes(ar,sn2.getRule(),sn2.getSatisfy())) {
+		    GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
+		    gn.addEdge(e);
+		}
+	    }
 	}
     }
     
@@ -124,9 +163,11 @@ public class Termination {
 		GraphNode gn2=(GraphNode)conjiterator.next();
 		TermNode tn2=(TermNode)gn2.getOwner();
 		Conjunction conj=tn2.getConjunction();
+		Constraint constr=tn2.getConstraint();
 		for(int i=0;i<conj.size();i++) {
 		    DNFPredicate dp=conj.get(i);
-		    if (AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),dp)) {
+		    if (AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),dp)||
+			AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),constr)) {
 			GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
 			GraphNode gnconseq=(GraphNode)consequence.get(sn);
 			gnconseq.addEdge(e);
@@ -154,8 +195,9 @@ public class Termination {
 	}
     }
 
-
+    /* Generates the abstract repair nodes */
     void generaterepairnodes() {
+	/* Generate repairs of conjunctions */
 	for(Iterator conjiterator=conjunctions.iterator();conjiterator.hasNext();) {
 	    GraphNode gn=(GraphNode)conjiterator.next();
 	    TermNode tn=(TermNode)gn.getOwner();
@@ -167,13 +209,133 @@ public class Termination {
 		for(int j=0;j<array.length;j++) {
 		    AbstractRepair ar=new AbstractRepair(dp,array[j],d);
 		    TermNode tn2=new TermNode(ar);
-		    GraphNode gn2=new GraphNode(gn.getLabel()+"A"+i+"B"+ar.type(),tn2);
+		    GraphNode gn2=new GraphNode(gn.getLabel()+"A"+i+"B"+ar.type(),gn.getTextLabel()+" #"+i+" "+ar.type(),tn2);
 		    GraphNode.Edge e=new GraphNode.Edge("abstract",gn2);
 		    gn.addEdge(e);
 		    abstractrepair.add(gn2);
 		}
 	    }
 	}
+	/* Generate additional abstract repairs */
+	Vector setdescriptors=state.stSets.getAllDescriptors();
+	for(int i=0;i<setdescriptors.size();i++) {
+	    SetDescriptor sd=(SetDescriptor)setdescriptors.get(i);
+
+	    /* XXXXXXX: Not sure what to do here */
+	    VarExpr ve=new VarExpr("DUMMY");
+	    InclusionPredicate ip=new InclusionPredicate(ve,new SetExpr(sd));
+	    
+	    DNFPredicate tp=new DNFPredicate(false,ip);
+	    AbstractRepair ar=new AbstractRepair(tp, AbstractRepair.ADDTOSET, sd);
+	    TermNode tn=new TermNode(ar);
+	    GraphNode gn=new GraphNode("AbstractAddSetRule"+i,tn);
+	    abstractrepair.add(gn);
+	    abstractadd.put(sd,gn);
+	    
+	    DNFPredicate tp2=new DNFPredicate(true,ip);
+	    AbstractRepair ar2=new AbstractRepair(tp2, AbstractRepair.REMOVEFROMSET, sd);
+	    TermNode tn2=new TermNode(ar2);
+	    GraphNode gn2=new GraphNode("AbstractRemSetRule"+i,tn2);
+	    abstractrepair.add(gn2);
+	    abstractremove.put(sd,gn2);
+	}
+
+	Vector relationdescriptors=state.stRelations.getAllDescriptors();
+	for(int i=0;i<relationdescriptors.size();i++) {
+	    RelationDescriptor rd=(RelationDescriptor)relationdescriptors.get(i);
+
+	    /* XXXXXXX: Not sure what to do here */
+	    VarDescriptor vd1=new VarDescriptor("DUMMY1");
+	    VarExpr ve2=new VarExpr("DUMMY2");
+
+	    InclusionPredicate ip=new InclusionPredicate(ve2,new ImageSetExpr(vd1, rd));
+	    
+	    DNFPredicate tp=new DNFPredicate(false,ip);
+	    AbstractRepair ar=new AbstractRepair(tp, AbstractRepair.ADDTORELATION, rd);
+	    TermNode tn=new TermNode(ar);
+	    GraphNode gn=new GraphNode("AbstractAddRelRule"+i,tn);
+	    abstractrepair.add(gn);
+	    abstractadd.put(rd,gn);
+	    
+	    DNFPredicate tp2=new DNFPredicate(true,ip);
+	    AbstractRepair ar2=new AbstractRepair(tp2, AbstractRepair.REMOVEFROMRELATION, rd);
+	    TermNode tn2=new TermNode(ar2);
+	    GraphNode gn2=new GraphNode("AbstractRemRelRule"+i,tn2);
+	    abstractrepair.add(gn2);
+	    abstractremove.put(rd,gn2);
+	}
+	
+    }
+
+    int compensationcount=0;
+    void generatecompensationnodes() {
+	for(int i=0;i<state.vRules.size();i++) {
+	    Rule r=(Rule) state.vRules.get(i);
+	    Vector possiblerules=new Vector();
+	    /* Construct bindings */
+	    /* No need to construct bindings on remove
+	       Vector bindings=new Vector();
+	       constructbindings(bindings, r,true);
+	    */
+	    for(int j=0;j<(r.numQuantifiers()+r.getDNFNegGuardExpr().size());j++) {
+		GraphNode gn=(GraphNode)scopesatisfy.get(r);
+		TermNode tn=(TermNode) gn.getOwner();
+		ScopeNode sn=tn.getScope();
+		MultUpdateNode mun=new MultUpdateNode(sn);
+		TermNode tn2=new TermNode(mun);
+		GraphNode gn2=new GraphNode("CompRem"+compensationcount,tn2);
+		UpdateNode un=new UpdateNode(r);
+		//		un.addBindings(bindings);
+		// Not necessary
+		if (j<r.numQuantifiers()) {
+		    /* Remove quantifier */
+		    Quantifier q=r.getQuantifier(j);
+		    if (q instanceof RelationQuantifier) {
+			RelationQuantifier rq=(RelationQuantifier)q;
+			TupleOfExpr toe=new TupleOfExpr(new VarExpr(rq.x),new VarExpr(rq.y),rq.relation);
+			toe.td=ReservedTypeDescriptor.INT;
+			Updates u=new Updates(toe,true);
+			un.addUpdate(u);
+			if (abstractremove.containsKey(rq.relation)) {
+			    GraphNode agn=(GraphNode)abstractremove.get(rq.relation);
+			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    gn2.addEdge(e);
+			} else {
+			    continue; /* Abstract repair doesn't exist */
+			}
+		    } else if (q instanceof SetQuantifier) {
+			SetQuantifier sq=(SetQuantifier)q;
+			ElementOfExpr eoe=new ElementOfExpr(new VarExpr(sq.var),sq.set);
+			eoe.td=ReservedTypeDescriptor.INT;
+			Updates u=new Updates(eoe,true);
+			un.addUpdate(u);
+			if (abstractremove.containsKey(sq.set)) {
+			    GraphNode agn=(GraphNode)abstractremove.get(sq.set);
+			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    gn2.addEdge(e);
+			} else {
+			    continue; /* Abstract repair doesn't exist */
+			}
+		    } else {
+			continue;
+		    }
+		} else {
+		    int c=j-r.numQuantifiers();
+		    if (!processconjunction(un,r.getDNFNegGuardExpr().get(c))) {
+			continue;
+		    }
+		}
+		if (!un.checkupdates()) /* Make sure we have a good update */
+		    continue;
+		
+		mun.addUpdate(un);
+
+		GraphNode.Edge e=new GraphNode.Edge("abstract"+compensationcount,gn2);
+		compensationcount++;
+		gn.addEdge(e);
+		updatenodes.add(gn2);
+	    }
+	}
     }
 
     void generatedatastructureupdatenodes() {
@@ -190,6 +352,10 @@ public class Termination {
 	    } else if (ar.getType()==AbstractRepair.REMOVEFROMRELATION) {
 		generateremovefromsetrelation(gn,ar);
 	    } else if (ar.getType()==AbstractRepair.MODIFYRELATION) {
+		/* Generate remove/add pairs */
+		generateremovefromsetrelation(gn,ar);
+		generateaddtosetrelation(gn,ar);
+		/* Generate atomic modify */
 		generatemodifyrelation(gn,ar);
 	    }
 	}
@@ -207,16 +373,23 @@ public class Termination {
 		(ar.getDescriptor()==((RelationInclusion)r.getInclusion()).getRelation()))
 		possiblerules.add(r);
 	}
+	if (possiblerules.size()==0)
+	    return;
 	int[] count=new int[possiblerules.size()];
 	while(remains(count,possiblerules)) {
-	    MultUpdateNode mun=new MultUpdateNode(ar);
+	    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.REMOVE);
+	    TermNode tn=new TermNode(mun);
+	    GraphNode gn2=new GraphNode("UpdateRem"+removefromcount,tn);
+
 	    boolean goodflag=true;
 	    for(int i=0;i<possiblerules.size();i++) {
 		Rule r=(Rule)possiblerules.get(i);
-		UpdateNode un=new UpdateNode();
+		UpdateNode un=new UpdateNode(r);
 		/* Construct bindings */
-		Vector bindings=new Vector();
-		constructbindings(bindings, r,true);
+		/* No Need to construct bindings on remove
+		   Vector bindings=new Vector();
+		   constructbindings(bindings, r,true);
+		  un.addBindings(bindings);*/
 		if (count[i]<r.numQuantifiers()) {
 		    /* Remove quantifier */
 		    Quantifier q=r.getQuantifier(count[i]);
@@ -226,12 +399,26 @@ public class Termination {
 			toe.td=ReservedTypeDescriptor.INT;
 			Updates u=new Updates(toe,true);
 			un.addUpdate(u);
+			if (abstractremove.containsKey(rq.relation)) {
+			    GraphNode agn=(GraphNode)abstractremove.get(rq.relation);
+			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    gn2.addEdge(e);
+			} else {
+			    goodflag=false;break; /* Abstract repair doesn't exist */
+			}
 		    } else if (q instanceof SetQuantifier) {
 			SetQuantifier sq=(SetQuantifier)q;
 			ElementOfExpr eoe=new ElementOfExpr(new VarExpr(sq.var),sq.set);
 			eoe.td=ReservedTypeDescriptor.INT;
 			Updates u=new Updates(eoe,true);
 			un.addUpdate(u);
+			if (abstractremove.containsKey(sq.set)) {
+			    GraphNode agn=(GraphNode)abstractremove.get(sq.set);
+			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    gn2.addEdge(e);
+			} else {
+			    goodflag=false;break; /* Abstract repair doesn't exist */
+			}
 		    } else {goodflag=false;break;}
 		} else {
 		    int c=count[i]-r.numQuantifiers();
@@ -239,11 +426,13 @@ public class Termination {
 			goodflag=false;break;
 		    }
 		}
+		if (!un.checkupdates()) {
+		    goodflag=false;
+		    break;
+		}
 		mun.addUpdate(un);
 	    }
 	    if (goodflag) {
-		TermNode tn=new TermNode(mun);
-		GraphNode gn2=new GraphNode("UpdateRem"+removefromcount,tn);
 		GraphNode.Edge e=new GraphNode.Edge("abstract"+removefromcount,gn2);
 		removefromcount++;
 		gn.addEdge(e);
@@ -372,13 +561,13 @@ public class Termination {
 
     static int addtocount=0;
     void generateaddtosetrelation(GraphNode gn, AbstractRepair ar) {
-	System.out.println("Attempting to generate add to set");
-	System.out.println(ar.getPredicate().getPredicate().name());
-	System.out.println(ar.getPredicate().isNegated());
+	//	System.out.println("Attempting to generate add to set");
+	//System.out.println(ar.getPredicate().getPredicate().name());
+	//System.out.println(ar.getPredicate().isNegated());
 	for(int i=0;i<state.vRules.size();i++) {
 	    Rule r=(Rule) state.vRules.get(i);
 	    /* See if this is a good rule*/
-	    System.out.println(r.getGuardExpr().name());
+	    //System.out.println(r.getGuardExpr().name());
 	    if ((r.getInclusion() instanceof SetInclusion&&
 		ar.getDescriptor()==((SetInclusion)r.getInclusion()).getSet())||
 		(r.getInclusion() instanceof RelationInclusion&&
@@ -387,15 +576,15 @@ public class Termination {
 		/* First solve for quantifiers */
 		Vector bindings=new Vector();
 		/* Construct bindings */
-		System.out.println("Attempting to generate add to set: #2");
+		//System.out.println("Attempting to generate add to set: #2");
 		if (!constructbindings(bindings,r,false))
 		    continue;
-		System.out.println("Attempting to generate add to set: #3");
+		//System.out.println("Attempting to generate add to set: #3");
 		//Generate add instruction
 		DNFRule dnfrule=r.getDNFGuardExpr();
 		for(int j=0;j<dnfrule.size();j++) {
 		    Inclusion inc=r.getInclusion();
-		    UpdateNode un=new UpdateNode();
+		    UpdateNode un=new UpdateNode(r);
 		    un.addBindings(bindings);
 		    /* Now build update for tuple/set inclusion condition */
 		    if(inc instanceof SetInclusion) {
@@ -436,14 +625,16 @@ public class Termination {
 		    //Finally build necessary updates to satisfy conjunction
 		    RuleConjunction ruleconj=dnfrule.get(j);
 		    /* Add in updates for quantifiers */
-		    System.out.println("Attempting to generate add to set #4");
-		    if (processquantifers(un, r)&&debugdd()&&
-			processconjunction(un,ruleconj)) {
-			System.out.println("Attempting to generate add to set #5");
-			MultUpdateNode mun=new MultUpdateNode(ar);
+		    //System.out.println("Attempting to generate add to set #4");
+		    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.ADD);
+		    TermNode tn=new TermNode(mun);
+		    GraphNode gn2=new GraphNode("UpdateAdd"+addtocount,tn);
+
+		    if (processquantifers(gn2,un, r)&&debugdd()&&
+			processconjunction(un,ruleconj)&&
+			un.checkupdates()) {
+			//System.out.println("Attempting to generate add to set #5");
 			mun.addUpdate(un);
-			TermNode tn=new TermNode(mun);
-			GraphNode gn2=new GraphNode("UpdateAdd"+addtocount,tn);
 			GraphNode.Edge e=new GraphNode.Edge("abstract"+addtocount,gn2);
 			addtocount++;
 			gn.addEdge(e);
@@ -454,12 +645,11 @@ public class Termination {
     }
 
     boolean debugdd() {
-	System.out.println("Attempting to generate add to set DD");
+	//System.out.println("Attempting to generate add to set DD");
 	return true;
     }
 
-    boolean processquantifers(UpdateNode un, Rule r) {
-	boolean goodupdate=true;
+    boolean processquantifers(GraphNode gn,UpdateNode un, Rule r) {
 	Inclusion inc=r.getInclusion();
 	for(Iterator iterator=r.quantifiers();iterator.hasNext();) {
 	    Quantifier q=(Quantifier)iterator.next();
@@ -471,15 +661,30 @@ public class Termination {
 		toe.td=ReservedTypeDescriptor.INT;
 		Updates u=new Updates(toe,false);
 		un.addUpdate(u);
+		if (abstractremove.containsKey(rq.relation)) {
+		    GraphNode agn=(GraphNode)abstractadd.get(rq.relation);
+		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+		    gn.addEdge(e);
+		} else {
+		    return false;
+		}
+
 	    } else if (q instanceof SetQuantifier) {
 		SetQuantifier sq=(SetQuantifier)q;
 		ElementOfExpr eoe=new ElementOfExpr(new VarExpr(sq.var),sq.set);
 		eoe.td=ReservedTypeDescriptor.INT;
 		Updates u=new Updates(eoe,false);
 		un.addUpdate(u);
-	    } else {goodupdate=false; break;}
+		if (abstractremove.containsKey(sq.set)) {
+		    GraphNode agn=(GraphNode)abstractadd.get(sq.set);
+		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+		    gn.addEdge(e);
+		} else {
+		    return false;
+		}
+	    } else return false;
    	}
-	return goodupdate;
+	return true;
     }
 
     boolean  processconjunction(UpdateNode un,RuleConjunction ruleconj){