forked from OSchip/llvm-project
[DomTree] Add constructor to create a new DT based on current DT/CFG and a set of Updates.
Summary: Add the posibility of creating a new DT using a set of Updates. This will essentially create a DT based on a CFG snapshot/view. Additional refactoring for either this patch or follow-ups: - create an utility for building BUI. - replace BUI with a GraphDiff. Reviewers: kuhar Subscribers: sanjoy, jlebar, llvm-commits Differential Revision: https://reviews.llvm.org/D50671 llvm-svn: 339947
This commit is contained in:
parent
883ff69c93
commit
d4b3f19ba6
|
@ -46,6 +46,9 @@ using BBPostDomTree = PostDomTreeBase<BasicBlock>;
|
|||
using BBUpdates = ArrayRef<llvm::cfg::Update<BasicBlock *>>;
|
||||
|
||||
extern template void Calculate<BBDomTree>(BBDomTree &DT);
|
||||
extern template void CalculateWithUpdates<BBDomTree>(BBDomTree &DT,
|
||||
BBUpdates U);
|
||||
|
||||
extern template void Calculate<BBPostDomTree>(BBPostDomTree &DT);
|
||||
|
||||
extern template void InsertEdge<BBDomTree>(BBDomTree &DT, BasicBlock *From,
|
||||
|
@ -145,6 +148,9 @@ class DominatorTree : public DominatorTreeBase<BasicBlock, false> {
|
|||
|
||||
DominatorTree() = default;
|
||||
explicit DominatorTree(Function &F) { recalculate(F); }
|
||||
explicit DominatorTree(DominatorTree &DT, DomTreeBuilder::BBUpdates U) {
|
||||
recalculate(*DT.Parent, U);
|
||||
}
|
||||
|
||||
/// Handle invalidation explicitly.
|
||||
bool invalidate(Function &F, const PreservedAnalyses &PA,
|
||||
|
|
|
@ -192,6 +192,10 @@ namespace DomTreeBuilder {
|
|||
template <typename DomTreeT>
|
||||
void Calculate(DomTreeT &DT);
|
||||
|
||||
template <typename DomTreeT>
|
||||
void CalculateWithUpdates(DomTreeT &DT,
|
||||
ArrayRef<typename DomTreeT::UpdateType> Updates);
|
||||
|
||||
template <typename DomTreeT>
|
||||
void InsertEdge(DomTreeT &DT, typename DomTreeT::NodePtr From,
|
||||
typename DomTreeT::NodePtr To);
|
||||
|
@ -730,6 +734,11 @@ public:
|
|||
DomTreeBuilder::Calculate(*this);
|
||||
}
|
||||
|
||||
void recalculate(ParentType &Func, ArrayRef<UpdateType> Updates) {
|
||||
Parent = &Func;
|
||||
DomTreeBuilder::CalculateWithUpdates(*this, Updates);
|
||||
}
|
||||
|
||||
/// verify - checks if the tree is correct. There are 3 level of verification:
|
||||
/// - Full -- verifies if the tree is correct by making sure all the
|
||||
/// properties (including the parent and the sibling property)
|
||||
|
|
|
@ -1576,6 +1576,25 @@ void Calculate(DomTreeT &DT) {
|
|||
SemiNCAInfo<DomTreeT>::CalculateFromScratch(DT, nullptr);
|
||||
}
|
||||
|
||||
template <typename DomTreeT>
|
||||
void CalculateWithUpdates(DomTreeT &DT,
|
||||
ArrayRef<typename DomTreeT::UpdateType> Updates) {
|
||||
// TODO: Move BUI creation in common method, reuse in ApplyUpdates.
|
||||
typename SemiNCAInfo<DomTreeT>::BatchUpdateInfo BUI;
|
||||
LLVM_DEBUG(dbgs() << "Legalizing " << BUI.Updates.size() << " updates\n");
|
||||
cfg::LegalizeUpdates<typename DomTreeT::NodePtr>(Updates, BUI.Updates,
|
||||
DomTreeT::IsPostDominator);
|
||||
const size_t NumLegalized = BUI.Updates.size();
|
||||
BUI.FutureSuccessors.reserve(NumLegalized);
|
||||
BUI.FuturePredecessors.reserve(NumLegalized);
|
||||
for (auto &U : BUI.Updates) {
|
||||
BUI.FutureSuccessors[U.getFrom()].push_back({U.getTo(), U.getKind()});
|
||||
BUI.FuturePredecessors[U.getTo()].push_back({U.getFrom(), U.getKind()});
|
||||
}
|
||||
|
||||
SemiNCAInfo<DomTreeT>::CalculateFromScratch(DT, &BUI);
|
||||
}
|
||||
|
||||
template <class DomTreeT>
|
||||
void InsertEdge(DomTreeT &DT, typename DomTreeT::NodePtr From,
|
||||
typename DomTreeT::NodePtr To) {
|
||||
|
|
|
@ -71,8 +71,13 @@ template class llvm::cfg::Update<BasicBlock *>;
|
|||
|
||||
template void llvm::DomTreeBuilder::Calculate<DomTreeBuilder::BBDomTree>(
|
||||
DomTreeBuilder::BBDomTree &DT);
|
||||
template void
|
||||
llvm::DomTreeBuilder::CalculateWithUpdates<DomTreeBuilder::BBDomTree>(
|
||||
DomTreeBuilder::BBDomTree &DT, BBUpdates U);
|
||||
|
||||
template void llvm::DomTreeBuilder::Calculate<DomTreeBuilder::BBPostDomTree>(
|
||||
DomTreeBuilder::BBPostDomTree &DT);
|
||||
// No CalculateWithUpdates<PostDomTree> instantiation, unless a usecase arises.
|
||||
|
||||
template void llvm::DomTreeBuilder::InsertEdge<DomTreeBuilder::BBDomTree>(
|
||||
DomTreeBuilder::BBDomTree &DT, BasicBlock *From, BasicBlock *To);
|
||||
|
|
Loading…
Reference in New Issue