Page MenuHomePhabricator

[VPlan] Use Exiting-block instead of Exit-block terminology (NFC).
ClosedPublic

Authored by fhahn on May 22 2022, 12:34 PM.

Details

Summary

In LLVM's common loop terminology, an exit block is a block outside a
loop with a predecessor inside the loop. An exiting block is a block
inside the loop which branches to an exit block outside the loop.

This patch updates a few places where VPlan was using ExitBlock for a
block exiting a region. Those instances have been updated to use
ExitingBlock.

Diff Detail

Event Timeline

fhahn created this revision.May 22 2022, 12:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 22 2022, 12:34 PM
fhahn requested review of this revision.May 22 2022, 12:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 22 2022, 12:34 PM
Herald added a subscriber: vkmr. · View Herald Transcript
Ayal accepted this revision.May 22 2022, 2:59 PM

Thanks for following up! Minor nits to help keep consistency.

llvm/lib/Transforms/Vectorize/VPlan.cpp
178–179

not the exiting?

301

the exiting block?

307–308

ditto

333

ExitBB should remain as such, right?

348

should the above read "the exiting VPBB of this region"?

1189–1190

// exiting basic block ?

llvm/lib/Transforms/Vectorize/VPlan.h
496

... the exiting VPBasicBlock of this VPBlockBase?

2137

"Exiting block ...

llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
332

LoopExitingVPBB?

llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp
133

region exit(ing) ? In terms of domination they are close...

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
97

Exit >> Exiting?

173–174

ditto

This revision is now accepted and ready to land.May 22 2022, 2:59 PM
This revision was landed with ongoing or failed builds.May 28 2022, 1:16 PM
This revision was automatically updated to reflect the committed changes.
fhahn marked 10 inline comments as done.
fhahn added a comment.May 28 2022, 1:18 PM

Thanks Ayal! Comments should be updated in the committed version.

llvm/lib/Transforms/Vectorize/VPlan.cpp
333

Yes, it is the block we exit to.

llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
332

This is an oddity of the current outer-loop VPlans. Should be cleaned up in D123005