Skip to content

[VPlan] Verify plan before optimizations. NFC #122678

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
lukel97 merged 2 commits into from
Jan 14, 2025
Merged

[VPlan] Verify plan before optimizations. NFC #122678

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3f62b2
[VPlan] Verify plan before optimizations. NFC
lukel97 Jan 13, 2025
3f15245
Move verification to tryToBuildVPlanWithVPRecipes
lukel97 Jan 13, 2025
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
13 changes: 11 additions & 2 deletions llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8837,6 +8837,8 @@ void LoopVectorizationPlanner::buildVPlansWithVPRecipes(ElementCount MinVF,
for (ElementCount VF = MinVF; ElementCount::isKnownLT(VF, MaxVFTimes2);) {
VFRange SubRange = {VF, MaxVFTimes2};
if (auto Plan = tryToBuildVPlanWithVPRecipes(SubRange)) {
assert(verifyVPlanIsValid(*Plan) && "VPlan is invalid");
Copy link
Contributor

@fhahn fhahn Jan 13, 2025

Choose a reason for hiding this comment

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

better do this at the end of tryToBuildVPlanWithVPRecipes?


// Now optimize the initial VPlan.
if (!Plan->hasVF(ElementCount::getFixed(1)))
VPlanTransforms::truncateToMinimalBitwidths(*Plan,
Expand Down Expand Up @@ -9553,6 +9555,8 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
VPRegionBlock *VectorLoopRegion = Plan->getVectorLoopRegion();
VPBasicBlock *Header = VectorLoopRegion->getEntryBasicBlock();
VPBasicBlock *MiddleVPBB = Plan->getMiddleBlock();
SmallVector<VPRecipeBase *> ToDelete;

for (VPRecipeBase &R : Header->phis()) {
auto *PhiR = dyn_cast<VPReductionPHIRecipe>(&R);
if (!PhiR || !PhiR->isInLoop() || (MinVF.isScalar() && !PhiR->isOrdered()))
Expand Down Expand Up @@ -9672,10 +9676,11 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
CM.useOrderedReductions(RdxDesc), CurrentLinkI->getDebugLoc());
// Append the recipe to the end of the VPBasicBlock because we need to
// ensure that it comes after all of it's inputs, including CondOp.
// Note that this transformation may leave over dead recipes (including
// CurrentLink), which will be cleaned by a later VPlan transform.
// Delete CurrentLink as it will be invalid if its operand is replaced
// with a reduction defined at the bottom of the block in the next link.
LinkVPBB->appendRecipe(RedRecipe);
CurrentLink->replaceAllUsesWith(RedRecipe);
ToDelete.push_back(CurrentLink);
Copy link
Contributor

@fhahn fhahn Jan 13, 2025

Choose a reason for hiding this comment

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

Is there anything from preventing us from deleting it straight away here?

Copy link
Contributor Author

@lukel97 lukel97 Jan 13, 2025

Choose a reason for hiding this comment

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

Yeah, it doesn't play well with the for (VPRecipeBase &R : Header->phis()) iterator. And we can't use make_early_inc_range either since we're deleting an instruction that's not the current iterator

PreviousLink = RedRecipe;
}
}
Expand Down Expand Up @@ -9790,6 +9795,8 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
Cmp = Builder.createNot(Cmp);
VPValue *Or = Builder.createOr(PhiR, Cmp);
Select->getVPSingleValue()->replaceAllUsesWith(Or);
// Delete Select now that it has invalid types.
ToDelete.push_back(Select);

// Convert the reduction phi to operate on bools.
PhiR->setOperand(0, Plan->getOrAddLiveIn(ConstantInt::getFalse(
Expand All @@ -9807,6 +9814,8 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
}

VPlanTransforms::clearReductionWrapFlags(*Plan);
for (VPRecipeBase *R : ToDelete)
R->eraseFromParent();
}

void VPDerivedIVRecipe::execute(VPTransformState &State) {
Expand Down
Loading