get rid of guard hoisting

Fidget-Spinner · Dec 17, 2023 · 8420c8a · 8420c8a
1 parent c9a007f
commit 8420c8a
Show file tree

Hide file tree

Showing 6 changed files with 232 additions and 255 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
@@ -2544,8 +2544,7 @@ class TestUopsOptimization(unittest.TestCase):
     #
     #     ex = get_first_executor(testfunc)
     #     self.assertIsNotNone(ex)
-    #     # TODO should be 127, one extra iteration for some reason
-    #     self.assertEqual(res, 129)
+    #     self.assertEqual(res, 127)
     #     binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
     #     self.assertEqual(len(binop_count), 3)
     #
@@ -2611,12 +2610,11 @@ class TestUopsOptimization(unittest.TestCase):
     #     self.assertIsNotNone(ex)
     #     binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
     #     self.assertEqual(len(binop_count), 11)
-
+    #
     # def test_int_cse(self):
     #     def testfunc(loops):
     #         num = 0
     #         while num < loops:
-    #             # TODO data dependency not ordered correctly
     #             x = num + num
     #             y = num + num
     #             num += 1

diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -804,7 +804,7 @@ dummy_func(
         // We definitely pop the return value off the stack on entry.
         // We also push it onto the stack on exit, but that's a
         // different frame, and it's accounted for by _PUSH_FRAME.
-        op(_POP_FRAME, (retval --)) {
+        pure op(_POP_FRAME, (retval --)) {
             #if TIER_ONE
             assert(frame != &entry_frame);
             #endif
@@ -3096,7 +3096,7 @@ dummy_func(
             Py_DECREF(callable);
         }
 
-        guard op(_CHECK_PEP_523, (--)) {
+        mandatory guard op(_CHECK_PEP_523, (--)) {
             DEOPT_IF(tstate->interp->eval_frame);
         }
 
@@ -3132,7 +3132,7 @@ dummy_func(
         // The 'unused' output effect represents the return value
         // (which will be pushed when the frame returns).
         // It is needed so CALL_PY_EXACT_ARGS matches its family.
-        op(_PUSH_FRAME, (new_frame: _PyInterpreterFrame* -- unused if (0))) {
+        pure op(_PUSH_FRAME, (new_frame: _PyInterpreterFrame* -- unused if (0))) {
             // Write it out explicitly because it's subtly different.
             // Eventually this should be the only occurrence of this code.
             assert(tstate->interp->eval_frame == NULL);
@@ -4027,7 +4027,8 @@ dummy_func(
             frame->instr_ptr = _PyCode_CODE(_PyFrame_GetCode(frame)) + oparg;
         }
 
-        op(_SAVE_RETURN_OFFSET, (--)) {
+        // Not exactly a guard, but not pure either, is just required.
+        mandatory guard op(_SAVE_RETURN_OFFSET, (--)) {
             #if TIER_ONE
             frame->return_offset = (uint16_t)(next_instr - this_instr);
             #endif
@@ -4088,6 +4089,7 @@ dummy_func(
         }
 
 
+
 // END BYTECODES //
 
     }