[TVMScript] Reorganize the folder structure #12496

junrushao · 2022-08-19T04:50:30Z

This PR introduces some minor restructuring of the python/tvm/script
folder structure to make it more convenient for future upstreaming.

CC: @Hzfengsy @cyx-6

Hzfengsy

LGTM

Hzfengsy

I think a better approach is renaming the new parser rather than the old one. i.e. we upstream at python/tvm/script/new_parser for now. Once the new parser is fully upstreamed, we rename it back

junrushao · 2022-08-19T17:14:56Z

Okay either way works

tvm-bot · 2022-11-11T07:12:35Z

Thanks for contributing to TVM! Please refer to the contributing guidelines https://tvm.apache.org/docs/contribute/ for useful information and tips. Please request code reviews from Reviewers by @-ing them in a comment.

Built docs for commit 23b8b0b can be found here.

_{Generated by tvm-bot}

python/tvm/tir/buffer.py

tests/python/unittest/test_tir_transform_lower_cross_thread_reduction.py

python/tvm/script/__init__.py

This PR introduces some minor restructuring of the `python/tvm/script` folder structure to make it more convenient for future upstreaming. Co-authored-by: Yaxing Cai <caiyaxing666@gmail.com>

MasterJH5574

Thanks for resolving my comments! LGTM.

For the previous version of the parser, this was special-cased for some intrinsic operators. After the new TVMScript was enabled in apache#12496, any `PrimExpr` that appears in the body of a statement is silently ignored. This commit updates the parser to instead wrap the bare `PrimExpr` in a `tir::Evaluate` node. This change effectively allows [expression statements](https://docs.python.org/3/reference/simple_stmts.html#expression-statements) in TVMScript, which are converted to `tir::Evaluate` nodes during parsing.

michalpiszczek · 2022-11-15T21:50:52Z

python/tvm/script/__init__.py

-
-from .parser import ir_module, from_source
+"""TVM Script APIs of TVM Python Package"""
+from .parser import ir, ir_module, parse as from_source, tir


@junrushao it appears this line, combined with the movement of the old parser from parser/ to /parser_v1 means that this PR implicitly switches things over to using the new parser. Am I interpreting this correctly, and was that intentional?

…13396) * [TVMScript] Use tir::Evaluate if expression is in statement context For the previous version of the parser, this was special-cased for some intrinsic operators. After the new TVMScript was enabled in #12496, any `PrimExpr` that appears in the body of a statement is silently ignored. This commit updates the parser to instead wrap the bare `PrimExpr` in a `tir::Evaluate` node. This change effectively allows [expression statements](https://docs.python.org/3/reference/simple_stmts.html#expression-statements) in TVMScript, which are converted to `tir::Evaluate` nodes during parsing. * Update to print T.evaluate() for readability, except for CallNode

This PR introduces some minor restructuring of the `python/tvm/script` folder structure to make it more convenient for future upstreaming. Co-authored-by: Yaxing Cai <caiyaxing666@gmail.com>

…pache#13396) * [TVMScript] Use tir::Evaluate if expression is in statement context For the previous version of the parser, this was special-cased for some intrinsic operators. After the new TVMScript was enabled in apache#12496, any `PrimExpr` that appears in the body of a statement is silently ignored. This commit updates the parser to instead wrap the bare `PrimExpr` in a `tir::Evaluate` node. This change effectively allows [expression statements](https://docs.python.org/3/reference/simple_stmts.html#expression-statements) in TVMScript, which are converted to `tir::Evaluate` nodes during parsing. * Update to print T.evaluate() for readability, except for CallNode

Usually, when using TVMScript to represent a `PrimFunc` variable definition `var_name = expr` defines `LetStmt` with a variable named `var_name` bound to the expression `expr`. However, prior to this commit, if `expr` is a `tir::Var`, the TVMScript parser would instead silently omit the `LetStmt`, and rename all instances of that variable to `var_name`. The root cause was in the `VarTable.exist` check, which erroneously returned False in all cases. This was due to a `value is v` check, which checked if the value was the same as the stack of maybe-shadowing values that share the same name. Replacing the 'value is v` check with a `value in v` check resolves this issue. This bug dates to the initial implementation of the new TVMScript parser in apache#12496.

) * [Bugfix][TVMScript] Handle LetStmt for `var1 = var2` expressions Usually, when using TVMScript to represent a `PrimFunc` variable definition `var_name = expr` defines `LetStmt` with a variable named `var_name` bound to the expression `expr`. However, prior to this commit, if `expr` is a `tir::Var`, the TVMScript parser would instead silently omit the `LetStmt`, and rename all instances of that variable to `var_name`. The root cause was in the `VarTable.exist` check, which erroneously returned False in all cases. This was due to a `value is v` check, which checked if the value was the same as the stack of maybe-shadowing values that share the same name. Replacing the 'value is v` check with a `value in v` check resolves this issue. This bug dates to the initial implementation of the new TVMScript parser in #12496. * Avoid implicit `PrimExpr.__bool__` from `if value in value_stack` * Use T.meta_var where variable renaming is required.

