Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-87092: refactor assemble() to a number of separate functions, which do not need the compiler struct #102562

Merged
merged 10 commits into from
Mar 13, 2023
Merged

gh-87092: refactor assemble() to a number of separate functions, which do not need the compiler struct #102562

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8b71935
remove compiler as arg from some codegen functions
iritkatriel Mar 8, 2023
ed9c7d2
prepare_localsplus doesn't need the whole compiler struct
iritkatriel Mar 8, 2023
1232d41
don't pass compiler around so much in assembler stage
iritkatriel Mar 8, 2023
dbf22d1
extract optimize_code_unit() out of assemble()
iritkatriel Mar 9, 2023
db4b2b8
_PyCompile_CodeGen doesn't need to construct a cfg
iritkatriel Mar 9, 2023
9071570
refactor optimize_code_unit further
iritkatriel Mar 9, 2023
4e7857f
unit tests run all of the optimization stage, not just optimize_cfg
iritkatriel Mar 9, 2023
d0166c4
break up assemble() some more
iritkatriel Mar 10, 2023
c9fc294
remove obsolete comment
iritkatriel Mar 10, 2023
0f198b6
tidy up the no-arg representation in unit test instruction sequences
iritkatriel Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/test/support/bytecode_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def normalize_insts(self, insts):
if isinstance(oparg, self.Label):
arg = oparg.value
else:
arg = oparg if opcode in self.HAS_ARG else None
arg = oparg if opcode in self.HAS_ARG else 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? And why do some of the 'NOP's below in test_peepholer.py have a None operand and some have 0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was just messy. I've tidied it up now. Thanks.

opcode = dis.opname[opcode]
res.append((opcode, arg, *loc))
return res
Expand Down
39 changes: 26 additions & 13 deletions Lib/test/test_peepholer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,15 +995,20 @@ def test_conditional_jump_forward_non_const_condition(self):
('LOAD_CONST', 2, 13),
lbl,
('LOAD_CONST', 3, 14),
('RETURN_VALUE', 14),
]
expected = [
expected_insts = [
('LOAD_NAME', 1, 11),
('POP_JUMP_IF_TRUE', lbl := self.Label(), 12),
('LOAD_CONST', 2, 13),
('LOAD_CONST', 1, 13),
lbl,
('LOAD_CONST', 3, 14)
('NOP', 0, 14),
('RETURN_CONST', 2, 0),
]
self.cfg_optimization_test(insts, expected, consts=list(range(5)))
self.cfg_optimization_test(insts,
expected_insts,
consts=[0, 1, 2, 3, 4],
expected_consts=[0, 2, 3])

def test_conditional_jump_forward_const_condition(self):
# The unreachable branch of the jump is removed, the jump
Expand All @@ -1015,43 +1020,51 @@ def test_conditional_jump_forward_const_condition(self):
('LOAD_CONST', 2, 13),
lbl,
('LOAD_CONST', 3, 14),
('RETURN_VALUE', 14),
]
expected = [
expected_insts = [
('NOP', None, 11),
('NOP', None, 12),
('LOAD_CONST', 3, 14)
('NOP', 0, 14),
('RETURN_CONST', 1, 0),
]
self.cfg_optimization_test(insts, expected, consts=list(range(5)))
self.cfg_optimization_test(insts,
expected_insts,
consts=[0, 1, 2, 3, 4],
expected_consts=[0, 3])

def test_conditional_jump_backward_non_const_condition(self):
insts = [
lbl1 := self.Label(),
('LOAD_NAME', 1, 11),
('POP_JUMP_IF_TRUE', lbl1, 12),
('LOAD_CONST', 2, 13),
('LOAD_NAME', 2, 13),
('RETURN_VALUE', 13),
]
expected = [
lbl := self.Label(),
('LOAD_NAME', 1, 11),
('POP_JUMP_IF_TRUE', lbl, 12),
('LOAD_CONST', 2, 13)
('LOAD_NAME', 2, 13),
('RETURN_VALUE', 13),
]
self.cfg_optimization_test(insts, expected, consts=list(range(5)))

def test_conditional_jump_backward_const_condition(self):
# The unreachable branch of the jump is removed
insts = [
lbl1 := self.Label(),
('LOAD_CONST', 1, 11),
('LOAD_CONST', 3, 11),
('POP_JUMP_IF_TRUE', lbl1, 12),
('LOAD_CONST', 2, 13),
('RETURN_VALUE', 13),
]
expected = [
expected_insts = [
lbl := self.Label(),
('NOP', None, 11),
('JUMP', lbl, 12)
('JUMP', lbl, 12),
]
self.cfg_optimization_test(insts, expected, consts=list(range(5)))
self.cfg_optimization_test(insts, expected_insts, consts=list(range(5)))


if __name__ == "__main__":
Expand Down
Loading