Skip to content

[VPlan] Retain exit conditions and edges in initial VPlan (NFC). #137709

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
merged 15 commits into from
May 8, 2025
Merged

[VPlan] Retain exit conditions and edges in initial VPlan (NFC). #137709

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
de0fc2d
[VPlan] Retain exit conditions and edges in initial VPlan (NFC).
fhahn Apr 28, 2025
19bec82
Merge remote-tracking branch 'origin/main' into vplan-retain-exits
fhahn May 6, 2025
55b4d5e
!fixup address first set of comments, thanks
fhahn May 6, 2025
ca45f88
!fixup address remaining comments, thanks
fhahn May 6, 2025
ddfdeef
Merge remote-tracking branch 'origin/main' into vplan-retain-exits
fhahn May 6, 2025
1284bc6
!fixup add back assertion in replacePredecessors.
fhahn May 6, 2025
79317a5
Merge remote-tracking branch 'origin/main' into vplan-retain-exits
fhahn May 7, 2025
3cc4b31
!fixup address latest comments, thanks!
fhahn May 7, 2025
bbb902e
!fixup only construct one region
fhahn May 7, 2025
c1902ed
!fixup update llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
fhahn May 7, 2025
0cadcf9
!fixup address comments, thanks!
fhahn May 7, 2025
5fa6b7d
Merge remote-tracking branch 'origin/main' into vplan-retain-exits
fhahn May 7, 2025
5d6729d
!fixup address latest comments, thanks
fhahn May 7, 2025
1211faf
!fixup remove ExitBlocks.
fhahn May 7, 2025
50d7ee1
Merge branch 'main' into vplan-retain-exits
fhahn May 8, 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
9 changes: 4 additions & 5 deletions llvm/lib/Transforms/Vectorize/VPlanConstruction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,13 +422,11 @@ static void createLoopRegion(VPlan &Plan, VPBlockBase *HeaderVPB) {
R->setEntry(HeaderVPB);
R->setExiting(LatchVPBB);

// All VPBB's reachable shallowly from HeaderVPB belong to the current region,
// except the exit blocks reachable via non-latch exiting blocks.
// All VPBB's reachable shallowly from HeaderVPB belong to the current region.
SmallPtrSet<VPBlockBase *, 2> ExitBlocks(Plan.getExitBlocks().begin(),
Plan.getExitBlocks().end());
Copy link
Collaborator

@ayalz ayalz May 7, 2025

Choose a reason for hiding this comment

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

Suggested change
SmallPtrSet<VPBlockBase *, 2> ExitBlocks(Plan.getExitBlocks().begin(),
Plan.getExitBlocks().end());

?

Copy link
Contributor Author

@fhahn fhahn May 7, 2025

Choose a reason for hiding this comment

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

removed thanks

for (VPBlockBase *VPBB : vp_depth_first_shallow(HeaderVPB))
if (!ExitBlocks.contains(VPBB))
VPBB->setParent(R);
VPBB->setParent(R);
}

// Add the necessary canonical IV and branch recipes required to control the
Expand Down Expand Up @@ -546,7 +544,8 @@ void VPlanTransforms::prepareForVectorization(VPlan &Plan, Type *InductionTy,
return;
}

// The connection order corresponds to the operands of the conditional branch.
// The connection order corresponds to the operands of the conditional branch,
// with the middle block already connected to the exit block.
VPBlockUtils::connectBlocks(MiddleVPBB, ScalarPH);

auto *ScalarLatchTerm = TheLoop->getLoopLatch()->getTerminator();
Expand Down
Loading