Merge pull request #18 from mbarbar/optimise

Optimise node retrieval in CHG.
SVF-tools · Nov 29, 2018 · eb7ff9b · eb7ff9b
2 parents 1143333 + d0ce61f
commit eb7ff9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/include/MemoryModel/CHA.h b/include/MemoryModel/CHA.h
@@ -248,6 +248,7 @@ class CHGraph: public GenericCHGraphTy {
     u32_t classNum;
     s32_t vfID;
     double buildingCHGTime;
+    std::map<const std::string, CHNode *> classNameToNodeMap;
     NameToCHNodesMap classNameToDescendantsMap;
     NameToCHNodesMap classNameToAncestorsMap;
     NameToCHNodesMap classNameToInstAndDescsMap;

diff --git a/lib/MemoryModel/CHA.cpp b/lib/MemoryModel/CHA.cpp
@@ -236,19 +236,16 @@ void CHGraph::addEdge(const string className, const string baseClassName,
 }
 
 CHNode *CHGraph::getNode(const string name) const {
-    for (CHGraph::const_iterator it = this->begin(), eit = this->end();
-            it != eit; ++it) {
-        CHNode *node = it->second;
-        if (node->getName() == name)
-            return node;
-    }
-    return NULL;
+    auto chNode = classNameToNodeMap.find(name);
+    if (chNode != classNameToNodeMap.end()) return chNode->second;
+    else return NULL;
 }
 
 
 CHNode *CHGraph::createNode(const std::string className) {
 	assert(!getNode(className) && "this node should never be created before!");
 	CHNode * node = new CHNode(className, classNum++);
+	classNameToNodeMap[className] = node;
 	addGNode(node->getId(), node);
 	if (className.size() > 0 && className[className.size() - 1] == '>') {
 		string templateName = getBeforeBrackets(className);