RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-05 03:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Maintain DFS number in DomTreeNode itself.

Browse Source 
This means now ETNodes are not useful anymore.

llvm-svn: 37546
This commit is contained in:
Devang Patel 2007-06-12 00:14:41 +00:00
parent bc3887310b
commit 73d23a5f70
2 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/llvm/Analysis/Dominators.h
View File

@ -65,6 +65,8 @@ class DomTreeNode {
DomTreeNode *IDom;
ETNode *ETN;
std::vector<DomTreeNode*> Children;
int DFSNumIn, DFSNumOut;
public:
typedef std::vector<DomTreeNode*>::iterator iterator;
typedef std::vector<DomTreeNode*>::const_iterator const_iterator;
@ -80,12 +82,22 @@ public:
inline const std::vector<DomTreeNode*> &getChildren() const { return Children; }
inline DomTreeNode(BasicBlock *BB, DomTreeNode *iDom, ETNode *E)
: TheBB(BB), IDom(iDom), ETN(E) {
: TheBB(BB), IDom(iDom), ETN(E), DFSNumIn(-1), DFSNumOut(-1) {
if (IDom)
ETN->setFather(IDom->getETNode());
}
inline DomTreeNode *addChild(DomTreeNode *C) { Children.push_back(C); return C; }
void setIDom(DomTreeNode *NewIDom);
// Return true if this node is dominated by other. Use this only if DFS info is valid.
bool DominatedBy(const DomTreeNode *other) const {
return this->DFSNumIn >= other->DFSNumIn &&
this->DFSNumOut <= other->DFSNumOut;
}
/// assignDFSNumber - Assign In and Out numbers while walking dominator tree
/// in dfs order.
void assignDFSNumber(int num);
};
//===----------------------------------------------------------------------===//
@ -214,14 +226,16 @@ protected:
ETNode *NodeB = B->getETNode();
if (DFSInfoValid)
return NodeB->DominatedBy(NodeA);
return B->DominatedBy(A);
//return NodeB->DominatedBy(NodeA);
// If we end up with too many slow queries, just update the
// DFS numbers on the theory that we are going to keep querying.
SlowQueries++;
if (SlowQueries > 32) {
updateDFSNumbers();
return NodeB->DominatedBy(NodeA);
return B->DominatedBy(A);
//return NodeB->DominatedBy(NodeA);
}
//return NodeB->DominatedBySlow(NodeA);
return dominatedBySlowTreeWalk(A, B);

40
lib/VMCore/Dominators.cpp
View File

@ -319,9 +319,11 @@ void DominatorTreeBase::updateDFSNumbers()
BasicBlock *BB = *I;
DomTreeNode *BBNode = getNode(BB);
if (BBNode) {
ETNode *ETN = BBNode->getETNode();
if (ETN && !ETN->hasFather())
ETN->assignDFSNumber(dfsnum);
if (!BBNode->getIDom())
BBNode->assignDFSNumber(dfsnum);
//ETNode *ETN = BBNode->getETNode();
//if (ETN && !ETN->hasFather())
// ETN->assignDFSNumber(dfsnum);
}
}
SlowQueries = 0;
@ -414,6 +416,38 @@ BasicBlock *DominatorTreeBase::findNearestCommonDominator(BasicBlock *A, BasicBl
return NULL;
}
/// assignDFSNumber - Assign In and Out numbers while walking dominator tree
/// in dfs order.
void DomTreeNode::assignDFSNumber(int num) {
std::vector<DomTreeNode *> workStack;
std::set<DomTreeNode *> visitedNodes;
workStack.push_back(this);
visitedNodes.insert(this);
this->DFSNumIn = num++;
while (!workStack.empty()) {
DomTreeNode *Node = workStack.back();
bool visitChild = false;
for (std::vector<DomTreeNode*>::iterator DI = Node->begin(),
E = Node->end(); DI != E && !visitChild; ++DI) {
DomTreeNode *Child = *DI;
if (visitedNodes.count(Child) == 0) {
visitChild = true;
Child->DFSNumIn = num++;
workStack.push_back(Child);
visitedNodes.insert(Child);
}
}
if (!visitChild) {
// If we reach here means all children are visited
Node->DFSNumOut = num++;
workStack.pop_back();
}
}
}
void DomTreeNode::setIDom(DomTreeNode *NewIDom) {
assert(IDom && "No immediate dominator?");
if (IDom != NewIDom) {