1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00

[Dominators] Change Roots type to SmallVector

Summary: We can use the template parameter `IsPostDom` to pick an appropriate SmallVector size to store DomTree roots for dominators and postdominators. Before, the code would always allocate memory with `std::vector`.

Reviewers: dberlin, davide, sanjoy, grosser

Reviewed By: grosser

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D35636

llvm-svn: 309148
This commit is contained in:
Jakub Kuderski 2017-07-26 18:27:39 +00:00
parent 5ad1cf8f51
commit fc07484cd4
5 changed files with 11 additions and 11 deletions

View File

@ -47,7 +47,8 @@ protected:
using BlockTraits = GraphTraits<BlockT *>;
DomSetMapType Frontiers;
std::vector<BlockT *> Roots;
// Postdominators can have multiple roots.
SmallVector<BlockT *, IsPostDom ? 4 : 1> Roots;
static constexpr bool IsPostDominators = IsPostDom;
public:
@ -56,9 +57,7 @@ public:
/// getRoots - Return the root blocks of the current CFG. This may include
/// multiple blocks if we are computing post dominators. For forward
/// dominators, this will always be a single block (the entry node).
inline const std::vector<BlockT *> &getRoots() const {
return Roots;
}
const SmallVectorImpl<BlockT *> &getRoots() const { return Roots; }
BlockT *getRoot() const {
assert(Roots.size() == 1 && "Should always have entry node!");
@ -131,9 +130,9 @@ public:
using DomSetType = typename DominanceFrontierBase<BlockT, false>::DomSetType;
void analyze(DomTreeT &DT) {
this->Roots = DT.getRoots();
assert(this->Roots.size() == 1 &&
assert(DT.getRoots().size() == 1 &&
"Only one entry block for forward domfronts!");
this->Roots = {DT.getRoot()};
calculate(DT, DT[this->Roots[0]]);
}

View File

@ -39,7 +39,7 @@ public:
DominanceFrontierBase<MachineBasicBlock, false> &getBase() { return Base; }
inline const std::vector<MachineBasicBlock *> &getRoots() const {
const SmallVectorImpl<MachineBasicBlock *> &getRoots() const {
return Base.getRoots();
}

View File

@ -93,7 +93,7 @@ public:
/// multiple blocks if we are computing post dominators. For forward
/// dominators, this will always be a single block (the entry node).
///
inline const std::vector<MachineBasicBlock*> &getRoots() const {
inline const SmallVectorImpl<MachineBasicBlock*> &getRoots() const {
applySplitCriticalEdges();
return DT->getRoots();
}

View File

@ -37,7 +37,7 @@ public:
FunctionPass *createMachinePostDominatorTreePass();
const std::vector<MachineBasicBlock *> &getRoots() const {
const SmallVectorImpl<MachineBasicBlock *> &getRoots() const {
return DT->getRoots();
}

View File

@ -220,7 +220,8 @@ class DominatorTreeBase {
static constexpr bool IsPostDominator = IsPostDom;
protected:
std::vector<NodeT *> Roots;
// Dominators always have a single root, postdominators can have more.
SmallVector<NodeT *, IsPostDom ? 4 : 1> Roots;
using DomTreeNodeMapType =
DenseMap<NodeT *, std::unique_ptr<DomTreeNodeBase<NodeT>>>;
@ -264,7 +265,7 @@ class DominatorTreeBase {
/// multiple blocks if we are computing post dominators. For forward
/// dominators, this will always be a single block (the entry node).
///
const std::vector<NodeT *> &getRoots() const { return Roots; }
const SmallVectorImpl<NodeT *> &getRoots() const { return Roots; }
/// isPostDominator - Returns true if analysis based of postdoms
///