[SOT][3.12] extract RETURN_VALUE and RETURN_CONST hard code
#62073
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
|
你的PR提交成功，感谢你对开源项目的贡献! |
gouzil
previously approved these changes
Feb 26, 2024
SigureMo
reviewed
Feb 26, 2024
| @@ -1751,7 +1753,7 @@ def _break_graph_when_if(self, result: TensorVariable, instr: Instruction): | |||
|
|
|||
| # 2. create true_fn and false_fn | |||
| def create_if_branch_fn(start_idx, input_var_names): | |||
| if self._instructions[start_idx].opname == "RETURN_VALUE": | |||
| if self._instructions[start_idx].opname in RETURN: | |||
There was a problem hiding this comment.
这里之前是不是考虑过，如果包含 "RETURN_CONST" 是不对的？
There was a problem hiding this comment.
这个地方，我试了一下如果走到 if x_tensor>0: return 1 确实会触发assert true_fn is not None 出错；原因应该是如果是3.12以前返回const的字节码是LOAD_CONST 和RETURN_VALUE,所以这里应该不能返回NULL；3.12字节码变成只有RETURN_CONST，所以包含"RETURN_CONST"会返回NULL确实不对。
后两处应该也是同样原因，虽然没想到会报错的例子，那我这三处都改回来，保持对齐以前的逻辑
SigureMo
reviewed
Feb 26, 2024
| @@ -1751,7 +1753,7 @@ def _break_graph_when_if(self, result: TensorVariable, instr: Instruction): | |||
|
|
|||
| # 2. create true_fn and false_fn | |||
| def create_if_branch_fn(start_idx, input_var_names): | |||
| if self._instructions[start_idx].opname == "RETURN_VALUE": | |||
| if self._instructions[start_idx].opname == "RETURE_VALUE": | |||
SigureMo
reviewed
Feb 26, 2024
| @@ -26,6 +26,7 @@ | |||
| HAS_FREE = {opcode.opname[x] for x in opcode.hasfree} | |||
| ALL_JUMP = REL_JUMP | ABS_JUMP | |||
| UNCONDITIONAL_JUMP = {"JUMP_ABSOLUTE", "JUMP_FORWARD"} | |||
| RETURN = {"RETURN_VALUE", "RETURN_CONST"} | |||
There was a problem hiding this comment.
这里不要把 UNCONDITIONAL_JUMP 给分离开呀
另外这里的 RETURN 也可以和 UNCONDITIONAL_JUMP 处理方式一样 3.12 才 add RETURN_CONST
SigureMo
changed the title
RETURN_VALUE and RETURN_CONST hard code
Closed
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.
PR types
Others
PR changes
Others
Description
extract
RETURN_VALUEandRETURN_CONSThard code