8000 gh-126835: Move constant unaryop & binop folding to CFG by WolframAlph · Pull Request #129550 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-126835: Move constant unaryop & binop folding to CFG #129550

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

Merged
merged 35 commits into from
Feb 21, 2025
Merged

gh-126835: Move constant unaryop & binop folding to CFG #129550

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
04b4a84
move binop folding to cfg
WolframAlph Feb 14, 2025
a6babab
update tests
WolframAlph Feb 14, 2025
0fa7c4c
add match case folding tests
WolframAlph Feb 14, 2025
27b1a09
add peepholer tests
WolframAlph Feb 15, 2025
d3df8c8
polish ast code
WolframAlph Feb 15, 2025
e82841a
add assertions
WolframAlph Feb 15, 2025
cd6fbd7
use IS_NUMERIC_CONST_EXPR
WolframAlph Feb 15, 2025
300976e
bring back tests
WolframAlph Feb 15, 2025
3240d8e
move unaryop to cfg
WolframAlph Feb 15, 2025
74d2275
add tests
WolframAlph Feb 15, 2025
8358e28
cancel out unary not
WolframAlph Feb 15, 2025
c1a1be5
fix optimize_if_const_unaryop
WolframAlph Feb 15, 2025
ef9221a
add test_optimize_unary_not
WolframAlph Feb 15, 2025
598adce
add optimize_unary_not_non_const
WolframAlph Feb 16, 2025
bb60d4c
add tests
WolframAlph Feb 16, 2025
eb99870
add tests
WolframAlph Feb 16, 2025
c93627e
add static
WolframAlph Feb 16, 2025
f0f044a
polish
WolframAlph Feb 16, 2025
a02ac66
add unaryop folding tests
WolframAlph Feb 16, 2025
2739fa0
add not not test to catch misoptimized case
WolframAlph Feb 17, 2025
258a5b6
revert old unarynot handing, add contains/is + unarynot folding
WolframAlph Feb 17, 2025
59ee897
address reviews
WolframAlph Feb 17, 2025
91ea2fa
address reviews
WolframAlph Feb 17, 2025
2c5ee86
simplify optimize_if_const_unaryop
WolframAlph Feb 17, 2025
0399fce
address reviews
WolframAlph Feb 19, 2025
3c53923
simplify instr_make_load_const
WolframAlph Feb 19, 2025
a6a06c8
address review for tests
WolframAlph Feb 20, 2025
2ea8425
replace macros
WolframAlph Feb 20, 2025
7c9c69b
update peepholer test
WolframAlph Feb 20, 2025
099afba
define is_unarynegative_const_complex_expr & is_allowed_match_case_bi…
WolframAlph Feb 20, 2025
0dad7c1
try to fold match case expression without checks
WolframAlph Feb 20, 2025
1e8b552
simplify folding
WolframAlph Feb 20, 2025
f4e9a42
address review
WolframAlph Feb 20, 2025
2dba23f
minor adjustments
WolframAlph Feb 21, 2025
cafbc61
Merge branch 'main' into fold-binop-cfg
iritkatriel Feb 21, 2025
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
Prev Previous commit
Next Next commit
add tests
  • Loading branch information
