[llvm] 0888eaf - [Loop Fusion] Use pred_empty and succ_empty (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 15 20:33:14 PST 2020
Author: Kazu Hirata
Date: 2020-11-15T20:32:57-08:00
New Revision: 0888eaf3fde66336f03a091086e733a3d860e296
URL: https://github.com/llvm/llvm-project/commit/0888eaf3fde66336f03a091086e733a3d860e296
DIFF: https://github.com/llvm/llvm-project/commit/0888eaf3fde66336f03a091086e733a3d860e296.diff
LOG: [Loop Fusion] Use pred_empty and succ_empty (NFC)
Added:
Modified:
llvm/lib/Transforms/Scalar/LoopFuse.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Scalar/LoopFuse.cpp b/llvm/lib/Transforms/Scalar/LoopFuse.cpp
index 6ad63d0673a7..4d63ed90096c 100644
--- a/llvm/lib/Transforms/Scalar/LoopFuse.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopFuse.cpp
@@ -1392,7 +1392,7 @@ struct LoopFuser {
}
// The pre-header of L1 is not necessary anymore.
- assert(pred_begin(FC1.Preheader) == pred_end(FC1.Preheader));
+ assert(pred_empty(FC1.Preheader));
FC1.Preheader->getTerminator()->eraseFromParent();
new UnreachableInst(FC1.Preheader->getContext(), FC1.Preheader);
TreeUpdates.emplace_back(DominatorTree::UpdateType(
@@ -1610,9 +1610,9 @@ struct LoopFuser {
FC0ExitBlockSuccessor);
}
- assert(pred_begin(FC1GuardBlock) == pred_end(FC1GuardBlock) &&
+ assert(pred_empty(FC1GuardBlock) &&
"Expecting guard block to have no predecessors");
- assert(succ_begin(FC1GuardBlock) == succ_end(FC1GuardBlock) &&
+ assert(succ_empty(FC1GuardBlock) &&
"Expecting guard block to have no successors");
// Remember the phi nodes originally in the header of FC0 in order to rewire
@@ -1666,14 +1666,13 @@ struct LoopFuser {
// TODO: In the future, we can handle non-empty exit blocks my merging any
// instructions from FC0 exit block into FC1 exit block prior to removing
// the block.
- assert(pred_begin(FC0.ExitBlock) == pred_end(FC0.ExitBlock) &&
- "Expecting exit block to be empty");
+ assert(pred_empty(FC0.ExitBlock) && "Expecting exit block to be empty");
FC0.ExitBlock->getTerminator()->eraseFromParent();
new UnreachableInst(FC0.ExitBlock->getContext(), FC0.ExitBlock);
// Remove FC1 Preheader
// The pre-header of L1 is not necessary anymore.
- assert(pred_begin(FC1.Preheader) == pred_end(FC1.Preheader));
+ assert(pred_empty(FC1.Preheader));
FC1.Preheader->getTerminator()->eraseFromParent();
new UnreachableInst(FC1.Preheader->getContext(), FC1.Preheader);
TreeUpdates.emplace_back(DominatorTree::UpdateType(
@@ -1736,10 +1735,8 @@ struct LoopFuser {
// All done
// Apply the updates to the Dominator Tree and cleanup.
- assert(succ_begin(FC1GuardBlock) == succ_end(FC1GuardBlock) &&
- "FC1GuardBlock has successors!!");
- assert(pred_begin(FC1GuardBlock) == pred_end(FC1GuardBlock) &&
- "FC1GuardBlock has predecessors!!");
+ assert(succ_empty(FC1GuardBlock) && "FC1GuardBlock has successors!!");
+ assert(pred_empty(FC1GuardBlock) && "FC1GuardBlock has predecessors!!");
// Update DT/PDT
DTU.applyUpdates(TreeUpdates);
More information about the llvm-commits
mailing list