[llvm] 96e1320 - [VPlan] Move properlyDominates to VPDominatorTree (NFCI).
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 28 05:59:46 PDT 2024
Author: Florian Hahn
Date: 2024-08-28T13:58:12+01:00
New Revision: 96e1320a9aa8fd010b02fc6751da801c48725a02
URL: https://github.com/llvm/llvm-project/commit/96e1320a9aa8fd010b02fc6751da801c48725a02
DIFF: https://github.com/llvm/llvm-project/commit/96e1320a9aa8fd010b02fc6751da801c48725a02.diff
LOG: [VPlan] Move properlyDominates to VPDominatorTree (NFCI).
This allows for easier re-use in additional places in the future. Also
move code to VPlanAnalysis.cpp
Added:
Modified:
llvm/lib/Transforms/Vectorize/VPlan.cpp
llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h
llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.cpp b/llvm/lib/Transforms/Vectorize/VPlan.cpp
index 0f15d38a3b552f..ac322638056879 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlan.cpp
@@ -40,7 +40,6 @@
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/GenericDomTreeConstruction.h"
#include "llvm/Support/GraphWriter.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
@@ -1422,8 +1421,6 @@ void VPlanIngredient::print(raw_ostream &O) const {
#endif
-template void DomTreeBuilder::Calculate<VPDominatorTree>(VPDominatorTree &DT);
-
void VPValue::replaceAllUsesWith(VPValue *New) {
replaceUsesWithIf(New, [](VPUser &, unsigned) { return true; });
}
diff --git a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
index 6d89ad9fee8ad7..d79a7e814ecb3a 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
@@ -9,9 +9,11 @@
#include "VPlanAnalysis.h"
#include "VPlan.h"
#include "VPlanCFG.h"
+#include "VPlanDominatorTree.h"
#include "llvm/ADT/TypeSwitch.h"
#include "llvm/IR/Instruction.h"
#include "llvm/IR/PatternMatch.h"
+#include "llvm/Support/GenericDomTreeConstruction.h"
using namespace llvm;
@@ -319,3 +321,46 @@ void llvm::collectEphemeralRecipesForVPlan(
}
}
}
+
+template void DomTreeBuilder::Calculate<DominatorTreeBase<VPBlockBase, false>>(
+ DominatorTreeBase<VPBlockBase, false> &DT);
+
+bool VPDominatorTree::properlyDominates(const VPRecipeBase *A,
+ const VPRecipeBase *B) {
+ if (A == B)
+ return false;
+
+ auto LocalComesBefore = [](const VPRecipeBase *A, const VPRecipeBase *B) {
+ for (auto &R : *A->getParent()) {
+ if (&R == A)
+ return true;
+ if (&R == B)
+ return false;
+ }
+ llvm_unreachable("recipe not found");
+ };
+ const VPBlockBase *ParentA = A->getParent();
+ const VPBlockBase *ParentB = B->getParent();
+ if (ParentA == ParentB)
+ return LocalComesBefore(A, B);
+
+#ifndef NDEBUG
+ auto GetReplicateRegion = [](VPRecipeBase *R) -> VPRegionBlock * {
+ auto *Region = dyn_cast_or_null<VPRegionBlock>(R->getParent()->getParent());
+ if (Region && Region->isReplicator()) {
+ assert(Region->getNumSuccessors() == 1 &&
+ Region->getNumPredecessors() == 1 && "Expected SESE region!");
+ assert(R->getParent()->size() == 1 &&
+ "A recipe in an original replicator region must be the only "
+ "recipe in its block");
+ return Region;
+ }
+ return nullptr;
+ };
+ assert(!GetReplicateRegion(const_cast<VPRecipeBase *>(A)) &&
+ "No replicate regions expected at this point");
+ assert(!GetReplicateRegion(const_cast<VPRecipeBase *>(B)) &&
+ "No replicate regions expected at this point");
+#endif
+ return Base::properlyDominates(ParentA, ParentB);
+}
diff --git a/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h b/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h
index fc4cf709a37195..787cd940c4e266 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h
+++ b/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h
@@ -32,10 +32,17 @@ template <> struct DomTreeNodeTraits<VPBlockBase> {
static ParentPtr getParent(NodePtr B) { return B->getPlan(); }
};
-///
/// Template specialization of the standard LLVM dominator tree utility for
/// VPBlockBases.
-using VPDominatorTree = DomTreeBase<VPBlockBase>;
+class VPDominatorTree : public DominatorTreeBase<VPBlockBase, false> {
+ using Base = DominatorTreeBase<VPBlockBase, false>;
+
+public:
+ VPDominatorTree() = default;
+
+ /// Returns true if \p A properly dominates \p B.
+ bool properlyDominates(const VPRecipeBase *A, const VPRecipeBase *B);
+};
using VPDomTreeNode = DomTreeNodeBase<VPBlockBase>;
diff --git a/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp b/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
index 9237b0a6301ed2..c56fdee153f5f3 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
@@ -716,47 +716,6 @@ void VPlanTransforms::optimizeForVFAndUF(VPlan &Plan, ElementCount BestVF,
// 2. Replace vector loop region with VPBasicBlock.
}
-#ifndef NDEBUG
-static VPRegionBlock *GetReplicateRegion(VPRecipeBase *R) {
- auto *Region = dyn_cast_or_null<VPRegionBlock>(R->getParent()->getParent());
- if (Region && Region->isReplicator()) {
- assert(Region->getNumSuccessors() == 1 &&
- Region->getNumPredecessors() == 1 && "Expected SESE region!");
- assert(R->getParent()->size() == 1 &&
- "A recipe in an original replicator region must be the only "
- "recipe in its block");
- return Region;
- }
- return nullptr;
-}
-#endif
-
-static bool properlyDominates(const VPRecipeBase *A, const VPRecipeBase *B,
- VPDominatorTree &VPDT) {
- if (A == B)
- return false;
-
- auto LocalComesBefore = [](const VPRecipeBase *A, const VPRecipeBase *B) {
- for (auto &R : *A->getParent()) {
- if (&R == A)
- return true;
- if (&R == B)
- return false;
- }
- llvm_unreachable("recipe not found");
- };
- const VPBlockBase *ParentA = A->getParent();
- const VPBlockBase *ParentB = B->getParent();
- if (ParentA == ParentB)
- return LocalComesBefore(A, B);
-
- assert(!GetReplicateRegion(const_cast<VPRecipeBase *>(A)) &&
- "No replicate regions expected at this point");
- assert(!GetReplicateRegion(const_cast<VPRecipeBase *>(B)) &&
- "No replicate regions expected at this point");
- return VPDT.properlyDominates(ParentA, ParentB);
-}
-
/// Sink users of \p FOR after the recipe defining the previous value \p
/// Previous of the recurrence. \returns true if all users of \p FOR could be
/// re-arranged as needed or false if it is not possible.
@@ -776,7 +735,7 @@ sinkRecurrenceUsersAfterPrevious(VPFirstOrderRecurrencePHIRecipe *FOR,
if (isa<VPHeaderPHIRecipe>(SinkCandidate) ||
!Seen.insert(SinkCandidate).second ||
- properlyDominates(Previous, SinkCandidate, VPDT))
+ VPDT.properlyDominates(Previous, SinkCandidate))
return true;
if (SinkCandidate->mayHaveSideEffects())
@@ -803,7 +762,7 @@ sinkRecurrenceUsersAfterPrevious(VPFirstOrderRecurrencePHIRecipe *FOR,
// Keep recipes to sink ordered by dominance so earlier instructions are
// processed first.
sort(WorkList, [&VPDT](const VPRecipeBase *A, const VPRecipeBase *B) {
- return properlyDominates(A, B, VPDT);
+ return VPDT.properlyDominates(A, B);
});
for (VPRecipeBase *SinkCandidate : WorkList) {
More information about the llvm-commits
mailing list