[handshake] StandardToHandshake conversion now removes blocks. #45
Conversation
This file contains 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 is a requirement imposed by the final version of Graph Regions.
hanchenye
approved these changes
Jul 16, 2020
Comment on lines
1422
to
1427
| : public PassWrapper<HandshakeRemoveBlockPass, | ||
| OperationPass<handshake::FuncOp>> { | ||
| void runOnOperation() override { | ||
| auto funcOp = getOperation(); | ||
| auto &entryBlock = funcOp.getBody().front().getOperations(); | ||
|
|
||
| // Erase all TerminatorOp, and move ReturnOp to the end of entry block. | ||
| for (auto &block : funcOp) { | ||
| Operation &termOp = block.back(); | ||
| if (isa<handshake::TerminatorOp>(termOp)) | ||
| termOp.erase(); | ||
| else if (isa<handshake::ReturnOp>(termOp)) | ||
| entryBlock.splice(entryBlock.end(), block.getOperations(), termOp); | ||
| } | ||
|
|
||
| // Move all operations to entry block and erase other blocks. | ||
| for (auto &block : | ||
| llvm::make_early_inc_range(llvm::drop_begin(funcOp, 1))) { | ||
| entryBlock.splice(--entryBlock.end(), block.getOperations()); | ||
| block.erase(); | ||
| } | ||
| removeBasicBlocks(getOperation()); | ||
| } | ||
| }; |
There was a problem hiding this comment.
Maybe it's reasonable to delete the -remove-block-structure pass now?
There was a problem hiding this comment.
Maybe. I think we should keep it for the moment. I'd like to think that we get multi-block graph regions supported before too long.
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 is a requirement imposed by the final version of Graph Regions.