prepare for common subexpr elimination

Fidget-Spinner · Dec 12, 2023 · 43d8e51 · 43d8e51
1 parent 7ac7a79
commit 43d8e51
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 32 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
@@ -2402,7 +2402,7 @@ def testfunc(loops):
             while num < loops:
                 x = num + num
                 y = 1
-                a = (num + num) + y
+                a = x + y
                 num += 1
             return a
 
@@ -2438,7 +2438,7 @@ def testfunc(loops):
     #     binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
     #     self.assertEqual(len(binop_count), 3)
     #
-    # def test_int_impure_region(self):
+    # def test_int_impure_region_attr(self):
     #     class A:
     #         foo = 1
     #     def testfunc(loops):
@@ -2460,7 +2460,27 @@ def testfunc(loops):
     #     self.assertIsNotNone(ex)
     #     binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
     #     self.assertEqual(len(binop_count), 3)
-
+    # def test_int_large_pure_region_attr(self):
+    #     class A:
+    #         foo = 1
+    #     def testfunc(loops):
+    #         num = 0
+    #         while num < loops:
+    #             x = num + num + num - num + num - num + num + num + num - num + num - num
+    #             y = 1
+    #             a = x + num + num + num
+    #             num += 1
+    #         return a
+    #
+    #     opt = _testinternalcapi.get_uop_optimizer()
+    #     res = None
+    #     with temporary_optimizer(opt):
+    #         res = testfunc(64)
+    #
+    #     ex = get_first_executor(testfunc)
+    #     self.assertIsNotNone(ex)
+    #     binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
+    #     self.assertEqual(len(binop_count), 3)
 
 
 

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2705,6 +2705,7 @@ dummy_func(
             DEOPT_IF(r->len <= 0);
         }
 
+        // TODO this is not pure but we should still be able to type propagate
         op(_ITER_NEXT_RANGE, (iter -- iter, next: ~(PYINT_TYPE))) {
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             assert(Py_TYPE(r) == &PyRangeIter_Type);
@@ -4057,6 +4058,16 @@ dummy_func(
             *target = tos;
         }
 
+        pure op(_STORE_COMMON, (addr/4, value --)) {
+            TIER_TWO_ONLY
+            *((PyObject **)addr) = value;
+        }
+
+        pure op(_LOAD_COMMON, (addr/4 -- value)) {
+            TIER_TWO_ONLY
+            value = *((PyObject **)addr);
+        }
+
         op(_INSERT, (unused[oparg], top -- top, unused[oparg])) {
             TIER_TWO_ONLY
             // Inserts TOS at position specified by oparg;

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h