[PATCH] D133666: pVplan] Add VPValue::isDefinedOutsideVectorRegions helper (NFC).
Florian Hahn via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 17 04:14:58 PDT 2022
fhahn updated this revision to Diff 468156.
fhahn added a comment.
Reorder code as suggested, apologies for the delay
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D133666/new/
https://reviews.llvm.org/D133666
Files:
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
llvm/lib/Transforms/Vectorize/VPlan.h
llvm/lib/Transforms/Vectorize/VPlanValue.h
Index: llvm/lib/Transforms/Vectorize/VPlanValue.h
===================================================================
--- llvm/lib/Transforms/Vectorize/VPlanValue.h
+++ llvm/lib/Transforms/Vectorize/VPlanValue.h
@@ -198,6 +198,11 @@
"VPValue is not a live-in; it is defined by a VPDef inside a VPlan");
return getUnderlyingValue();
}
+
+ /// Returns true if the VPValue is defined outside any vector regions, i.e. it
+ /// is a live-in value.
+ /// TODO: Also handle recipes defined in pre-header blocks.
+ bool isDefinedOutsideVectorRegions() const { return !getDef(); }
};
typedef DenseMap<Value *, VPValue *> Value2VPValueTy;
Index: llvm/lib/Transforms/Vectorize/VPlan.h
===================================================================
--- llvm/lib/Transforms/Vectorize/VPlan.h
+++ llvm/lib/Transforms/Vectorize/VPlan.h
@@ -3055,13 +3055,15 @@
/// Returns true if \p VPV is uniform after vectorization.
inline bool isUniformAfterVectorization(VPValue *VPV) {
- if (auto *Def = VPV->getDef()) {
- if (auto Rep = dyn_cast<VPReplicateRecipe>(Def))
- return Rep->isUniform();
- return false;
- }
- // A value without a def is external to vplan and thus uniform.
- return true;
+ // A value defined outside the vector region must be uniform after
+ // vectorization inside a vector region.
+ if (VPV->isDefinedOutsideVectorRegions())
+ return true;
+ VPDef *Def = VPV->getDef();
+ assert(Def && "Must have definition for value defined inside vector region");
+ if (auto Rep = dyn_cast<VPReplicateRecipe>(Def))
+ return Rep->isUniform();
+ return false;
}
} // end namespace vputils
Index: llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
===================================================================
--- llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -9659,7 +9659,9 @@
// If the recipe is uniform across all parts (instead of just per VF), only
// generate a single instance.
if ((isa<LoadInst>(UI) || isa<StoreInst>(UI)) &&
- all_of(operands(), [](VPValue *Op) { return !Op->getDef(); })) {
+ all_of(operands(), [](VPValue *Op) {
+ return Op->isDefinedOutsideVectorRegions();
+ })) {
State.ILV->scalarizeInstruction(UI, this, VPIteration(0, 0), IsPredicated,
State);
if (user_begin() != user_end()) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D133666.468156.patch
Type: text/x-patch
Size: 2427 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221017/6811b443/attachment.bin>
More information about the llvm-commits
mailing list