From d753d8aed738a4a2adedc24263af64d6f7051b4a Mon Sep 17 00:00:00 2001 From: Nadeshiko Manju Date: Wed, 9 Apr 2025 00:12:09 +0800 Subject: GH-131798: Narrow the result of _CONTAINS_OP_DICT to bool in the JIT (GH-132269) Co-authored-by: Tomas R. --- Lib/test/test_capi/test_opt.py | 27 ++++++++++++++++++++++ .../2025-04-08-21-20-12.gh-issue-131798.Ft9tIF.rst | 2 ++ Python/optimizer_bytecodes.c | 4 ++++ Python/optimizer_cases.c.h | 6 ++--- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-21-20-12.gh-issue-131798.Ft9tIF.rst diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 3ade7cb..00aebd6 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1629,6 +1629,33 @@ class TestUopsOptimization(unittest.TestCase): self.assertIn("_CONTAINS_OP_SET", uops) self.assertNotIn("_TO_BOOL_BOOL", uops) + def test_to_bool_bool_contains_op_dict(self): + """ + Test that _TO_BOOL_BOOL is removed from code like: + + res = foo in some_dict + if res: + .... + + """ + def testfunc(n): + x = 0 + s = {1: 1, 2: 2, 3: 3} + for _ in range(n): + a = 2 + in_dict = a in s + if in_dict: + x += 1 + return x + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertEqual(res, TIER2_THRESHOLD) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_CONTAINS_OP_DICT", uops) + self.assertNotIn("_TO_BOOL_BOOL", uops) + + def test_remove_guard_for_known_type_str(self): def f(n): for i in range(n): diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-21-20-12.gh-issue-131798.Ft9tIF.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-21-20-12.gh-issue-131798.Ft9tIF.rst new file mode 100644 index 0000000..90c0fb3 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-21-20-12.gh-issue-131798.Ft9tIF.rst @@ -0,0 +1,2 @@ +Allow the JIT to remove an extra ``_TO_BOOL_BOOL`` instruction after +``_CONTAINS_OP_DICT`` by setting the return type to bool. diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 72dc2bb..0f7e183 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -485,6 +485,10 @@ dummy_func(void) { res = sym_new_type(ctx, &PyBool_Type); } + op(_CONTAINS_OP_DICT, (left, right -- res)) { + res = sym_new_type(ctx, &PyBool_Type); + } + op(_LOAD_CONST, (-- value)) { PyObject *val = PyTuple_GET_ITEM(co->co_consts, this_instr->oparg); int opcode = _Py_IsImmortal(val) ? _LOAD_CONST_INLINE_BORROW : _LOAD_CONST_INLINE; diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 160d09c..0df52e6 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1292,9 +1292,9 @@ } case _CONTAINS_OP_DICT: { - JitOptSymbol *b; - b = sym_new_not_null(ctx); - stack_pointer[-2] = b; + JitOptSymbol *res; + res = sym_new_type(ctx, &PyBool_Type); + stack_pointer[-2] = res; stack_pointer += -1; assert(WITHIN_STACK_BOUNDS()); break; -- cgit v0.12