Partially address review

Author: Fidget-Spinner

Lib/test/test_capi/test_opt.py

@@ -44,25 +44,9 @@ def get_all_executors(func):
     code = func.__code__
     co_code = code.co_code
     executors = []
-    seen = set()
     for i in range(0, len(co_code), 2):
         try:
-            exec = _opcode.get_executor(code, i)
-            if id(exec) in seen:
-                continue
-            executors.append(exec)
-            seen.add(id(exec))
-            # Add the side exit executors as well.
-            ops = get_ops(exec)
-            for idx, op in enumerate(ops):
-                opname = op[0]
-                if opname == "_EXIT_TRACE":
-                    exit = op[3]
-                    link_to = _testinternalcapi.get_exit_executor(exit)
-                    if id(link_to) in seen:
-                        continue
-                    executors.append(link_to)
-                    seen.add(id(link_to))
+            executors.append(_opcode.get_executor(code, i))
         except ValueError:
             pass
     return executors
@@ -345,10 +329,16 @@ def testfunc(x):
             return testfunc(x-1)
 
         sys.setrecursionlimit(TIER2_RESUME_THRESHOLD * 2)
-        testfunc(TIER2_RESUME_THRESHOLD)
+        for _ in range((TIER2_RESUME_THRESHOLD + 99)//100):
+            testfunc(101)
 
         ex = get_first_executor(testfunc)
         self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        # 0. _START_EXECUTOR
+        # 1. _MAKE_WARM
+        # 2. _TIER2_RESUME_CHECK
+        self.assertEqual(uops[2], "_TIER2_RESUME_CHECK")
 
     def test_jump_forward(self):
         def testfunc(n):
@@ -1447,7 +1437,7 @@ def test_guard_type_version_removed_invalidation(self):
 
         def thing(a):
             x = 0
-            for i in range(TIER2_THRESHOLD * 2 + 1):
+            for i in range(TIER2_THRESHOLD + 1):
                 x += a.attr
                 # The first TIER2_THRESHOLD iterations we set the attribute on
                 # this dummy class, which shouldn't trigger the type watcher.
@@ -1464,14 +1454,13 @@ class Bar:
             pass
 
         res, ex = self._run_with_optimizer(thing, Foo())
-        if ex is not None:
-            opnames = list(iter_opnames(ex))
-            self.assertEqual(res, TIER2_THRESHOLD * 6 + 1)
-            call = opnames.index("_CALL_BUILTIN_FAST")
-            load_attr_top = opnames.index("_POP_TOP_LOAD_CONST_INLINE_BORROW", 0, call)
-            load_attr_bottom = opnames.index("_POP_TOP_LOAD_CONST_INLINE_BORROW", call)
-            self.assertEqual(opnames[:load_attr_top].count("_GUARD_TYPE_VERSION"), 1)
-            self.assertEqual(opnames[call:load_attr_bottom].count("_CHECK_VALIDITY"), 2)
+        opnames = list(iter_opnames(ex))
+        self.assertEqual(res, TIER2_THRESHOLD * 2 + 2)
+        call = opnames.index("_CALL_BUILTIN_FAST")
+        load_attr_top = opnames.index("_POP_TOP_LOAD_CONST_INLINE_BORROW", 0, call)
+        load_attr_bottom = opnames.index("_POP_TOP_LOAD_CONST_INLINE_BORROW", call)
+        self.assertEqual(opnames[:load_attr_top].count("_GUARD_TYPE_VERSION"), 1)
+        self.assertEqual(opnames[call:load_attr_bottom].count("_CHECK_VALIDITY"), 2)
 
     def test_guard_type_version_removed_escaping(self):
 

Lib/test/test_compile.py

@@ -2458,7 +2458,7 @@ def test_lambda_return_position(self):
                 for i, pos in enumerate(positions):
                     with self.subTest(i=i, pos=pos):
                         start_line, end_line, start_col, end_col = pos
-                        if i == 0 or i == 1:
+                        if i <= 1:
                             # ignore the RESUME and CACHE in the beginning
                             continue
                         self.assertEqual(start_line, 1)

Modules/_testinternalcapi.c

@@ -3023,9 +3023,10 @@ module_exec(PyObject *module)
         return 1;
     }
 
+    // + 1 to specialize from RESUME to RESUME_CHECK_JIT
+    // + 1 more due to one loop spent on tracing.
     long resume_threshold = interp->opt_config.resume_initial_value + 2;
     if (PyModule_Add(module, "TIER2_RESUME_THRESHOLD",
-        // + 1 more due to one loop spent on tracing.
                     PyLong_FromLong(resume_threshold)) < 0) {
         return 1;
     }

Modules/_testinternalcapi/test_cases.c.h

@@ -3212,7 +3212,7 @@ dummy_func(
                 if (_PyOpcode_Caches[_PyOpcode_Deopt[opcode]]) {
                     PAUSE_ADAPTIVE_COUNTER(this_instr[1].counter);
                 }
-                DISPATCH_GOTO_NON_TRACING();
+                DISPATCH_GOTO();
             }
             assert(executor != tstate->interp->cold_executor);
             tstate->jit_exit = NULL;

Python/bytecodes.c

@@ -1138,7 +1138,7 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
 
 #if _Py_TIER2
 // 0 for success, -1  for error.
-static Py_NO_INLINE int
+static int
 stop_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
 {
     int _is_sys_tracing = (tstate->c_tracefunc != NULL) || (tstate->c_profilefunc != NULL);