-
Notifications
You must be signed in to change notification settings - Fork 13.6k
[VPlan] Connect Entry to scalar preheader during initial construction. #140132
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.
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
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d481278
[VPlan] Connect Entry to scalar preheader during initial construction.
fhahn 76212e6
Merge remote-tracking branch 'origin/main' into vplan-connect-scalar-…
fhahn a324d27
!fixup address latest comments, thanks!
fhahn 2ad3e76
Merge remote-tracking branch 'origin/main' into vplan-connect-scalar-…
fhahn f4a28d4
!fixup address latest comments, thanks
fhahn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev
Previous commit
!fixup address latest comments, thanks
- Loading branch information
commit f4a28d47881e1fd1c99fa73c21340a5cbda43b18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -2366,6 +2366,8 @@ InnerLoopVectorizer::getOrCreateVectorTripCount(BasicBlock *InsertBlock) { | |||||
} | ||||||
|
||||||
void InnerLoopVectorizer::introduceCheckBlockInVPlan(BasicBlock *CheckIRBB) { | ||||||
// Note: The block with the minimum trip-count check is already connected | ||||||
// during earlier VPlan construction. | ||||||
VPBlockBase *ScalarPH = Plan.getScalarPreheader(); | ||||||
VPBlockBase *PreVectorPH = VectorPHVPB->getSinglePredecessor(); | ||||||
assert(PreVectorPH->getNumSuccessors() == 2 && "Expected 2 successors"); | ||||||
|
@@ -2463,6 +2465,10 @@ void InnerLoopVectorizer::emitIterationCountCheck(BasicBlock *Bypass) { | |||||
setBranchWeights(BI, MinItersBypassWeights, /*IsExpected=*/false); | ||||||
ReplaceInstWithInst(TCCheckBlock->getTerminator(), &BI); | ||||||
LoopBypassBlocks.push_back(TCCheckBlock); | ||||||
|
||||||
assert(cast<VPIRBasicBlock>(Plan.getEntry())->getIRBasicBlock() == | ||||||
TCCheckBlock && | ||||||
"Plan's entry must be TCCCheckBlock"); | ||||||
} | ||||||
|
||||||
BasicBlock *InnerLoopVectorizer::emitSCEVChecks(BasicBlock *Bypass) { | ||||||
|
@@ -7893,8 +7899,10 @@ EpilogueVectorizerMainLoop::emitIterationCountCheck(BasicBlock *Bypass, | |||||
setBranchWeights(BI, MinItersBypassWeights, /*IsExpected=*/false); | ||||||
ReplaceInstWithInst(TCCheckBlock->getTerminator(), &BI); | ||||||
|
||||||
// Only generate add a new block for the trip-count check for the main loop. | ||||||
// The epilogue will use the already existing VPlan entry block. | ||||||
// When vectorizing the main loop, its trip-count check is placed in a new | ||||||
// block, whereas the overall trip-count check is placed in the VPlan entry | ||||||
// block. When vectorizing the epilogue loop, its trip-count check is placed | ||||||
// in the VPlan entry block. | ||||||
if (!ForEpilogue) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added thanks |
||||||
introduceCheckBlockInVPlan(TCCheckBlock); | ||||||
return TCCheckBlock; | ||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clarify that CheckBlock now excludes the initial trip-count check, which is expected to be already introduced before calling
introduceCheckBlockInVPlan()
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a note, thanks