Skip to content

[VPlan] Assert operand correctness at construction. (NFC) #200686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fhahn merged 3 commits into from
Jun 1, 2026
Merged

[VPlan] Assert operand correctness at construction. (NFC) #200686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c85db2
[VPlan] Assert operand correctness at construction. (NFC)
fhahn May 30, 2026
e2cc94f
!fixup fix failing testts
fhahn Jun 1, 2026
4a3ff78
Merge branch 'main' into vplan-assert-operands-at-construction
fhahn Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion llvm/lib/Transforms/Vectorize/VPlan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2711,7 +2711,13 @@ class LLVM_ABI_FOR_TEST VPWidenPHIRecipe : public VPSingleDefRecipe,
: VPSingleDefRecipe(VPRecipeBase::VPWidenPHISC, IncomingValues,
getScalarTypeOrInfer(IncomingValues[0]),
/*UV=*/nullptr, DL),
Name(Name.str()) {}
Name(Name.str()) {
assert(all_of(IncomingValues,
[this](VPValue *VPV) {
return VPV->getScalarType() == getScalarType();
}) &&
"all incoming values must have the same type");
}

VPWidenPHIRecipe *clone() override {
return new VPWidenPHIRecipe(operands(), getDebugLoc(), Name);
Expand Down Expand Up @@ -2912,6 +2918,17 @@ class LLVM_ABI_FOR_TEST VPBlendRecipe : public VPRecipeWithIRFlags {
: VPRecipeWithIRFlags(VPRecipeBase::VPBlendSC, Operands,
Operands[0]->getScalarType(), Flags, DL) {
assert(Operands.size() >= 2 && "Expected at least two operands!");
assert(all_of(seq<unsigned>(0, getNumIncomingValues()),
[this](unsigned I) {
return getIncomingValue(I)->getScalarType() ==
getScalarType();
}) &&
"all incoming values must have the same type");
assert(all_of(seq<unsigned>(isNormalized(), getNumIncomingValues()),
[this](unsigned I) {
return getMask(I)->getScalarType()->isIntegerTy(1);
}) &&
"masks must be a bool");
setUnderlyingValue(Phi);
}

Expand Down Expand Up @@ -3181,7 +3198,17 @@ class LLVM_ABI_FOR_TEST VPReductionRecipe : public VPRecipeWithIRFlags {
: VPRecipeWithIRFlags(SC, Operands, Operands[0]->getScalarType(), FMFs,
DL),
RdxKind(RdxKind), Style(Style) {
assert(all_of(Operands,
[this](VPValue *VPV) {
return VPV->getScalarType() == getScalarType() ||

@lukel97 lukel97 Jun 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because the EVL can be an operand in a FP reduction right?

@fhahn fhahn Jun 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it gets added as operand for VPReductionEVLRecipe

(isa<VPInstruction>(VPV) &&
cast<VPInstruction>(VPV)->getOpcode() ==
VPInstruction::ExplicitVectorLength);
Comment thread
lukel97 marked this conversation as resolved.
}) &&
"all incoming values must have the same type");
if (CondOp) {
assert(CondOp->getScalarType()->isIntegerTy(1) &&
"CondOp must be a bool");
IsConditional = true;
addOperand(CondOp);
}
Expand Down
10 changes: 5 additions & 5 deletions llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ TEST_F(VPRecipeTest, CastVPBlendRecipeToVPUser) {

VPValue *I1 = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 1));
VPValue *I2 = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 2));
VPValue *M2 = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 3));
VPValue *M2 = Plan.getOrAddLiveIn(ConstantInt::getTrue(C));
SmallVector<VPValue *, 4> Args;
Args.push_back(I1);
Args.push_back(I2);
Expand Down Expand Up @@ -1397,7 +1397,7 @@ TEST_F(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
{
VPValue *ChainOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 1));
VPValue *VecOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 2));
VPValue *CondOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 3));
VPValue *CondOp = Plan.getOrAddLiveIn(ConstantInt::getTrue(C));
VPReductionRecipe Recipe(RecurKind::Add, FastMathFlags(), ChainOp, VecOp,
CondOp, RdxUnordered{});
EXPECT_FALSE(Recipe.mayHaveSideEffects());
Expand All @@ -1409,7 +1409,7 @@ TEST_F(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
{
VPValue *ChainOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 1));
VPValue *VecOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 2));
VPValue *CondOp = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 3));
VPValue *CondOp = Plan.getOrAddLiveIn(ConstantInt::getTrue(C));
VPReductionRecipe Recipe(RecurKind::Add, FastMathFlags(), ChainOp, VecOp,
CondOp, RdxUnordered{});
VPValue *EVL = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 4));
Expand Down Expand Up @@ -1741,7 +1741,7 @@ TEST_F(VPRecipeTest, CastVPReductionRecipeToVPUser) {
IntegerType *Int32 = IntegerType::get(C, 32);
VPValue *ChainOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 1));
VPValue *VecOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 2));
VPValue *CondOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 3));
VPValue *CondOp = getPlan().getOrAddLiveIn(ConstantInt::getTrue(C));
VPReductionRecipe Recipe(RecurKind::Add, FastMathFlags(), ChainOp, VecOp,
CondOp, RdxUnordered{});
checkVPRecipeCastImpl<VPReductionRecipe, VPUser>(&Recipe);
Expand All @@ -1754,7 +1754,7 @@ TEST_F(VPRecipeTest, CastVPReductionEVLRecipeToVPUser) {
IntegerType *Int32 = IntegerType::get(C, 32);
VPValue *ChainOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 1));
VPValue *VecOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 2));
VPValue *CondOp = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 3));
VPValue *CondOp = getPlan().getOrAddLiveIn(ConstantInt::getTrue(C));
VPReductionRecipe Recipe(RecurKind::Add, FastMathFlags(), ChainOp, VecOp,
CondOp, RdxUnordered{});
VPValue *EVL = getPlan().getOrAddLiveIn(ConstantInt::get(Int32, 0));
Expand Down
Loading