[Dominators] Teach LoopDeletion to use the new incremental API
Summary:
This patch makes LoopDeletion use the incremental DominatorTree API.
We modify LoopDeletion to perform the deletion in 5 steps:
1. Create a new dummy edge from the preheader to the exit, by adding a conditional branch.
2. Inform the DomTree about the new edge.
3. Remove the conditional branch and replace it with an unconditional edge to the exit. This removes the edge to the loop header, making it unreachable.
4. Inform the DomTree about the deleted edge.
5. Remove the unreachable block from the function.
Creating the dummy conditional branch is necessary to perform incremental DomTree update.
We should consider using the batch updater when it's ready.
Reviewers: dberlin, davide, grosser, sanjoy
Reviewed By: dberlin, grosser
Subscribers: mzolotukhin, llvm-commits
Differential Revision: https://reviews.llvm.org/D35391
llvm-svn: 309850
diff --git a/llvm/unittests/IR/DominatorTreeTest.cpp b/llvm/unittests/IR/DominatorTreeTest.cpp
index 5856d55..da5d502 100644
--- a/llvm/unittests/IR/DominatorTreeTest.cpp
+++ b/llvm/unittests/IR/DominatorTreeTest.cpp
@@ -797,6 +797,36 @@
}
}
+TEST(DominatorTree, DeletionsInSubtrees) {
+ CFGHolder Holder;
+ std::vector<CFGBuilder::Arc> Arcs = {{"0", "1"}, {"1", "2"}, {"1", "3"},
+ {"1", "6"}, {"3", "4"}, {"2", "5"},
+ {"5", "2"}};
+
+ // It is possible to perform multiple deletions and inform the
+ // DominatorTree about them at the same time, if the all of the
+ // deletions happen in different subtrees.
+ std::vector<CFGBuilder::Update> Updates = {{Delete, {"1", "2"}},
+ {Delete, {"1", "3"}}};
+ CFGBuilder B(Holder.F, Arcs, Updates);
+ DominatorTree DT(*Holder.F);
+ EXPECT_TRUE(DT.verify());
+
+ Optional<CFGBuilder::Update> LastUpdate;
+ while ((LastUpdate = B.applyUpdate()))
+ ;
+
+ DT.deleteEdge(B.getOrAddBlock("1"), B.getOrAddBlock("2"));
+ DT.deleteEdge(B.getOrAddBlock("1"), B.getOrAddBlock("3"));
+
+ EXPECT_TRUE(DT.verify());
+ EXPECT_EQ(DT.getNode(B.getOrAddBlock("2")), nullptr);
+ EXPECT_EQ(DT.getNode(B.getOrAddBlock("3")), nullptr);
+ EXPECT_EQ(DT.getNode(B.getOrAddBlock("4")), nullptr);
+ EXPECT_EQ(DT.getNode(B.getOrAddBlock("5")), nullptr);
+ EXPECT_NE(DT.getNode(B.getOrAddBlock("6")), nullptr);
+}
+
TEST(DominatorTree, InsertDelete) {
std::vector<CFGBuilder::Arc> Arcs = {
{"1", "2"}, {"2", "3"}, {"3", "4"}, {"4", "5"}, {"5", "6"}, {"5", "7"},