…che#14320) * [Bugfix][TVMScript] Handle LetStmt for `var1 = var2` expressions Usually, when using TVMScript to represent a `PrimFunc` variable definition `var_name = expr` defines `LetStmt` with a variable named `var_name` bound to the expression `expr`. However, prior to this commit, if `expr` is a `tir::Var`, the TVMScript parser would instead silently omit the `LetStmt`, and rename all instances of that variable to `var_name`. The root cause was in the `VarTable.exist` check, which erroneously returned False in all cases. This was due to a `value is v` check, which checked if the value was the same as the stack of maybe-shadowing values that share the same name. Replacing the 'value is v` check with a `value in v` check resolves this issue. This bug dates to the initial implementation of the new TVMScript parser in apache#12496. * Avoid implicit `PrimExpr.__bool__` from `if value in value_stack` * Use T.meta_var where variable renaming is required.

junrushao marked this pull request as ready for review August 19, 2022 04:50

Hzfengsy approved these changes Aug 19, 2022

View reviewed changes

Hzfengsy requested changes Aug 19, 2022

View reviewed changes

areusch added needs-triage PRs or issues that need to be investigated by maintainers to find the right assignees to address it and removed needs-triage PRs or issues that need to be investigated by maintainers to find the right assignees to address it labels Oct 19, 2022

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch 3 times, most recently from b2eceac to 2a199e4 Compare October 25, 2022 17:15

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch 19 times, most recently from 52afa15 to c26ced4 Compare November 10, 2022 20:24

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch 2 times, most recently from 0c71ac1 to f13c52b Compare November 10, 2022 21:12

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch 4 times, most recently from 75f1bcc to 53ead89 Compare November 11, 2022 04:33

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch 4 times, most recently from 71df867 to 61ba89b Compare November 11, 2022 19:11

MasterJH5574 reviewed Nov 11, 2022

View reviewed changes

[TVMScript] Reorganize the folder structure

23b8b0b

This PR introduces some minor restructuring of the `python/tvm/script` folder structure to make it more convenient for future upstreaming. Co-authored-by: Yaxing Cai <caiyaxing666@gmail.com>

junrushao force-pushed the feature/2022-08-18/organize-tvmscript branch from 61ba89b to 23b8b0b Compare November 12, 2022 00:26

MasterJH5574 approved these changes Nov 12, 2022

View reviewed changes

Hzfengsy approved these changes Nov 12, 2022

View reviewed changes

MasterJH5574 merged commit b20b7c4 into apache:main Nov 12, 2022

gigiblender mentioned this pull request Nov 14, 2022

[Lint] Fix import in test_tvmscript_type.py #13367

Closed

Lunderberg mentioned this pull request Nov 15, 2022

[TIR][Analysis][Arith] Implement basic data-flow analysis #13130

Merged

Lunderberg mentioned this pull request Nov 15, 2022

[TVMScript] Use tir::Evaluate if expression is in statement context #13396

Merged

michalpiszczek reviewed Nov 15, 2022

View reviewed changes

masahi mentioned this pull request Nov 16, 2022

[Hexagon] Fix TIR vrmpy tensorization #13404

Merged

leandron mentioned this pull request Feb 1, 2023

TVM v0.11.0 Release Candidate Notes #13899

Closed

Lunderberg mentioned this pull request Mar 16, 2023

[Bugfix][TVMScript] Handle LetStmt for var1 = var2 expressions #14320

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TVMScript] Reorganize the folder structure #12496

[TVMScript] Reorganize the folder structure #12496

Uh oh!

junrushao commented Aug 19, 2022

Uh oh!

Hzfengsy left a comment

Uh oh!

Hzfengsy left a comment

Uh oh!

junrushao commented Aug 19, 2022

Uh oh!

tvm-bot commented Nov 11, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MasterJH5574 left a comment

Uh oh!

michalpiszczek Nov 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

[TVMScript] Reorganize the folder structure #12496

[TVMScript] Reorganize the folder structure #12496

Uh oh!

Conversation

junrushao commented Aug 19, 2022

Uh oh!

Hzfengsy left a comment

Choose a reason for hiding this comment

Uh oh!

Hzfengsy left a comment

Choose a reason for hiding this comment

Uh oh!

junrushao commented Aug 19, 2022

Uh oh!

tvm-bot commented Nov 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MasterJH5574 left a comment

Choose a reason for hiding this comment

Uh oh!

michalpiszczek Nov 15, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

tvm-bot commented Nov 11, 2022 •

edited

Loading