@WolframAlph
WolframAlph committed Feb 16, 2025
commit bb60d4cf23d6ffc36ca7c672a5ed244e1daa9abc
245 changes: 227 additions & 18 deletions Lib/test/test_peepholer.py
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -1732,54 +1732,58 @@ def test_optimize_unary_not(self):
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test is/isnot eliminate to bool
# test is/isnot cancel out
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('IS_OP', is_, 0),
('UNARY_NOT', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('UNARY_NOT', None, 0),
('RETURN_VALUE', None, 0),
]
after = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('IS_OP', isnot, 0),
('IS_OP', is_, 0),
('RETURN_VALUE', None, 0),
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test in/notin
# test is/isnot eliminate to bool
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('IS_OP', is_, 0),
('UNARY_NOT', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('RETURN_VALUE', None, 0),
]
after = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', notin, 0),
('IS_OP', isnot, 0),
('RETURN_VALUE', None, 0),
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test in/notin cancel out
# test is/isnot cancel out eliminate to bool
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('IS_OP', is_, 0),
('UNARY_NOT', None, 0),
('UNARY_NOT', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('TO_BOOL', None, 0),
('RETURN_VALUE', None, 0),
]
after = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('IS_OP', is_, 0),
('RETURN_VALUE', None, 0),
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])
Expand All @@ -1800,26 +1804,24 @@ def test_optimize_unary_not(self):
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test in/notin cancel out eliminate to bool (to bool stays) (maybe optimize later ???)
# test in/notin cancel out
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('UNARY_NOT', None, 0),
('UNARY_NOT', None, 0),
('TO_BOOL', None, 0),
('RETURN_VALUE', None, 0),
]
after = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('TO_BOOL', None, 0),
('RETURN_VALUE', None, 0),
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test in/notin eliminate to bool
# test is/isnot eliminate to bool
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
Expand All @@ -1838,7 +1840,7 @@ def test_optimize_unary_not(self):
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test in/notin cancel out eliminate to bool (to bool stays) (maybe optimize later ???)
# test in/notin cancel out eliminate to bool
before = [
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
Expand All @@ -1852,7 +1854,6 @@ def test_optimize_unary_not(self):
('LOAD_NAME', 0, 0),
('LOAD_NAME', 1, 0),
('CONTAINS_OP', in_, 0),
('TO_BOOL', None, 0),
('RETURN_VALUE', None, 0),
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])
Expand All @@ -1861,7 +1862,215 @@ def test_optimize_if_const_unaryop(self):
pass

def test_optimize_if_const_binop(self):
pass
add = get_binop_argval('NB_ADD')
sub = get_binop_argval('NB_SUBTRACT')
mul = get_binop_argval('NB_MULTIPLY')
div = get_binop_argval('NB_TRUE_DIVIDE')
floor = get_binop_argval('NB_FLOOR_DIVIDE')
rem = get_binop_argval('NB_REMAINDER')
pow = get_binop_argval('NB_POWER')
lshift = get_binop_argval('NB_LSHIFT')
rshift = get_binop_argval('NB_RSHIFT')
or_ = get_binop_argval('NB_OR')
and_ = get_binop_argval('NB_AND')
xor = get_binop_argval('NB_XOR')
subscr = get_binop_argval('NB_SUBSCR')

# test add
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', add, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', add, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 6, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test sub
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', sub, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', sub, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_CONST', 0, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[-2])

# test mul
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', mul, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', mul, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 8, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test div
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', div, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', div, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_CONST', 1, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[1.0, 0.5])

# test floor
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', floor, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', floor, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 0, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test rem
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', rem, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', rem, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 0, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test pow
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', pow, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', pow, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 16, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test lshift
before = [
('LOAD_SMALL_INT', 1, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', lshift, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', lshift, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 4, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test rshift
before = [
('LOAD_SMALL_INT', 4, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', rshift, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', rshift, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 1, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test or
before = [
('LOAD_SMALL_INT', 1, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', or_, 0),
('LOAD_SMALL_INT', 4, 0),
('BINARY_OP', or_, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 7, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test and
before = [
('LOAD_SMALL_INT', 1, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', and_, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', and_, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 1, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test xor
before = [
('LOAD_SMALL_INT', 2, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', xor, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', xor, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 2, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[], expected_consts=[])

# test subscr
before = [
('LOAD_CONST', 0, 0),
('LOAD_SMALL_INT', 1, 0),
('BINARY_OP', subscr, 0),
('LOAD_SMALL_INT', 2, 0),
('BINARY_OP', subscr, 0),
('RETURN_VALUE', None, 0)
]
after = [
('LOAD_SMALL_INT', 3, 0),
('RETURN_VALUE', None, 0)
]
self.cfg_optimization_test(before, after, consts=[(1, (1, 2, 3))], expected_consts=[(1, (1, 2, 3))])


def test_conditional_jump_forward_const_condition(self):
# The unreachable branch of the jump is removed, the jump
Expand Down
Loading
0