X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FSSJava%2FBuildLattice.java;h=aa8ac139b1088a51b35ac453b6fabc87bfb9a3fd;hb=3e70000b1b45e43a58585fc075ee721adf2a0af0;hp=fdf3d89d05d4448227300979d38aaf4f405c225f;hpb=30c0c69af4e45824aae96fb417663da1567d1b64;p=IRC.git diff --git a/Robust/src/Analysis/SSJava/BuildLattice.java b/Robust/src/Analysis/SSJava/BuildLattice.java index fdf3d89d..aa8ac139 100644 --- a/Robust/src/Analysis/SSJava/BuildLattice.java +++ b/Robust/src/Analysis/SSJava/BuildLattice.java @@ -3,21 +3,42 @@ package Analysis.SSJava; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.Map; import java.util.Set; +import java.util.Stack; +import IR.ClassDescriptor; import IR.Descriptor; import IR.MethodDescriptor; +import IR.NameDescriptor; import Util.Pair; public class BuildLattice { private LocationInference infer; private Map mapSharedNodeToTripleItem; + private Map mapHNodeToHighestIndex; + + private Map> mapDescToIntermediateLocMap; + + private Map> mapDescToInterLocMap; + + private Map, Integer> mapItemToHighestIndex; + + private Map, Set> mapLatticeToLocalLocSet; + + private Map>> mapDescToLineListMap; public BuildLattice(LocationInference infer) { this.infer = infer; this.mapSharedNodeToTripleItem = new HashMap(); + this.mapHNodeToHighestIndex = new HashMap(); + this.mapItemToHighestIndex = new HashMap, Integer>(); + this.mapDescToIntermediateLocMap = new HashMap>(); + this.mapLatticeToLocalLocSet = new HashMap, Set>(); + this.mapDescToInterLocMap = new HashMap>(); + this.mapDescToLineListMap = new HashMap>>(); } public SSJavaLattice buildLattice(Descriptor desc) { @@ -25,6 +46,10 @@ public class BuildLattice { HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc); LocationSummary locSummary = infer.getLocationSummary(desc); + HierarchyGraph naiveGraph = infer.getSimpleHierarchyGraph(desc); + + // I don't think we need to keep the below if statement anymore + // because hierarchy graph does not have any composite location Set nodeSetWithCompositeLocation = new HashSet(); if (desc instanceof MethodDescriptor) { FlowGraph flowGraph = infer.getFlowGraph((MethodDescriptor) desc); @@ -48,19 +73,62 @@ public class BuildLattice { } + // ///////////////////////////////////////////////////////////////////////////////////// + // lattice generation for the native approach + + if (infer.state.SSJAVA_INFER_NAIVE_WRITEDOTS) { + BasisSet naiveBasisSet = naiveGraph.computeBasisSet(nodeSetWithCompositeLocation); + + Family naiveFamily = generateFamily(naiveBasisSet); + Map, Set>> naive_mapImSucc = + coveringGraph(naiveBasisSet, naiveFamily); + + SSJavaLattice naive_lattice = + buildLattice(desc, naiveBasisSet, naiveGraph, null, naive_mapImSucc); + LocationInference.numLocationsNaive += naive_lattice.getKeySet().size(); + infer.addNaiveLattice(desc, naive_lattice); + } + + // ///////////////////////////////////////////////////////////////////////////////////// + + // lattice generation for the proposed approach BasisSet basisSet = inputGraph.computeBasisSet(nodeSetWithCompositeLocation); - debug_print(inputGraph); + // debug_print(inputGraph); Family family = generateFamily(basisSet); Map, Set>> mapImSucc = coveringGraph(basisSet, family); - SSJavaLattice lattice = buildLattice(basisSet, inputGraph, locSummary, mapImSucc); + SSJavaLattice lattice = buildLattice(desc, basisSet, inputGraph, locSummary, mapImSucc); return lattice; } - private SSJavaLattice buildLattice(BasisSet basisSet, HierarchyGraph inputGraph, - LocationSummary locSummary, Map, Set>> mapImSucc) { + public void setIntermediateLocMap(Descriptor desc, Map map) { + mapDescToIntermediateLocMap.put(desc, map); + } + + public Map getIntermediateLocMap(Descriptor desc) { + if (!mapDescToIntermediateLocMap.containsKey(desc)) { + mapDescToIntermediateLocMap.put(desc, new HashMap()); + } + return mapDescToIntermediateLocMap.get(desc); + } + + private Descriptor getParent(Descriptor desc) { + if (desc instanceof MethodDescriptor) { + MethodDescriptor md = (MethodDescriptor) desc; + ClassDescriptor cd = md.getClassDesc(); + return infer.getParentMethodDesc(cd, md); + } else { + return ((ClassDescriptor) desc).getSuperDesc(); + } + } + + private SSJavaLattice buildLattice(Descriptor desc, BasisSet basisSet, + HierarchyGraph inputGraph, LocationSummary locSummary, + Map, Set>> mapImSucc) { + + System.out.println("\nBuild Lattice:" + inputGraph.getName()); SSJavaLattice lattice = new SSJavaLattice(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM); @@ -74,16 +142,27 @@ public class BuildLattice { String higherName = generateElementName(basisSet, inputGraph, mapFToLocName, higher); HNode higherNode = inputGraph.getHNode(higherName); + + if (higherNode == null) { + NameDescriptor d = new NameDescriptor(higherName); + higherNode = inputGraph.getHNode(d); + higherNode.setSkeleton(true); + } + if (higherNode != null && higherNode.isSharedNode()) { lattice.addSharedLoc(higherName); } Set descSet = inputGraph.getDescSetOfNode(higherNode); // System.out.println("higherName=" + higherName + " higherNode=" + higherNode + " descSet=" // + descSet); - for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) { - Descriptor d = (Descriptor) iterator2.next(); - locSummary.addMapHNodeNameToLocationName(d.getSymbol(), higherName); + + if (locSummary != null) { + for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) { + Descriptor d = (Descriptor) iterator2.next(); + locSummary.addMapHNodeNameToLocationName(d.getSymbol(), higherName); + } } + // locSummary.addMapHNodeNameToLocationName(higherName, higherName); Set> lowerSet = mapImSucc.get(higher); @@ -92,6 +171,17 @@ public class BuildLattice { String lowerName = generateElementName(basisSet, inputGraph, mapFToLocName, lower); HNode lowerNode = inputGraph.getHNode(lowerName); + + if (lowerNode == null && !lowerName.equals(SSJavaAnalysis.BOTTOM)) { + NameDescriptor d = new NameDescriptor(lowerName); + lowerNode = inputGraph.getHNode(d); + lowerNode.setSkeleton(true); + } + + if (lowerNode != null && !inputGraph.isDirectlyConnectedTo(higherNode, lowerNode)) { + inputGraph.addEdge(higherNode, lowerNode); + } + if (lowerNode != null && lowerNode.isSharedNode()) { lattice.addSharedLoc(lowerName); } @@ -99,9 +189,11 @@ public class BuildLattice { Set lowerDescSet = inputGraph.getDescSetOfNode(lowerNode); // System.out.println("lowerName=" + lowerName + " lowerNode=" + lowerNode + " descSet=" // + lowerDescSet); - for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) { - Descriptor d = (Descriptor) iterator3.next(); - locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName); + if (locSummary != null) { + for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) { + Descriptor d = (Descriptor) iterator3.next(); + locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName); + } } // locSummary.addMapHNodeNameToLocationName(lowerName, lowerName); @@ -116,6 +208,7 @@ public class BuildLattice { } + inputGraph.removeRedundantEdges(); return lattice; } @@ -143,156 +236,306 @@ public class BuildLattice { public SSJavaLattice insertIntermediateNodesToStraightLine(Descriptor desc, SSJavaLattice skeletonLattice) { - // perform DFS that starts from each skeleton/combination node and ends by another - // skeleton/combination node + SSJavaLattice lattice = skeletonLattice.clone(); + LocationSummary locSummary = infer.getLocationSummary(desc); + + Descriptor parentDesc = getParent(desc); + if (parentDesc != null) { + SSJavaLattice parentLattice = infer.getLattice(parentDesc); + + Map> parentMap = parentLattice.getTable(); + Set parentKeySet = parentMap.keySet(); + for (Iterator iterator = parentKeySet.iterator(); iterator.hasNext();) { + String parentKey = (String) iterator.next(); + Set parentValueSet = parentMap.get(parentKey); + for (Iterator iterator2 = parentValueSet.iterator(); iterator2.hasNext();) { + String value = (String) iterator2.next(); + lattice.put(parentKey, value); + } + } - mapSharedNodeToTripleItem.clear(); + Set parentSharedLocSet = parentLattice.getSharedLocSet(); + for (Iterator iterator = parentSharedLocSet.iterator(); iterator.hasNext();) { + String parentSharedLoc = (String) iterator.next(); + lattice.addSharedLoc(parentSharedLoc); + } + } - HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc); + HierarchyGraph hierarchyGraph = infer.getSimpleHierarchyGraph(desc); HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc); - LocationSummary locSummary = infer.getLocationSummary(desc); - SSJavaLattice lattice = skeletonLattice.clone(); + Set hierarchyGraphNodeSet = hierarchyGraph.getNodeSet(); + for (Iterator iterator = hierarchyGraphNodeSet.iterator(); iterator.hasNext();) { + HNode hNode = (HNode) iterator.next(); + if (!hNode.isSkeleton()) { + // here we need to insert an intermediate node for the hNode + System.out.println("\n#local node=" + hNode); + + // 1) find the lowest node m in the lattice that is above hnode in the lattice + // 2) count the number of non-shared nodes d between the hnode and the node m + // int numNonSharedNodes; + int dist = 0; + + HNode SCNode; + Set combineSkeletonNodeSet = null; + Stack trace = new Stack(); + if (hNode.isDirectCombinationNode()) { + // this node itself is the lowest node m. it is the first node of the chain + Set combineSet = hierarchyGraph.getCombineSetByCombinationNode(hNode); + + System.out.println(" # direct combine node::combineSkeletonNodeSet=" + combineSet); + + SCNode = scGraph.getCombinationNode(combineSet); + // numNonSharedNodes = -1; + dist = 0; + if (hNode.isSharedNode()) { + trace.add("S"); + } else { + trace.add("N"); + } + } else { - Set visited = new HashSet(); + Set aboveSet = new HashSet(); + if (hNode.isCombinationNode()) { + // the current node is a combination node + combineSkeletonNodeSet = hierarchyGraph.getCombineSetByCombinationNode(hNode); + System.out.println(" combineSkeletonNodeSet=" + combineSkeletonNodeSet + + " combinationNode=" + scGraph.getCombinationNode(combineSkeletonNodeSet)); - Set nodeSet = simpleGraph.getNodeSet(); + scGraph.getCombinationNode(combineSkeletonNodeSet); - Map mapIntermediateLoc = new HashMap(); + System.out.println(" firstnodeOfSimpleGraph=" + + hierarchyGraph.getFirstNodeOfCombinationNodeChainSet(combineSkeletonNodeSet)); + aboveSet.addAll(hierarchyGraph + .getFirstNodeOfCombinationNodeChainSet(combineSkeletonNodeSet)); - System.out.println("*insert=" + desc); - System.out.println("***nodeSet=" + nodeSet); - for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) { - HNode node = (HNode) iterator.next(); - System.out.println("node=" + node); + SCNode = scGraph.getCombinationNode(combineSkeletonNodeSet); - if (node.isSkeleton() && (!visited.contains(node))) { - visited.add(node); + } else { + // the current node is not a combination node + // there is only one parent node which should be skeleton node. + + System.out.println(" hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")=" + + hierarchyGraph.getSkeleteNodeSetReachTo(hNode)); + aboveSet.addAll(hierarchyGraph.getSkeleteNodeSetReachTo(hNode)); + System.out.println(" aboveset of " + hNode + "=" + aboveSet); + // assert aboveSet.size() == 1; + SCNode = aboveSet.iterator().next(); + } - Set outSet = simpleGraph.getOutgoingNodeSet(node); - for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) { - HNode outNode = (HNode) iterator2.next(); + // update above set w.r.t the hierarchy graph with SC nodes + // because the skeleton nodes in the original hierarchy graph may be merged to a new node + Set endSet = new HashSet(); + for (Iterator iterator2 = aboveSet.iterator(); iterator2.hasNext();) { + HNode aboveNode = (HNode) iterator2.next(); + endSet.add(hierarchyGraph.getCurrentHNode(aboveNode)); + } - if (!outNode.isSkeleton()) { - if (outNode.isCombinationNode()) { - expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode); - } else { - // we have a node that is neither combination or skeleton node - // System.out.println("%%%skeleton node=" + node + " outNode=" + outNode); - HNode startNode = scGraph.getCurrentHNode(node); - - // if (node.getDescriptor() != null) { - // // node is a skeleton node and it might be merged into another node in the SC - // graph. - // startNode = scGraph.getHNode(node.getDescriptor()); - // } else { - // // this node has already been merged before the SC graph. - // startNode = node; - // } - - Set endNodeSetFromSimpleGraph = - simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null); - - // System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph - // + " from=" + outNode); - Set endCombNodeSet = new HashSet(); - for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { - HNode endNode = (HNode) iterator3.next(); - endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); - } - // System.out.println("endCombNodeSet=" + endCombNodeSet); - visited.add(outNode); - if (endCombNodeSet.size() > 0) { - // follows the straight line up to another skeleton/combination node - endCombNodeSet = removeTransitivelyReachToNode(desc, startNode, endCombNodeSet); - } else if (endCombNodeSet.size() == 0) { - // the outNode is (directly/transitively) connected to the bottom node - // therefore, we just add a dummy bottom HNode to the endCombNodeSet. - endCombNodeSet.add(LocationInference.BOTTOMHNODE); - } - - recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited, - mapIntermediateLoc, 1, locSummary, outNode); - } + trace = hierarchyGraph.computeDistance(hNode, endSet, combineSkeletonNodeSet); + System.out.println(" COUNT-RESULT::node=" + hNode + " above=" + endSet + " trace=" + + trace + " SCNode=" + SCNode); + } + + // 3) convert the node m into a chain of nodes with the last node in the chain having m’s + // outgoing edges. + Set outgoingSCNodeSet = scGraph.getOutgoingNodeSet(SCNode); + System.out.println(" outgoing scnode set from " + SCNode + "=" + outgoingSCNodeSet); + + // convert hnodes to location names + String startLocName = locSummary.getLocationName(SCNode.getName()); + Set outgoingLocNameSet = new HashSet(); + for (Iterator iterator2 = outgoingSCNodeSet.iterator(); iterator2.hasNext();) { + HNode outSCNode = (HNode) iterator2.next(); + String locName = locSummary.getLocationName(outSCNode.getName()); + if (!locName.equals(outSCNode.getName())) { + System.out.println(" outSCNode=" + outSCNode + " -> locName=" + + locName); } + outgoingLocNameSet.add(locName); + } + if (outgoingLocNameSet.isEmpty()) { + outgoingLocNameSet.add(lattice.getBottomItem()); } - } else if (!node.isSkeleton() && !node.isCombinationNode() && !node.isMergeNode() - && !visited.contains(node)) { - System.out.println("n=" + node); + if (hNode.isCombinationNode()) { + System.out.println("make sure that the first node corresponds to the COMB node=" + + startLocName); + LineIdentifier lineId = new LineIdentifier(startLocName, outgoingLocNameSet); + LinkedList list = getLineList(desc, lineId); + // make sure that the first node corresponds to the COMB node + if (list.size() <= 0) { + list.add(new LocPair()); + } + LocPair firstPair = list.get(0); + firstPair.nonShared = startLocName; + } - // an intermediate node 'node' may be located between "TOP" location and a skeleton node - if (simpleGraph.getIncomingNodeSet(node).size() == 0) { + // 4) If hnode is not a shared location, check if there already exists a local variable + // node that has distance d below m along this chain. If such a node + // does not exist, insert it. + String locName = + getNewLocation(desc, startLocName, outgoingLocNameSet, trace, hNode.isSharedNode()); - // this node will be directly connected to the TOP location - // start adding the following nodes from this node + System.out.println(" ###hNode=" + hNode + "---->locName=" + locName); + locSummary.addMapHNodeNameToLocationName(hNode.getName(), locName); - Set endNodeSetFromSimpleGraph = - simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(node, null); + } + } - Set endCombNodeSet = new HashSet(); - for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { - HNode endNode = (HNode) iterator3.next(); - endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); - } + insertLocalLocations(desc, lattice); + + return lattice; + } + + private void insertLocalLocations(Descriptor desc, SSJavaLattice lattice) { + + Map> map = getLineListMap(desc); + System.out.println("####MAP=" + map); + + Set lineIdSet = map.keySet(); + for (Iterator iterator = lineIdSet.iterator(); iterator.hasNext();) { + LineIdentifier lineId = (LineIdentifier) iterator.next(); + + LinkedList list = map.get(lineId); - System.out.println("endCombNodeSet=" + endCombNodeSet); - HNode startNode = LocationInference.TOPHNODE; - visited.add(startNode); - if (endCombNodeSet.size() > 0) { - // follows the straight line up to another skeleton/combination node - // endCombNodeSet = removeTransitivelyReachToNode(desc, node, endCombNodeSet); - recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited, - mapIntermediateLoc, 1, locSummary, node); + String higherLocName = lineId.startLoc; + Set endLocNameSet = lineId.lowerLocSet; + + for (int i = 0; i < list.size(); i++) { + LocPair pair = list.get(i); + + if (pair.nonShared != null) { + + if (!lattice.getKeySet().contains(pair.nonShared)) { + lattice.insertNewLocationBetween(higherLocName, endLocNameSet, pair.nonShared); } + higherLocName = pair.nonShared; + } + if (pair.shared != null) { + if (!lattice.getKeySet().contains(pair.shared)) { + lattice.insertNewLocationBetween(higherLocName, endLocNameSet, pair.shared); + lattice.addSharedLoc(pair.shared); + } + higherLocName = pair.shared; } } + + } + + } + + private void addLocalLocation(SSJavaLattice lattice, String localLoc) { + if (!mapLatticeToLocalLocSet.containsKey(lattice)) { + mapLatticeToLocalLocSet.put(lattice, new HashSet()); + } + mapLatticeToLocalLocSet.get(lattice).add(localLoc); + } + + private boolean isLocalLocation(SSJavaLattice lattice, String localLoc) { + if (mapLatticeToLocalLocSet.containsKey(lattice)) { + return mapLatticeToLocalLocSet.get(lattice).contains(localLoc); + } + return false; + } + + public Map getInterLocMap(Descriptor desc) { + if (!mapDescToInterLocMap.containsKey(desc)) { + mapDescToInterLocMap.put(desc, new HashMap()); + } + return mapDescToInterLocMap.get(desc); + } + + public Map> getLineListMap(Descriptor desc) { + if (!mapDescToLineListMap.containsKey(desc)) { + mapDescToLineListMap.put(desc, new HashMap>()); + } + return mapDescToLineListMap.get(desc); + } + + public LinkedList getLineList(Descriptor desc, LineIdentifier lineId) { + Map> map = getLineListMap(desc); + if (!map.containsKey(lineId)) { + map.put(lineId, new LinkedList()); } + return map.get(lineId); + } + + private String generateNewLocName() { + String newLocName = "ILOC" + (LocationInference.locSeed++); + System.out.println("newLocName=" + newLocName); + return newLocName; + } - // add shared locations - Set sharedNodeSet = mapSharedNodeToTripleItem.keySet(); - for (Iterator iterator = sharedNodeSet.iterator(); iterator.hasNext();) { - HNode sharedNode = (HNode) iterator.next(); - TripleItem item = mapSharedNodeToTripleItem.get(sharedNode); - String nonSharedLocName = mapIntermediateLoc.get(item); - System.out.println("sharedNode=" + sharedNode + " locName=" + nonSharedLocName); + public String getNewLocation(Descriptor desc, String start, Set endSet, + Stack trace, boolean isShared) { - String newLocName; - if (locSummary.getHNodeNameSetByLatticeLoationName(nonSharedLocName) != null - && !lattice.isSharedLoc(nonSharedLocName)) { - // need to generate a new shared location in the lattice, which is one level lower than the - // 'locName' location - newLocName = "ILOC" + (LocationInference.locSeed++); + System.out.println(" #GetNewLocation start=" + start + " endSet=" + endSet + " trace=" + + trace); - // Set aboveElementSet = getAboveElementSet(lattice, locName); - Set belowElementSet = new HashSet(); - belowElementSet.addAll(lattice.get(nonSharedLocName)); + LineIdentifier lineId = new LineIdentifier(start, endSet); + LinkedList list = getLineList(desc, lineId); - System.out.println("nonSharedLocName=" + nonSharedLocName + " belowElementSet=" - + belowElementSet + " newLocName=" + newLocName); + int locPairIdx = trace.size() - 1; - lattice.insertNewLocationBetween(nonSharedLocName, belowElementSet, newLocName); + LocPair pair; + if (list.size() > locPairIdx) { + // there already exsits a list of nodes up to the current one + pair = list.get(locPairIdx); + // check if we need to add a new shared or non-shred node to the pair + if (isShared) { + if (pair.shared == null) { + pair.shared = generateNewLocName(); + } + return pair.shared; } else { - newLocName = nonSharedLocName; + if (pair.nonShared == null) { + pair.nonShared = generateNewLocName(); + } + return pair.nonShared; } - lattice.addSharedLoc(newLocName); - HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); - Set descSet = graph.getDescSetOfNode(sharedNode); - for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) { - Descriptor d = (Descriptor) iterator2.next(); - locSummary.addMapHNodeNameToLocationName(d.getSymbol(), newLocName); - } - locSummary.addMapHNodeNameToLocationName(sharedNode.getName(), newLocName); + } else { + // we need to set up a chain of intermediate nodes to the current one. + return recur_getNewLocation(0, list, trace); + } + } + + private String recur_getNewLocation(int idx, LinkedList list, Stack trace) { + + String curType = trace.pop(); + boolean isCurShared = false; + if (curType.equals("S")) { + isCurShared = true; } - return lattice; + if (list.size() <= idx) { + // need to insert a new pair for the idx + list.add(new LocPair()); + } + + // here, the list already has a pair for the idx + LocPair pair = list.get(idx); + if (isCurShared && pair.shared == null) { + pair.shared = generateNewLocName(); + } else if (!isCurShared && pair.nonShared == null) { + pair.nonShared = generateNewLocName(); + } + if (trace.isEmpty()) { + if (isCurShared) { + return pair.shared; + } else { + return pair.nonShared; + } + } + + idx++; + return recur_getNewLocation(idx, list, trace); } private Set getAboveElementSet(SSJavaLattice lattice, String loc) { @@ -311,16 +554,46 @@ public class BuildLattice { return aboveSet; } + private boolean needToExpandCombinationNode(Descriptor desc, HNode cnode) { + + System.out.println("needToExpandCombinationNode?=" + cnode); + + HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc); + // HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, cnode); + Set combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode); + Set combinationNodeSetInSimpleGraph = + simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet); + System.out.println("---combinationNodeSetInSimpleGraph=" + combinationNodeSetInSimpleGraph); + Set inNodeSetToCNode = simpleGraph.getIncomingNodeSet(cnode); + System.out.println("------inNodeSetToCNode=" + inNodeSetToCNode); + for (Iterator iterator = combinationNodeSetInSimpleGraph.iterator(); iterator.hasNext();) { + HNode nodeBelongToTheSameCombinationNode = (HNode) iterator.next(); + if (inNodeSetToCNode.contains(nodeBelongToTheSameCombinationNode)) { + // the combination node 'cnode' is not the highest location among the same combination node + return false; + } + } + + return true; + } + private void expandCombinationNode(Descriptor desc, SSJavaLattice lattice, Set visited, Map mapIntermediateLoc, LocationSummary locSummary, HNode cnode) { - System.out.println("expandCombinationNode=" + cnode); // expand the combination node 'outNode' // here we need to expand the corresponding combination location in the lattice HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, cnode); + System.out.println("expandCombinationNode=" + cnode + " cnode in scgraph=" + + combinationNodeInSCGraph); + + if (combinationNodeInSCGraph == null) { + return; + } + HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc); + HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc); Set combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode); @@ -331,19 +604,22 @@ public class BuildLattice { // System.out.println("combinationNodeSet=" + combinationNodeSet); - Set endNodeSetFromSimpleGraph = - simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet); + // TODO + // Set endNodeSetFromSimpleGraph = + // simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet); // System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph); - Set endCombNodeSet = new HashSet(); - for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { - HNode endNode = (HNode) iterator3.next(); - endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); - } + // Set endCombNodeSet = new HashSet(); + // for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { + // HNode endNode = (HNode) iterator3.next(); + // endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); + // } + + Set endCombNodeSet = scGraph.getOutgoingNodeSet(combinationNodeInSCGraph); visited.add(cnode); // follows the straight line up to another skeleton/combination node if (endCombNodeSet.size() > 0) { - System.out.println("---endCombNodeSet=" + endCombNodeSet); + // System.out.println("---endCombNodeSet=" + endCombNodeSet); endCombNodeSet = removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet); @@ -392,8 +668,9 @@ public class BuildLattice { private HNode getDirectlyReachableSCNodeFromEndNode(HierarchyGraph scGraph, HNode startNode, Set endNodeSet) { - System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode + " endNodeSet=" - + endNodeSet); + // System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode + + // " endNodeSet=" + // + endNodeSet); Set newStartNodeSet = new HashSet(); for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) { @@ -408,7 +685,7 @@ public class BuildLattice { } } - System.out.println("newStartNodeSet=" + newStartNodeSet); + // System.out.println("newStartNodeSet=" + newStartNodeSet); if (newStartNodeSet.size() == 0) { newStartNodeSet.add(startNode); @@ -438,14 +715,14 @@ public class BuildLattice { private HNode getDirectlyReachableNodeFromStartNodeReachToEndNode(HierarchyGraph scGraph, HNode startNode, HNode endNode) { - System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode - + " end=" + endNode); + // System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode + // + " end=" + endNode); Set connected = new HashSet(); recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode, connected); if (connected.size() == 0) { connected.add(endNode); } - System.out.println("connected=" + connected); + // System.out.println("connected=" + connected); return connected.iterator().next(); } @@ -470,7 +747,6 @@ public class BuildLattice { int idx, LocationSummary locSummary, HNode curNode) { TripleItem item = new TripleItem(startNode, endNodeSet, idx); - // System.out.println("item=" + item); if (!mapIntermediateLoc.containsKey(item)) { // need to create a new intermediate location in the lattice String newLocName = "ILOC" + (LocationInference.locSeed++); @@ -500,13 +776,14 @@ public class BuildLattice { } String locName = mapIntermediateLoc.get(item); - HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); + HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc); if (curNode.isSharedNode()) { // if the current node is shared location, add a shared location to the lattice later + System.out.println("###SHARED ITEM=" + item); mapSharedNodeToTripleItem.put(curNode, item); } else { - Set descSet = graph.getDescSetOfNode(curNode); + Set descSet = simpleHierarchyGraph.getDescSetOfNode(curNode); for (Iterator iterator = descSet.iterator(); iterator.hasNext();) { Descriptor d = (Descriptor) iterator.next(); locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName); @@ -514,20 +791,42 @@ public class BuildLattice { locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName); } - System.out.println("-TripleItem=" + item); + System.out.println("-TripleItem normal=" + item); System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode() - + " locName=" + locName); + + " locName=" + locName + " isC=" + curNode.isCombinationNode()); - Set outSet = graph.getOutgoingNodeSet(curNode); + Set outSet = simpleHierarchyGraph.getOutgoingNodeSet(curNode); for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) { HNode outNode = (HNode) iterator2.next(); + + Set incomingHNodeSetToOutNode = simpleHierarchyGraph.getIncomingNodeSet(outNode); + System.out.println("outNode=" + outNode); + System.out.println("---incomingHNodeSetToOutNode=" + incomingHNodeSetToOutNode); + if (!outNode.isSkeleton() && !outNode.isCombinationNode() && !visited.contains(outNode)) { - visited.add(outNode); - recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc, - idx + 1, locSummary, outNode); + Pair pair = new Pair(startNode, outNode); + if (visited.containsAll(simpleHierarchyGraph.getIncomingNodeSet(outNode))) { + visited.add(outNode); + int newidx = getCurrentHighestIndex(pair, idx + 1); + // int newidx = getCurrentHighestIndex(outNode, idx + 1); + recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc, + newidx, locSummary, outNode); + // recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc, + // idx + 1, locSummary, outNode); + } else { + updateHighestIndex(pair, idx + 1); + // updateHighestIndex(outNode, idx + 1); + System.out.println("NOT RECUR"); + } } else if (!outNode.isSkeleton() && outNode.isCombinationNode() && !visited.contains(outNode)) { - expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode); + if (needToExpandCombinationNode(desc, outNode)) { + System.out.println("NEED TO"); + expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode); + } else { + System.out.println("NOT NEED TO"); + } } + } } @@ -570,13 +869,14 @@ public class BuildLattice { // return; // } - HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); + HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc); String locName = mapIntermediateLoc.get(item); if (curNode.isSharedNode()) { // if the current node is shared location, add a shared location to the lattice later + System.out.println("###SHARED ITEM=" + item); mapSharedNodeToTripleItem.put(curNode, item); } else { - Set descSet = graph.getDescSetOfNode(curNode); + Set descSet = simpleHierarchyGraph.getDescSetOfNode(curNode); for (Iterator iterator = descSet.iterator(); iterator.hasNext();) { Descriptor d = (Descriptor) iterator.next(); locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName); @@ -588,30 +888,110 @@ public class BuildLattice { System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode() + " locName=" + locName); - Set outSet = graph.getOutgoingNodeSet(curNode); + Set outSet = simpleHierarchyGraph.getOutgoingNodeSet(curNode); for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) { HNode outNode = (HNode) iterator2.next(); - // System.out.println("recurDFS outNode=" + outNode); - // System.out.println("---cur combinationNodeInSCGraph=" + combinationNodeInSCGraph); - // System.out.println("---outNode combinationNodeInSCGraph=" - // + getCombinationNodeInSCGraph(desc, outNode)); + System.out.println("---recurDFS outNode=" + outNode); + System.out.println("---cur combinationNodeInSCGraph=" + combinationNodeInSCGraph); + System.out.println("---outNode combinationNodeInSCGraph=" + + getCombinationNodeInSCGraph(desc, outNode)); + if (!outNode.isSkeleton() && !visited.contains(outNode)) { if (outNode.isCombinationNode()) { + + Set combineSkeletonNodeSet = + simpleHierarchyGraph.getCombineSetByCombinationNode(outNode); + Set incomingHNodeSetToOutNode = simpleHierarchyGraph.getIncomingNodeSet(outNode); + // extract nodes belong to the same combine node + Set incomingCombinedHNodeSet = new HashSet(); + for (Iterator iterator = incomingHNodeSetToOutNode.iterator(); iterator.hasNext();) { + HNode inNode = (HNode) iterator.next(); + if (combineSkeletonNodeSet.contains(inNode)) { + incomingCombinedHNodeSet.add(inNode); + } + } + System.out.println("-----incomingCombinedHNodeSet=" + incomingCombinedHNodeSet); + // check whether the next combination node is different from the current node if (combinationNodeInSCGraph.equals(getCombinationNodeInSCGraph(desc, outNode))) { - visited.add(outNode); - recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited, - mapIntermediateLoc, idx + 1, locSummary, outNode); + Pair pair = new Pair(combinationNodeInSCGraph, outNode); + if (visited.containsAll(incomingCombinedHNodeSet)) { + visited.add(outNode); + System.out.println("-------curIdx=" + (idx + 1)); + + int newIdx = getCurrentHighestIndex(pair, idx + 1); + // int newIdx = getCurrentHighestIndex(outNode, idx + 1); + System.out.println("-------newIdx=" + newIdx); + recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited, + mapIntermediateLoc, newIdx, locSummary, outNode); + // recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited, + // mapIntermediateLoc, idx + 1, locSummary, outNode); + } else { + updateHighestIndex(pair, idx + 1); + // updateHighestIndex(outNode, idx + 1); + System.out.println("-----NOT RECUR!"); + } } else { - expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode); + if (needToExpandCombinationNode(desc, outNode)) { + System.out.println("NEED TO"); + expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode); + } else { + System.out.println("NOT NEED TO"); + } + } } - } + // } + } } + private int getCurrentHighestIndex(Pair pair, int curIdx) { + int recordedIdx = getCurrentHighestIndex(pair); + if (recordedIdx > curIdx) { + return recordedIdx; + } else { + return curIdx; + } + } + + private int getCurrentHighestIndex(HNode node, int curIdx) { + int recordedIdx = getCurrentHighestIndex(node); + if (recordedIdx > curIdx) { + return recordedIdx; + } else { + return curIdx; + } + } + + private int getCurrentHighestIndex(Pair pair) { + if (!mapItemToHighestIndex.containsKey(pair)) { + mapItemToHighestIndex.put(pair, new Integer(-1)); + } + return mapItemToHighestIndex.get(pair).intValue(); + } + + private void updateHighestIndex(Pair pair, int idx) { + if (idx > getCurrentHighestIndex(pair)) { + mapItemToHighestIndex.put(pair, new Integer(idx)); + } + } + + private int getCurrentHighestIndex(HNode node) { + if (!mapHNodeToHighestIndex.containsKey(node)) { + mapHNodeToHighestIndex.put(node, new Integer(-1)); + } + return mapHNodeToHighestIndex.get(node).intValue(); + } + + private void updateHighestIndex(HNode node, int idx) { + if (idx > getCurrentHighestIndex(node)) { + mapHNodeToHighestIndex.put(node, new Integer(idx)); + } + } + private String generateElementName(BasisSet basisSet, HierarchyGraph inputGraph, Map, String> mapF2LocName, Set F) { @@ -745,8 +1125,8 @@ public class BuildLattice { private void debug_print(HierarchyGraph inputGraph) { System.out.println("\nBuild Lattice:" + inputGraph.getName()); - // System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex()); - // System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis()); + System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex()); + System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis()); } } @@ -778,6 +1158,123 @@ class Identifier { } +class LocPair { + public String nonShared; + public String shared; + + public int hashCode() { + int h = 0; + if (nonShared != null) { + h = nonShared.hashCode(); + } + if (shared != null) { + h = shared.hashCode(); + } + return h; + } + + public boolean equals(Object obj) { + + if (obj instanceof LocPair) { + LocPair in = (LocPair) obj; + + if ((nonShared == null && in.nonShared == null) + || (nonShared != null && nonShared.equals(in.nonShared))) { + + if ((shared == null && in.shared == null) || (shared != null && shared.equals(in.shared))) { + return true; + } + + } + + } + + return false; + } + + public String toString() { + String rtr = "<" + nonShared + "," + shared + ">"; + return rtr; + } +} + +class LineIdentifier { + public String startLoc; + public Set lowerLocSet; + + public LineIdentifier(String s, Set lSet) { + startLoc = s; + lowerLocSet = lSet; + } + + public int hashCode() { + int h = 0; + h = startLoc.hashCode(); + return h + lowerLocSet.hashCode(); + } + + public boolean equals(Object obj) { + + if (obj instanceof LineIdentifier) { + LineIdentifier in = (LineIdentifier) obj; + if (startLoc.equals(in.startLoc) && lowerLocSet.equals(in.lowerLocSet)) { + return true; + } + } + + return false; + } + + public String toString() { + String rtr = startLoc + "->" + lowerLocSet; + return rtr; + } + +} + +class InterLocItem { + public String startLoc; + public Set lowerLocSet; + public int idx; + + public InterLocItem(String h, Set l, int i) { + startLoc = h; + lowerLocSet = l; + idx = i; + } + + public int hashCode() { + + int h = 0; + if (startLoc != null) { + h = startLoc.hashCode(); + } + + return h + lowerLocSet.hashCode() + idx; + } + + public boolean equals(Object obj) { + + if (obj instanceof InterLocItem) { + InterLocItem in = (InterLocItem) obj; + if ((startLoc == null || (startLoc != null && startLoc.equals(in.startLoc))) + && lowerLocSet.equals(in.lowerLocSet) && idx == in.idx) { + return true; + } + } + + return false; + } + + public String toString() { + String rtr = startLoc + "-" + idx + "->" + lowerLocSet; + if (idx % 2 != 0) { + rtr += " S"; + } + return rtr; + } +} + class TripleItem { public HNode higherNode; public Set lowerNodeSet; @@ -833,4 +1330,5 @@ class TripleItem { } return rtr; } + }