[llvm] 1173687 - [VPlan] Use NeedsSingleScalar consistently for ::get (NFC). (#226494)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 25 14:23:08 PDT 2026
Author: Florian Hahn
Date: 2026-09-25T21:23:01Z
New Revision: 1173687801b5ab1e996f1aef21b760318e5da8c9
URL: https://github.com/llvm/llvm-project/commit/1173687801b5ab1e996f1aef21b760318e5da8c9
DIFF: https://github.com/llvm/llvm-project/commit/1173687801b5ab1e996f1aef21b760318e5da8c9.diff
LOG: [VPlan] Use NeedsSingleScalar consistently for ::get (NFC). (#226494)
IsScalar/IsSingleScalar as used currently may be consfusing, as it could
be read as implying that the VPValue is a single-scalar, see
https://github.com/llvm/llvm-project/pull/226153.
But here it means that the caller only needs a single scalar. Update
wording.
PR: https://github.com/llvm/llvm-project/pull/226494
Added:
Modified:
llvm/lib/Transforms/Vectorize/VPlan.cpp
llvm/lib/Transforms/Vectorize/VPlanHelpers.h
llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.cpp b/llvm/lib/Transforms/Vectorize/VPlan.cpp
index 80d98af8354d2..3cdad5161321a 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlan.cpp
@@ -279,10 +279,10 @@ Value *VPTransformState::get(const VPValue *Def, const VPLane &Lane) {
return Extract;
}
-Value *VPTransformState::get(const VPValue *Def, bool NeedsScalar) {
+Value *VPTransformState::get(const VPValue *Def, bool NeedsSingleScalar) {
assert(!isa<VPRegionValue>(Def) &&
"VPRegionValue must be materialized before VPTransformState::get");
- if (NeedsScalar) {
+ if (NeedsSingleScalar) {
assert((VF.isScalar() || isa<VPIRValue, VPSymbolicValue>(Def) ||
hasVectorValue(Def) || !vputils::onlyFirstLaneUsed(Def) ||
(hasScalarValue(Def, VPLane(0)) &&
@@ -350,12 +350,12 @@ void VPTransformState::fixupHeaderPhis() {
for (VPRecipeBase &R : Header->phis()) {
auto *PhiR = cast<VPSingleDefRecipe>(&R);
- bool NeedsScalar =
+ bool NeedsSingleScalar =
isa<VPPhi>(PhiR) || (isa<VPReductionPHIRecipe>(PhiR) &&
cast<VPReductionPHIRecipe>(PhiR)->isInLoop());
- Value *Phi = get(PhiR, NeedsScalar);
- Value *Val = get(PhiR->getOperand(1), NeedsScalar);
+ Value *Phi = get(PhiR, NeedsSingleScalar);
+ Value *Val = get(PhiR->getOperand(1), NeedsSingleScalar);
cast<PHINode>(Phi)->addIncoming(Val, VectorLatchBB);
}
}
diff --git a/llvm/lib/Transforms/Vectorize/VPlanHelpers.h b/llvm/lib/Transforms/Vectorize/VPlanHelpers.h
index e20ec00a30aaa..2d1032bd94a91 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanHelpers.h
+++ b/llvm/lib/Transforms/Vectorize/VPlanHelpers.h
@@ -210,9 +210,10 @@ struct VPTransformState {
DenseMap<const VPValue *, SmallVector<Value *, 4>> VPV2Scalars;
} Data;
- /// Get the generated vector Value for a given VPValue \p Def if \p IsScalar
- /// is false, otherwise return the generated scalar. \See set.
- Value *get(const VPValue *Def, bool IsScalar = false);
+ /// Get the generated vector Value for a given VPValue \p Def if
+ /// \p NeedsSingleScalar is false, otherwise return the generated scalar.
+ /// \See set.
+ Value *get(const VPValue *Def, bool NeedsSingleScalar = false);
/// Get the generated Value for a given VPValue and given Part and Lane.
Value *get(const VPValue *Def, const VPLane &Lane);
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index 4faf7c3db1e92..b2df7c33227e9 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -777,14 +777,14 @@ Value *VPInstruction::generate(VPTransformState &State) {
if (auto *Idx = dyn_cast<VPConstantInt>(getOperand(1)))
return State.get(getOperand(0), VPLane(Idx->getZExtValue()));
Value *Vec = State.get(getOperand(0));
- Value *Idx = State.get(getOperand(1), /*IsScalar=*/true);
+ Value *Idx = State.get(getOperand(1), /*NeedsSingleScalar=*/true);
return Builder.CreateExtractElement(Vec, Idx, Name);
}
case Instruction::InsertElement: {
assert(State.VF.isVector() && "Can only insert elements into vectors");
- Value *Vec = State.get(getOperand(0), /*IsScalar=*/false);
- Value *Elt = State.get(getOperand(1), /*IsScalar=*/true);
- Value *Idx = State.get(getOperand(2), /*IsScalar=*/true);
+ Value *Vec = State.get(getOperand(0), /*NeedsSingleScalar=*/false);
+ Value *Elt = State.get(getOperand(1), /*NeedsSingleScalar=*/true);
+ Value *Idx = State.get(getOperand(2), /*NeedsSingleScalar=*/true);
return Builder.CreateInsertElement(Vec, Elt, Idx, Name);
}
case Instruction::Freeze: {
@@ -869,7 +869,7 @@ Value *VPInstruction::generate(VPTransformState &State) {
case VPInstruction::ExplicitVectorLength: {
// TODO: Restructure this code with an explicit remainder loop, vsetvli can
// be outside of the main loop.
- Value *AVL = State.get(getOperand(0), /*IsScalar*/ true);
+ Value *AVL = State.get(getOperand(0), /*NeedsSingleScalar=*/true);
// Compute EVL
assert(AVL->getType()->isIntegerTy() &&
"Requested vector length should be an integer.");
@@ -901,7 +901,8 @@ Value *VPInstruction::generate(VPTransformState &State) {
}
case VPInstruction::Broadcast: {
return Builder.CreateVectorSplat(
- State.VF, State.get(getOperand(0), /*IsScalar*/ true), "broadcast");
+ State.VF, State.get(getOperand(0), /*NeedsSingleScalar=*/true),
+ "broadcast");
}
case VPInstruction::BuildStructVector: {
// For struct types, we need to build a new 'wide' struct type, where each
@@ -1109,7 +1110,7 @@ Value *VPInstruction::generate(VPTransformState &State) {
case VPInstruction::Reverse:
return Builder.CreateVectorReverse(State.get(getOperand(0)), "reverse");
case VPInstruction::ExtractLastActive: {
- Value *Result = State.get(getOperand(0), /*IsScalar=*/true);
+ Value *Result = State.get(getOperand(0), /*NeedsSingleScalar=*/true);
for (unsigned Idx = 1; Idx < getNumOperands(); Idx += 2) {
Value *Data = State.get(getOperand(Idx));
Value *Mask = State.get(getOperand(Idx + 1));
@@ -1142,7 +1143,7 @@ Value *VPInstruction::generate(VPTransformState &State) {
case VPInstruction::Intrinsic: {
SmallVector<Value *, 2> Args;
for (VPValue *Op : drop_end(operands()))
- Args.push_back(State.get(Op, /*IsSingleScalar=*/true));
+ Args.push_back(State.get(Op, /*NeedsSingleScalar=*/true));
return State.Builder.CreateIntrinsic(getScalarType(),
vputils::getIntrinsicID(this), Args,
/*FMFSource=*/nullptr, getName());
@@ -2472,7 +2473,7 @@ void VPHistogramRecipe::execute(VPTransformState &State) {
IRBuilderBase &Builder = State.Builder;
Value *Address = State.get(getOperand(0));
- Value *IncAmt = State.get(getOperand(1), /*IsScalar=*/true);
+ Value *IncAmt = State.get(getOperand(1), /*NeedsSingleScalar=*/true);
VectorType *VTy = cast<VectorType>(Address->getType());
// The histogram intrinsic requires a mask even if the recipe doesn't;
@@ -3479,7 +3480,7 @@ void VPReductionRecipe::execute(VPTransformState &State) {
Value *NewRed;
Value *NextInChain;
if (isOrdered()) {
- Value *PrevInChain = State.get(getChainOp(), /*IsScalar*/ true);
+ Value *PrevInChain = State.get(getChainOp(), /*NeedsSingleScalar=*/true);
if (State.VF.isVector())
NewRed =
createOrderedReduction(State.Builder, Kind, NewVecOp, PrevInChain);
@@ -3492,7 +3493,7 @@ void VPReductionRecipe::execute(VPTransformState &State) {
} else if (isPartialReduction()) {
assert((Kind == RecurKind::Add || Kind == RecurKind::FAdd) &&
"Unexpected partial reduction kind");
- Value *PrevInChain = State.get(getChainOp(), /*IsScalar*/ false);
+ Value *PrevInChain = State.get(getChainOp(), /*NeedsSingleScalar=*/false);
NewRed = State.Builder.CreateIntrinsic(
PrevInChain->getType(),
Kind == RecurKind::Add ? Intrinsic::vector_partial_reduce_add
@@ -3504,7 +3505,7 @@ void VPReductionRecipe::execute(VPTransformState &State) {
} else {
assert(isInLoop() &&
"The reduction must either be ordered, partial or in-loop");
- Value *PrevInChain = State.get(getChainOp(), /*IsScalar*/ true);
+ Value *PrevInChain = State.get(getChainOp(), /*NeedsSingleScalar=*/true);
NewRed = createSimpleReduction(State.Builder, NewVecOp, Kind);
if (RecurrenceDescriptor::isMinMaxRecurrenceKind(Kind))
NextInChain = createMinMaxOp(State.Builder, Kind, NewRed, PrevInChain);
@@ -3526,7 +3527,8 @@ void VPReductionEVLRecipe::execute(VPTransformState &State) {
Builder.setFastMathFlags(getFastMathFlagsOrNone());
RecurKind Kind = getRecurrenceKind();
- Value *Prev = State.get(getChainOp(), /*IsScalar*/ !isPartialReduction());
+ Value *Prev =
+ State.get(getChainOp(), /*NeedsSingleScalar=*/!isPartialReduction());
Value *VecOp = State.get(getVecOp());
Value *EVL = State.get(getEVL(), VPLane(0));
@@ -4348,7 +4350,7 @@ void VPWidenLoadRecipe::execute(VPTransformState &State) {
if (auto *VPMask = getMask())
Mask = State.get(VPMask);
- Value *Addr = State.get(getAddr(), /*IsScalar*/ !CreateGather);
+ Value *Addr = State.get(getAddr(), /*NeedsSingleScalar=*/!CreateGather);
Value *NewLI;
if (CreateGather) {
NewLI = Builder.CreateMaskedGather(DataTy, Addr, Alignment, Mask, nullptr,
@@ -4442,7 +4444,7 @@ void VPWidenStoreRecipe::execute(VPTransformState &State) {
Mask = State.get(VPMask);
Value *StoredVal = State.get(StoredVPValue);
- Value *Addr = State.get(getAddr(), /*IsScalar*/ !CreateScatter);
+ Value *Addr = State.get(getAddr(), /*NeedsSingleScalar=*/!CreateScatter);
Instruction *NewSI = nullptr;
if (CreateScatter)
NewSI = Builder.CreateMaskedScatter(StoredVal, Addr, Alignment, Mask);
More information about the llvm-commits
mailing list