[llvm] [VPlan][NFC] Number blocks (PR #212023)
via llvm-commits
llvm-commits at lists.llvm.org
Sat Jul 25 06:53:05 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-vectorizers
Author: Alexis Engelke (aengelke)
<details>
<summary>Changes</summary>
Assign numbers to blocks for more efficient dominator tree construction.
The number is identical to the index in CreatedBlocks of the VPlan.
This removes the last user of unnumbered graphs for dominator trees.
---
Full diff: https://github.com/llvm/llvm-project/pull/212023.diff
3 Files Affected:
- (modified) llvm/lib/Transforms/Vectorize/VPlan.cpp (+7-2)
- (modified) llvm/lib/Transforms/Vectorize/VPlan.h (+12)
- (modified) llvm/lib/Transforms/Vectorize/VPlanCFG.h (+11)
``````````diff
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.cpp b/llvm/lib/Transforms/Vectorize/VPlan.cpp
index adb2df8baa167..5f51e7638fa6b 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlan.cpp
@@ -902,8 +902,10 @@ VPlan::~VPlan() {
for (unsigned I = 0, E = R.getNumOperands(); I != E; I++)
R.setOperand(I, &DummyValue);
- for (auto *VPB : CreatedBlocks)
+ for (auto [Idx, VPB] : enumerate(CreatedBlocks)) {
+ assert(VPB->getNumber() == Idx && "block with mismatched number");
delete VPB;
+ }
for (VPValue *VPV : getLiveIns())
delete VPV;
delete BackedgeTakenCount;
@@ -1293,8 +1295,10 @@ VPlan *VPlan::duplicate() {
// current to new VPlan.
unsigned NumBlocksAfterCloning = CreatedBlocks.size();
for (unsigned I :
- seq<unsigned>(NumBlocksBeforeCloning, NumBlocksAfterCloning))
+ seq<unsigned>(NumBlocksBeforeCloning, NumBlocksAfterCloning)) {
+ this->CreatedBlocks[I]->setNumber(NewPlan->CreatedBlocks.size());
NewPlan->CreatedBlocks.push_back(this->CreatedBlocks[I]);
+ }
CreatedBlocks.truncate(NumBlocksBeforeCloning);
// Update ExitBlocks of the new plan.
@@ -1309,6 +1313,7 @@ VPlan *VPlan::duplicate() {
VPIRBasicBlock *VPlan::createEmptyVPIRBasicBlock(BasicBlock *IRBB) {
auto *VPIRBB = new VPIRBasicBlock(IRBB);
+ VPIRBB->setNumber(CreatedBlocks.size());
CreatedBlocks.push_back(VPIRBB);
return VPIRBB;
}
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
index ff4af5e0ebc9b..389b9ba872067 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -126,6 +126,9 @@ class LLVM_ABI_FOR_TEST VPBlockBase {
/// Subclass identifier (for isa/dyn_cast).
const VPBlockTy SubclassID;
+ /// Unique number.
+ unsigned Number;
+
/// Add \p Successor as the last successor to this block.
void appendSuccessor(VPBlockBase *Successor) {
assert(Successor && "Cannot add nullptr successor!");
@@ -350,6 +353,10 @@ class LLVM_ABI_FOR_TEST VPBlockBase {
return std::distance(Successors.begin(), find(Successors, Succ));
}
+ /// Set a per-plan unique number, used for dominator tree.
+ unsigned getNumber() const { return Number; }
+ void setNumber(unsigned N) { Number = N; }
+
/// The method which generates the output IR that correspond to this
/// VPBlockBase, thereby "executing" the VPlan.
virtual void execute(VPTransformState *State) = 0;
@@ -5129,6 +5136,7 @@ class VPlan {
VPBasicBlock *createVPBasicBlock(const Twine &Name,
VPRecipeBase *Recipe = nullptr) {
auto *VPB = new VPBasicBlock(Name, Recipe);
+ VPB->setNumber(CreatedBlocks.size());
CreatedBlocks.push_back(VPB);
return VPB;
}
@@ -5142,6 +5150,7 @@ class VPlan {
VPBlockBase *Entry = nullptr,
VPBlockBase *Exiting = nullptr) {
auto *VPB = new VPRegionBlock(CanIVTy, DL, Entry, Exiting, Name);
+ VPB->setNumber(CreatedBlocks.size());
CreatedBlocks.push_back(VPB);
return VPB;
}
@@ -5152,6 +5161,7 @@ class VPlan {
VPRegionBlock *createReplicateRegion(VPBlockBase *Entry, VPBlockBase *Exiting,
const std::string &Name = "") {
auto *VPB = new VPRegionBlock(Entry, Exiting, Name);
+ VPB->setNumber(CreatedBlocks.size());
CreatedBlocks.push_back(VPB);
return VPB;
}
@@ -5167,6 +5177,8 @@ class VPlan {
/// and deleted once the VPlan is destroyed.
LLVM_ABI_FOR_TEST VPIRBasicBlock *createVPIRBasicBlock(BasicBlock *IRBB);
+ unsigned getMaxBlockNumber() const { return CreatedBlocks.size(); }
+
/// Returns true if the VPlan is based on a loop with an early exit.
bool hasEarlyExit() const {
unsigned NumExitPredecessors =
diff --git a/llvm/lib/Transforms/Vectorize/VPlanCFG.h b/llvm/lib/Transforms/Vectorize/VPlanCFG.h
index 3796d12702bb0..6cfca361001e5 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanCFG.h
+++ b/llvm/lib/Transforms/Vectorize/VPlanCFG.h
@@ -310,6 +310,8 @@ template <> struct GraphTraits<VPBlockBase *> {
static inline ChildIteratorType child_end(NodeRef N) {
return ChildIteratorType::end(N);
}
+
+ static unsigned getNumber(NodeRef N) { return N->getNumber(); }
};
template <> struct GraphTraits<const VPBlockBase *> {
@@ -325,6 +327,8 @@ template <> struct GraphTraits<const VPBlockBase *> {
static inline ChildIteratorType child_end(NodeRef N) {
return ChildIteratorType::end(N);
}
+
+ static unsigned getNumber(NodeRef N) { return N->getNumber(); }
};
template <> struct GraphTraits<Inverse<VPBlockBase *>> {
@@ -341,6 +345,8 @@ template <> struct GraphTraits<Inverse<VPBlockBase *>> {
static inline ChildIteratorType child_end(NodeRef N) {
return ChildIteratorType::end(N);
}
+
+ static unsigned getNumber(NodeRef N) { return N->getNumber(); }
};
template <> struct GraphTraits<VPlan *> {
@@ -359,6 +365,11 @@ template <> struct GraphTraits<VPlan *> {
// matter.
return nodes_iterator::end(N->getEntry());
}
+
+ static unsigned getMaxNumber(GraphRef N) { return N->getMaxBlockNumber(); }
+
+ // Nodes are never renumbered.
+ static unsigned getNumberEpoch(GraphRef) { return 0; }
};
} // namespace llvm
``````````
</details>
https://github.com/llvm/llvm-project/pull/212023
More information about the llvm-commits
mailing list