You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2022/09/01 14:49:32 UTC
[GitHub] [tvm] Lunderberg opened a new pull request, #12673: [TVMScript][Fix] Correct round-trip of explicit root block
Lunderberg opened a new pull request, #12673:
URL: https://github.com/apache/tvm/pull/12673
Prior to this commit, when converting TIR to TVMScript, the root `tir::Block` is typically hidden. When parsing, however, `tvm::tir::ScriptComplete` will wrap the function body in a root block if the primfunc if the contains at least one block and does not already have a root block. As a result, if the root block is the only block present, it would be stripped by a round-trip.
This commit tightens the condition for hiding the root `tir::Block` when converting to TVMScript, so that it is printed in cases where the autocompleter would reinsert it when parsing.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] Lunderberg commented on a diff in pull request #12673: [TVMScript][Fix] Correct round-trip of explicit root block
Posted by GitBox <gi...@apache.org>.
Lunderberg commented on code in PR #12673:
URL: https://github.com/apache/tvm/pull/12673#discussion_r974699584
##########
src/printer/tvmscript_printer.cc:
##########
@@ -1654,19 +1654,52 @@ Doc TVMScriptPrinter::PrintPrimFunc(const PrimFunc& primFunc) {
}
// print body
body << "# body" << Doc::NewLine();
- if (op->body->IsInstance<BlockRealizeNode>() &&
- op->body.as<BlockRealizeNode>()->iter_values.empty()) {
- const BlockNode* block = op->body.as<BlockRealizeNode>()->block.get();
- if (block->annotations.empty() && !ContainsOptionalInfo(GetRef<Stmt>(block))) {
- // Skip print root block
- body << "# with " << tir_prefix_ << ".block(\"root\")" << Doc::NewLine();
- body << PrintBlockBody(block);
+
+ Optional<Block> elided_root_block_body = [&]() -> Optional<Block> {
+ auto block_realize = op->body.as<BlockRealizeNode>();
+ if (!block_realize || block_realize->iter_values.size()) {
+ return NullOpt;
+ }
+
+ const auto& block = block_realize->block;
+ if (block->annotations.size() || ContainsOptionalInfo(block)) {
+ return NullOpt;
+ }
+
+ // The autocomplete might recognize the body itself as being a
+ // root block, and fail to insert it.
+ bool autocomplete_would_insert_root_block = [&]() -> bool {
+ if (block->alloc_buffers.size()) {
+ return true;
+ }
+
+ auto* block_realize = block->body.as<BlockRealizeNode>();
+ if (block_realize && block_realize->block->iter_vars.size()) {
+ return true;
+ }
+ if (!block_realize && ContainsNode<BlockRealizeNode>(block->body)) {
+ return true;
+ }
+ return false;
+ }();
+
+ if (autocomplete_would_insert_root_block) {
+ return block;
} else {
- body << PrintBody(op->body);
+ return NullOpt;
}
+ }();
+
+ if (elided_root_block_body) {
+ // Skip printing of root block in cases where tvm::tir::ScriptComplete
+ // would re-insert it.
+ body << "# with " << tir_prefix_ << ".block(\"root\")" << Doc::NewLine();
+ body << PrintBlockBody(elided_root_block_body.value().get());
} else {
+ // If we the isn't a skippable root block, just print the body
Review Comment:
Thank you, and fixed!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] Lunderberg merged pull request #12673: [TVMScript][Fix] Correct round-trip of explicit root block
Posted by GitBox <gi...@apache.org>.
Lunderberg merged PR #12673:
URL: https://github.com/apache/tvm/pull/12673
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] shingjan commented on pull request #12673: [TVMScript][Fix] Correct round-trip of explicit root block
Posted by GitBox <gi...@apache.org>.
shingjan commented on PR #12673:
URL: https://github.com/apache/tvm/pull/12673#issuecomment-1251664987
LGTM. Thanks for sending this!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] vinx13 commented on a diff in pull request #12673: [TVMScript][Fix] Correct round-trip of explicit root block
Posted by GitBox <gi...@apache.org>.
vinx13 commented on code in PR #12673:
URL: https://github.com/apache/tvm/pull/12673#discussion_r974676031
##########
src/printer/tvmscript_printer.cc:
##########
@@ -1654,19 +1654,52 @@ Doc TVMScriptPrinter::PrintPrimFunc(const PrimFunc& primFunc) {
}
// print body
body << "# body" << Doc::NewLine();
- if (op->body->IsInstance<BlockRealizeNode>() &&
- op->body.as<BlockRealizeNode>()->iter_values.empty()) {
- const BlockNode* block = op->body.as<BlockRealizeNode>()->block.get();
- if (block->annotations.empty() && !ContainsOptionalInfo(GetRef<Stmt>(block))) {
- // Skip print root block
- body << "# with " << tir_prefix_ << ".block(\"root\")" << Doc::NewLine();
- body << PrintBlockBody(block);
+
+ Optional<Block> elided_root_block_body = [&]() -> Optional<Block> {
+ auto block_realize = op->body.as<BlockRealizeNode>();
+ if (!block_realize || block_realize->iter_values.size()) {
+ return NullOpt;
+ }
+
+ const auto& block = block_realize->block;
+ if (block->annotations.size() || ContainsOptionalInfo(block)) {
+ return NullOpt;
+ }
+
+ // The autocomplete might recognize the body itself as being a
+ // root block, and fail to insert it.
+ bool autocomplete_would_insert_root_block = [&]() -> bool {
+ if (block->alloc_buffers.size()) {
+ return true;
+ }
+
+ auto* block_realize = block->body.as<BlockRealizeNode>();
+ if (block_realize && block_realize->block->iter_vars.size()) {
+ return true;
+ }
+ if (!block_realize && ContainsNode<BlockRealizeNode>(block->body)) {
+ return true;
+ }
+ return false;
+ }();
+
+ if (autocomplete_would_insert_root_block) {
+ return block;
} else {
- body << PrintBody(op->body);
+ return NullOpt;
}
+ }();
+
+ if (elided_root_block_body) {
+ // Skip printing of root block in cases where tvm::tir::ScriptComplete
+ // would re-insert it.
+ body << "# with " << tir_prefix_ << ".block(\"root\")" << Doc::NewLine();
+ body << PrintBlockBody(elided_root_block_body.value().get());
} else {
+ // If we the isn't a skippable root block, just print the body
Review Comment:
typo here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org