Simplify and refactor contractUncondEdges as a utility in TFCanonicalizeCFG. #19546
Conversation
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
|
@swift-ci please test tensorflow |
mhong
approved these changes
Sep 26, 2018
| // Our partitioning and other transformations can leave around lots of | ||
| // unconditional branches between blocks that formerly had control edges. Go | ||
| // through and merge those to make later passes simpler. | ||
| bool tf::contractUncondBranches(SILFunction *fn, DominanceInfo* DI, SILLoopInfo *LI) { |
There was a problem hiding this comment.
will there be a caller where DI and LI are not NULL?
There was a problem hiding this comment.
Yes, I am preparing a PR that passes non-null for DI & LI.
| // while we walk it. | ||
| for (auto bbi = fn->begin(), e = fn->end(); bbi != e;) { | ||
| auto *bb = &*bbi; | ||
| if (mergeBasicBlockWithSuccessor(bb, DI, LI)) { |
There was a problem hiding this comment.
the old code does not use mergeBasicBlockWithSuccessor() -- it may be worth mentioning this "less obvious refactoring" in PR description.
From a quick read of that func impl, it seems to be equivalent to the old code.
There was a problem hiding this comment.
Updated the description.
|
Thanks for the review. Merging it now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR also refactors the contractUncondBranches to reuse the mergeBasicBlockWithSuccessor(...) function from Utils/CFG.cpp