[Script] Add support for merging block annotations #18079
Merged
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
Hzfengsy
force-pushed
the
script_merge_attr
branch
from
acbcaf7 to
947e5b8
Compare
tqchen
approved these changes
Jun 19, 2025
tqchen
requested changes
Jun 19, 2025
| } | ||
| // Case 2.2: the values are not both dicts, check if the keys are the same | ||
| if (!ffi::AnyEqual()(old_value.value(), value)) { | ||
| LOG(FATAL) << "ValueError: Try to merge two annotations with different values for key `" |
Member
There was a problem hiding this comment.
might be useful to cross check error reporting here, to make sure when error happens, we can locate the span and have right ^^^^^ to point at the code location. @Hzfengsy can you confirm?
Member
Author
There was a problem hiding this comment.
Confirmed it works well. Try with testcase:
from tvm.script import tir as T
@T.prim_func
def func3():
with T.block():
T.block_attr({"key1": "block1"})
T.block_attr({"key1": "block2"})
T.evaluate(0)get output:
error: Try to merge two annotations with different values for key `key1`, previous one is "block1", new one is "block2"
--> /path/to/tvm/t.py:7:9
|
7 | T.block_attr({"key1": "block2"})
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: run with `TVM_BACKTRACE=1` environment variable to display a backtrace.
Member
Author
There was a problem hiding this comment.
Also I added a test case to test the error in tests/python/tvmscript/test_tvmscript_error_report.py
This commit introduces functionality to merge block annotations in TVM script. The implementation includes: - MergeAnnotations function that recursively merges annotation dictionaries - Support for nested dictionary merging with new values overriding old ones - Error handling for conflicting annotation values - BlockAttrs function that uses the merging logic to combine multiple T.block_attr() calls within the same block The feature allows users to specify block attributes incrementally using multiple T.block_attr() calls, which will be automatically merged together.
Hzfengsy
force-pushed
the
script_merge_attr
branch
from
947e5b8 to
cd54fcc
Compare
tqchen
approved these changes
Jun 20, 2025
ShiboXing
pushed a commit
to ShiboXing/tvm
that referenced
this pull request
Aug 10, 2025
This commit introduces functionality to merge block annotations in TVM script. The implementation includes: - MergeAnnotations function that recursively merges annotation dictionaries - Support for nested dictionary merging with new values overriding old ones - Error handling for conflicting annotation values - BlockAttrs function that uses the merging logic to combine multiple T.block_attr() calls within the same block The feature allows users to specify block attributes incrementally using multiple T.block_attr() calls, which will be automatically merged together.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 commit introduces functionality to merge block annotations in TVM script. The implementation includes:
The feature allows users to specify block attributes incrementally using multiple T.block_attr() calls, which will be automatically merged together.