Skip to content

C
cpython
Commit d6245177 authored by Nick Coghlan's avatar Nick Coghlan
Browse files
Options

Issue #11816: switch test_peepholer to bytecode_helper

parent b39fd0c9
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 156 deletions
Lib/test/test_peepholer.py
View file @ d6245177
...@@ -5,44 +5,28 @@ from io import StringIO ...@@ -5,44 +5,28 @@ from io import StringIO
import unittest import unittest
from math import copysign from math import copysign
def disassemble(func): from test.bytecode_helper import BytecodeTestCase
f = StringIO()
tmp = sys.stdout
sys.stdout = f
try:
dis.dis(func)
finally:
sys.stdout = tmp
result = f.getvalue()
f.close()
return result
def dis_single(line): class TestTranforms(BytecodeTestCase):
return disassemble(compile(line, '', 'single'))
class TestTranforms(unittest.TestCase):
def test_unot(self): def test_unot(self):
# UNARY_NOT POP_JUMP_IF_FALSE --> POP_JUMP_IF_TRUE' # UNARY_NOT POP_JUMP_IF_FALSE --> POP_JUMP_IF_TRUE'
def unot(x): def unot(x):
if not x == 2: if not x == 2:
del x del x
asm = disassemble(unot) self.assertNotInBytecode(unot, 'UNARY_NOT')
for elem in ('UNARY_NOT', 'POP_JUMP_IF_FALSE'): self.assertNotInBytecode(unot, 'POP_JUMP_IF_FALSE')
self.assertNotIn(elem, asm) self.assertInBytecode(unot, 'POP_JUMP_IF_TRUE')
for elem in ('POP_JUMP_IF_TRUE',):
self.assertIn(elem, asm)
def test_elim_inversion_of_is_or_in(self): def test_elim_inversion_of_is_or_in(self):
for line, elem in ( for line, cmp_op in (
('not a is b', '(is not)',), ('not a is b', 'is not',),
('not a in b', '(not in)',), ('not a in b', 'not in',),
('not a is not b', '(is)',), ('not a is not b', 'is',),
('not a not in b', '(in)',), ('not a not in b', 'in',),
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertIn(elem, asm) self.assertInBytecode(code, 'COMPARE_OP', cmp_op)
def test_global_as_constant(self): def test_global_as_constant(self):
# LOAD_GLOBAL None/True/False --> LOAD_CONST None/True/False # LOAD_GLOBAL None/True/False --> LOAD_CONST None/True/False
...@@ -56,17 +40,14 @@ class TestTranforms(unittest.TestCase): ...@@ -56,17 +40,14 @@ class TestTranforms(unittest.TestCase):
def h(x): def h(x):
False False
return x return x
for func, name in ((f, 'None'), (g, 'True'), (h, 'False')): for func, elem in ((f, None), (g, True), (h, False)):
asm = disassemble(func) self.assertNotInBytecode(func, 'LOAD_GLOBAL')
for elem in ('LOAD_GLOBAL',): self.assertInBytecode(func, 'LOAD_CONST', elem)
self.assertNotIn(elem, asm)
for elem in ('LOAD_CONST', '('+name+')'):
self.assertIn(elem, asm)
def f(): def f():
'Adding a docstring made this test fail in Py2.5.0' 'Adding a docstring made this test fail in Py2.5.0'
return None return None
self.assertIn('LOAD_CONST', disassemble(f)) self.assertNotInBytecode(f, 'LOAD_GLOBAL')
self.assertNotIn('LOAD_GLOBAL', disassemble(f)) self.assertInBytecode(f, 'LOAD_CONST', None)
def test_while_one(self): def test_while_one(self):
# Skip over: LOAD_CONST trueconst POP_JUMP_IF_FALSE xx # Skip over: LOAD_CONST trueconst POP_JUMP_IF_FALSE xx
...@@ -74,11 +55,10 @@ class TestTranforms(unittest.TestCase): ...@@ -74,11 +55,10 @@ class TestTranforms(unittest.TestCase):
while 1: while 1:
pass pass
return list return list
asm = disassemble(f)
for elem in ('LOAD_CONST', 'POP_JUMP_IF_FALSE'): for elem in ('LOAD_CONST', 'POP_JUMP_IF_FALSE'):
self.assertNotIn(elem, asm) self.assertNotInBytecode(f, elem)
for elem in ('JUMP_ABSOLUTE',): for elem in ('JUMP_ABSOLUTE',):
self.assertIn(elem, asm) self.assertInBytecode(f, elem)
def test_pack_unpack(self): def test_pack_unpack(self):
for line, elem in ( for line, elem in (
...@@ -86,28 +66,30 @@ class TestTranforms(unittest.TestCase): ...@@ -86,28 +66,30 @@ class TestTranforms(unittest.TestCase):
('a, b = a, b', 'ROT_TWO',), ('a, b = a, b', 'ROT_TWO',),
('a, b, c = a, b, c', 'ROT_THREE',), ('a, b, c = a, b, c', 'ROT_THREE',),
): ):
asm = dis_single(line) code = compile(line,'','single')
self.assertIn(elem, asm) self.assertInBytecode(code, elem)
self.assertNotIn('BUILD_TUPLE', asm) self.assertNotInBytecode(code, 'BUILD_TUPLE')
self.assertNotIn('UNPACK_TUPLE', asm) self.assertNotInBytecode(code, 'UNPACK_TUPLE')
def test_folding_of_tuples_of_constants(self): def test_folding_of_tuples_of_constants(self):
for line, elem in ( for line, elem in (
('a = 1,2,3', '((1, 2, 3))'), ('a = 1,2,3', (1, 2, 3)),
('("a","b","c")', "(('a', 'b', 'c'))"), ('("a","b","c")', ('a', 'b', 'c')),
('a,b,c = 1,2,3', '((1, 2, 3))'), ('a,b,c = 1,2,3', (1, 2, 3)),
('(None, 1, None)', '((None, 1, None))'), ('(None, 1, None)', (None, 1, None)),
('((1, 2), 3, 4)', '(((1, 2), 3, 4))'), ('((1, 2), 3, 4)', ((1, 2), 3, 4)),
): ):
asm = dis_single(line) code = compile(line,'','single')
self.assertIn(elem, asm) self.assertInBytecode(code, 'LOAD_CONST', elem)
self.assertNotIn('BUILD_TUPLE', asm) self.assertNotInBytecode(code, 'BUILD_TUPLE')
# Long tuples should be folded too. # Long tuples should be folded too.
asm = dis_single(repr(tuple(range(10000)))) code = compile(repr(tuple(range(10000))),'','single')
self.assertNotInBytecode(code, 'BUILD_TUPLE')
# One LOAD_CONST for the tuple, one for the None return value # One LOAD_CONST for the tuple, one for the None return value
self.assertEqual(asm.count('LOAD_CONST'), 2) load_consts = [instr for instr in dis.get_instructions(code)
self.assertNotIn('BUILD_TUPLE', asm) if instr.opname == 'LOAD_CONST']
self.assertEqual(len(load_consts), 2)
# Bug 1053819: Tuple of constants misidentified when presented with: # Bug 1053819: Tuple of constants misidentified when presented with:
# . . . opcode_with_arg 100 unary_opcode BUILD_TUPLE 1 . . . # . . . opcode_with_arg 100 unary_opcode BUILD_TUPLE 1 . . .
...@@ -129,14 +111,14 @@ class TestTranforms(unittest.TestCase): ...@@ -129,14 +111,14 @@ class TestTranforms(unittest.TestCase):
def test_folding_of_lists_of_constants(self): def test_folding_of_lists_of_constants(self):
for line, elem in ( for line, elem in (
# in/not in constants with BUILD_LIST should be folded to a tuple: # in/not in constants with BUILD_LIST should be folded to a tuple:
('a in [1,2,3]', '(1, 2, 3)'), ('a in [1,2,3]', (1, 2, 3)),
('a not in ["a","b","c"]', "(('a', 'b', 'c'))"), ('a not in ["a","b","c"]', ('a', 'b', 'c')),
('a in [None, 1, None]', '((None, 1, None))'), ('a in [None, 1, None]', (None, 1, None)),
('a not in [(1, 2), 3, 4]', '(((1, 2), 3, 4))'), ('a not in [(1, 2), 3, 4]', ((1, 2), 3, 4)),
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertIn(elem, asm) self.assertInBytecode(code, 'LOAD_CONST', elem)
self.assertNotIn('BUILD_LIST', asm) self.assertNotInBytecode(code, 'BUILD_LIST')
def test_folding_of_sets_of_constants(self): def test_folding_of_sets_of_constants(self):
for line, elem in ( for line, elem in (
...@@ -147,18 +129,9 @@ class TestTranforms(unittest.TestCase): ...@@ -147,18 +129,9 @@ class TestTranforms(unittest.TestCase):
('a not in {(1, 2), 3, 4}', frozenset({(1, 2), 3, 4})), ('a not in {(1, 2), 3, 4}', frozenset({(1, 2), 3, 4})),
('a in {1, 2, 3, 3, 2, 1}', frozenset({1, 2, 3})), ('a in {1, 2, 3, 3, 2, 1}', frozenset({1, 2, 3})),
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertNotIn('BUILD_SET', asm) self.assertNotInBytecode(code, 'BUILD_SET')
self.assertInBytecode(code, 'LOAD_CONST', elem)
# Verify that the frozenset 'elem' is in the disassembly
# The ordering of the elements in repr( frozenset ) isn't
# guaranteed, so we jump through some hoops to ensure that we have
# the frozenset we expect:
self.assertIn('frozenset', asm)
# Extract the frozenset literal from the disassembly:
m = re.match(r'.*(frozenset\({.*}\)).*', asm, re.DOTALL)
self.assertTrue(m)
self.assertEqual(eval(m.group(1)), elem)
# Ensure that the resulting code actually works: # Ensure that the resulting code actually works:
def f(a): def f(a):
...@@ -176,98 +149,103 @@ class TestTranforms(unittest.TestCase): ...@@ -176,98 +149,103 @@ class TestTranforms(unittest.TestCase):
def test_folding_of_binops_on_constants(self): def test_folding_of_binops_on_constants(self):
for line, elem in ( for line, elem in (
('a = 2+3+4', '(9)'), # chained fold ('a = 2+3+4', 9), # chained fold
('"@"*4', "('@@@@')"), # check string ops ('"@"*4', '@@@@'), # check string ops
('a="abc" + "def"', "('abcdef')"), # check string ops ('a="abc" + "def"', 'abcdef'), # check string ops
('a = 3**4', '(81)'), # binary power ('a = 3**4', 81), # binary power
('a = 3*4', '(12)'), # binary multiply ('a = 3*4', 12), # binary multiply
('a = 13//4', '(3)'), # binary floor divide ('a = 13//4', 3), # binary floor divide
('a = 14%4', '(2)'), # binary modulo ('a = 14%4', 2), # binary modulo
('a = 2+3', '(5)'), # binary add ('a = 2+3', 5), # binary add
('a = 13-4', '(9)'), # binary subtract ('a = 13-4', 9), # binary subtract
('a = (12,13)[1]', '(13)'), # binary subscr ('a = (12,13)[1]', 13), # binary subscr
('a = 13 << 2', '(52)'), # binary lshift ('a = 13 << 2', 52), # binary lshift
('a = 13 >> 2', '(3)'), # binary rshift ('a = 13 >> 2', 3), # binary rshift
('a = 13 & 7', '(5)'), # binary and ('a = 13 & 7', 5), # binary and
('a = 13 ^ 7', '(10)'), # binary xor ('a = 13 ^ 7', 10), # binary xor
('a = 13 | 7', '(15)'), # binary or ('a = 13 | 7', 15), # binary or
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertIn(elem, asm, asm) self.assertInBytecode(code, 'LOAD_CONST', elem)
self.assertNotIn('BINARY_', asm) for instr in dis.get_instructions(code):
self.assertFalse(instr.opname.startswith('BINARY_'))
# Verify that unfoldables are skipped # Verify that unfoldables are skipped
asm = dis_single('a=2+"b"') code = compile('a=2+"b"', '', 'single')
self.assertIn('(2)', asm) self.assertInBytecode(code, 'LOAD_CONST', 2)
self.assertIn("('b')", asm) self.assertInBytecode(code, 'LOAD_CONST', 'b')
# Verify that large sequences do not result from folding # Verify that large sequences do not result from folding
asm = dis_single('a="x"*1000') code = compile('a="x"*1000', '', 'single')
self.assertIn('(1000)', asm) self.assertInBytecode(code, 'LOAD_CONST', 1000)
def test_binary_subscr_on_unicode(self): def test_binary_subscr_on_unicode(self):
# valid code get optimized # valid code get optimized
asm = dis_single('"foo"[0]') code = compile('"foo"[0]', '', 'single')
self.assertIn("('f')", asm) self.assertInBytecode(code, 'LOAD_CONST', 'f')
self.assertNotIn('BINARY_SUBSCR', asm) self.assertNotInBytecode(code, 'BINARY_SUBSCR')
asm = dis_single('"\u0061\uffff"[1]') code = compile('"\u0061\uffff"[1]', '', 'single')
self.assertIn("('\\uffff')", asm) self.assertInBytecode(code, 'LOAD_CONST', '\uffff')
self.assertNotIn('BINARY_SUBSCR', asm) self.assertNotInBytecode(code,'BINARY_SUBSCR')
asm = dis_single('"\U00012345abcdef"[3]')
self.assertIn("('c')", asm) # With PEP 393, non-BMP char get optimized
self.assertNotIn('BINARY_SUBSCR', asm) code = compile('"\U00012345"[0]', '', 'single')
self.assertInBytecode(code, 'LOAD_CONST', '\U00012345')
self.assertNotInBytecode(code, 'BINARY_SUBSCR')
# invalid code doesn't get optimized # invalid code doesn't get optimized
# out of range # out of range
asm = dis_single('"fuu"[10]') code = compile('"fuu"[10]', '', 'single')
self.assertIn('BINARY_SUBSCR', asm) self.assertInBytecode(code, 'BINARY_SUBSCR')
def test_folding_of_unaryops_on_constants(self): def test_folding_of_unaryops_on_constants(self):
for line, elem in ( for line, elem in (
('-0.5', '(-0.5)'), # unary negative ('-0.5', -0.5), # unary negative
('-0.0', '(-0.0)'), # -0.0 ('-0.0', -0.0), # -0.0
('-(1.0-1.0)','(-0.0)'), # -0.0 after folding ('-(1.0-1.0)', -0.0), # -0.0 after folding
('-0', '(0)'), # -0 ('-0', 0), # -0
('~-2', '(1)'), # unary invert ('~-2', 1), # unary invert
('+1', '(1)'), # unary positive ('+1', 1), # unary positive
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertIn(elem, asm, asm) self.assertInBytecode(code, 'LOAD_CONST', elem)
self.assertNotIn('UNARY_', asm) for instr in dis.get_instructions(code):
self.assertFalse(instr.opname.startswith('UNARY_'))
# Check that -0.0 works after marshaling # Check that -0.0 works after marshaling
def negzero(): def negzero():
return -(1.0-1.0) return -(1.0-1.0)
self.assertNotIn('UNARY_', disassemble(negzero)) for instr in dis.get_instructions(code):
self.assertTrue(copysign(1.0, negzero()) < 0) self.assertFalse(instr.opname.startswith('UNARY_'))
# Verify that unfoldables are skipped # Verify that unfoldables are skipped
for line, elem in ( for line, elem, opname in (
('-"abc"', "('abc')"), # unary negative ('-"abc"', 'abc', 'UNARY_NEGATIVE'),
('~"abc"', "('abc')"), # unary invert ('~"abc"', 'abc', 'UNARY_INVERT'),
): ):
asm = dis_single(line) code = compile(line, '', 'single')
self.assertIn(elem, asm, asm) self.assertInBytecode(code, 'LOAD_CONST', elem)
self.assertIn('UNARY_', asm) self.assertInBytecode(code, opname)
def test_elim_extra_return(self): def test_elim_extra_return(self):
# RETURN LOAD_CONST None RETURN --> RETURN # RETURN LOAD_CONST None RETURN --> RETURN
def f(x): def f(x):
return x return x
asm = disassemble(f) self.assertNotInBytecode(f, 'LOAD_CONST', None)
self.assertNotIn('LOAD_CONST', asm) returns = [instr for instr in dis.get_instructions(f)
self.assertNotIn('(None)', asm) if instr.opname == 'RETURN_VALUE']
self.assertEqual(asm.split().count('RETURN_VALUE'), 1) self.assertEqual(len(returns), 1)
def test_elim_jump_to_return(self): def test_elim_jump_to_return(self):
# JUMP_FORWARD to RETURN --> RETURN # JUMP_FORWARD to RETURN --> RETURN
def f(cond, true_value, false_value): def f(cond, true_value, false_value):
return true_value if cond else false_value return true_value if cond else false_value
asm = disassemble(f) self.assertNotInBytecode(f, 'JUMP_FORWARD')
self.assertNotIn('JUMP_FORWARD', asm) self.assertNotInBytecode(f, 'JUMP_ABSOLUTE')
self.assertNotIn('JUMP_ABSOLUTE', asm) returns = [instr for instr in dis.get_instructions(f)
self.assertEqual(asm.split().count('RETURN_VALUE'), 2) if instr.opname == 'RETURN_VALUE']
self.assertEqual(len(returns), 2)
def test_elim_jump_after_return1(self): def test_elim_jump_after_return1(self):
# Eliminate dead code: jumps immediately after returns can't be reached # Eliminate dead code: jumps immediately after returns can't be reached
...@@ -280,48 +258,53 @@ class TestTranforms(unittest.TestCase): ...@@ -280,48 +258,53 @@ class TestTranforms(unittest.TestCase):
if cond1: return 4 if cond1: return 4
return 5 return 5
return 6 return 6
asm = disassemble(f) self.assertNotInBytecode(f, 'JUMP_FORWARD')
self.assertNotIn('JUMP_FORWARD', asm) self.assertNotInBytecode(f, 'JUMP_ABSOLUTE')
self.assertNotIn('JUMP_ABSOLUTE', asm) returns = [instr for instr in dis.get_instructions(f)
self.assertEqual(asm.split().count('RETURN_VALUE'), 6) if instr.opname == 'RETURN_VALUE']
self.assertEqual(len(returns), 6)
def test_elim_jump_after_return2(self): def test_elim_jump_after_return2(self):
# Eliminate dead code: jumps immediately after returns can't be reached # Eliminate dead code: jumps immediately after returns can't be reached
def f(cond1, cond2): def f(cond1, cond2):
while 1: while 1:
if cond1: return 4 if cond1: return 4
asm = disassemble(f) self.assertNotInBytecode(f, 'JUMP_FORWARD')
self.assertNotIn('JUMP_FORWARD', asm)
# There should be one jump for the while loop. # There should be one jump for the while loop.
self.assertEqual(asm.split().count('JUMP_ABSOLUTE'), 1) returns = [instr for instr in dis.get_instructions(f)
self.assertEqual(asm.split().count('RETURN_VALUE'), 2) if instr.opname == 'JUMP_ABSOLUTE']
self.assertEqual(len(returns), 1)
returns = [instr for instr in dis.get_instructions(f)
if instr.opname == 'RETURN_VALUE']
self.assertEqual(len(returns), 2)
def test_make_function_doesnt_bail(self): def test_make_function_doesnt_bail(self):
def f(): def f():
def g()->1+1: def g()->1+1:
pass pass
return g return g
asm = disassemble(f) self.assertNotInBytecode(f, 'BINARY_ADD')
self.assertNotIn('BINARY_ADD', asm)
def test_constant_folding(self): def test_constant_folding(self):
# Issue #11244: aggressive constant folding. # Issue #11244: aggressive constant folding.
exprs = [ exprs = [
"3 * -5", '3 * -5',
"-3 * 5", '-3 * 5',
"2 * (3 * 4)", '2 * (3 * 4)',
"(2 * 3) * 4", '(2 * 3) * 4',
"(-1, 2, 3)", '(-1, 2, 3)',
"(1, -2, 3)", '(1, -2, 3)',
"(1, 2, -3)", '(1, 2, -3)',
"(1, 2, -3) * 6", '(1, 2, -3) * 6',
"lambda x: x in {(3 * -5) + (-1 - 6), (1, -2, 3) * 2, None}", 'lambda x: x in {(3 * -5) + (-1 - 6), (1, -2, 3) * 2, None}',
] ]
for e in exprs: for e in exprs:
asm = dis_single(e) code = compile(e, '', 'single')
self.assertNotIn('UNARY_', asm, e) for instr in dis.get_instructions(code):
self.assertNotIn('BINARY_', asm, e) self.assertFalse(instr.opname.startswith('UNARY_'))
self.assertNotIn('BUILD_', asm, e) self.assertFalse(instr.opname.startswith('BINARY_'))
self.assertFalse(instr.opname.startswith('BUILD_'))
class TestBuglets(unittest.TestCase): class TestBuglets(unittest.TestCase):
...@@ -343,7 +326,7 @@ def test_main(verbose=None): ...@@ -343,7 +326,7 @@ def test_main(verbose=None):
support.run_unittest(*test_classes) support.run_unittest(*test_classes)
# verify reference counting # verify reference counting
if verbose and hasattr(sys, "gettotalrefcount"): if verbose and hasattr(sys, 'gettotalrefcount'):
import gc import gc
counts = [None] * 5 counts = [None] * 5
for i in range(len(counts)): for i in range(len(counts)):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7