Skip to content

[VPlan][NFCI] Small code quality fixes in VPlanHCFGBuilder #134324

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

Closed
wants to merge 2 commits into from
Closed

[VPlan][NFCI] Small code quality fixes in VPlanHCFGBuilder #134324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e1ff6d
[VPlan][NFCI] Small code quality fixes in VPlanHCFGBuilder and VPlanSLP
calebwat Apr 3, 2025
5b7bd8b
Remove changes to VPlanSLP.h to be put in a separate PR.
calebwat Apr 7, 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
19 changes: 9 additions & 10 deletions llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ void PlainCFGBuilder::buildPlainCFG(
VPBasicBlock *VPBB = getOrCreateVPBB(BB);
VPRegionBlock *Region = VPBB->getParent();
Loop *LoopForBB = LI->getLoopFor(BB);
assert(LoopForBB && "Expected block to be inside a loop");
// Set VPBB predecessors in the same order as they are in the incoming BB.
if (!isHeaderBB(BB, LoopForBB)) {
setVPBBPredsFromBB(VPBB, BB);
Expand Down Expand Up @@ -423,7 +424,7 @@ void PlainCFGBuilder::buildPlainCFG(
BasicBlock *IRSucc1 = BI->getSuccessor(1);
VPBasicBlock *Successor0 = getOrCreateVPBB(IRSucc0);
VPBasicBlock *Successor1 = getOrCreateVPBB(IRSucc1);
if (BB == LoopForBB->getLoopLatch()) {
if (BB == LoopForBB->getLoopLatch() && Region) {
Copy link
Contributor

Choose a reason for hiding this comment

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

If the block is for a loop, then there must be a region?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added it to the condition since the body only affects the region, and dereferences it to do so. It might be more appropriate to have it in an assert instead, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

If anything, an assert should be added. FYI the code will probably go away in the near future: #129402

// For a latch we need to set the successor of the region rather than that
// of VPBB and it should be set to the exit, i.e., non-header successor,
// except for the top region, which is handled elsewhere.
Expand All @@ -437,15 +438,13 @@ void PlainCFGBuilder::buildPlainCFG(

// Don't connect any blocks outside the current loop except the latch for
// now. The latch is handled above.
if (LoopForBB) {
if (!LoopForBB->contains(IRSucc0)) {
VPBB->setOneSuccessor(Successor1);
continue;
}
if (!LoopForBB->contains(IRSucc1)) {
VPBB->setOneSuccessor(Successor0);
continue;
}
if (!LoopForBB->contains(IRSucc0)) {
VPBB->setOneSuccessor(Successor1);
continue;
}
if (!LoopForBB->contains(IRSucc1)) {
VPBB->setOneSuccessor(Successor0);
continue;
}

VPBB->setTwoSuccessors(Successor0, Successor1);
Expand Down