fix a few tests and their exposed bugs

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -17,8 +17,6 @@
 
 from _testinternalcapi import TIER2_THRESHOLD
 
-# We need one more iteration as one iteration is spent on tracing.
-TIER2_THRESHOLD = TIER2_THRESHOLD + 1
 #For test of issue 136154
 GLOBAL_136154 = 42
 
@@ -628,7 +626,7 @@ def testfunc(n):
                 x = range(i)
             return x
 
-        testfunc(_testinternalcapi.TIER2_THRESHOLD + 1)
+        testfunc(_testinternalcapi.TIER2_THRESHOLD)
 
         ex = get_first_executor(testfunc)
         assert ex is not None
@@ -2463,7 +2461,7 @@ def testfunc(n):
                 del email.jit_testing
 
 
-        testfunc(_testinternalcapi.TIER2_THRESHOLD + 1)
+        testfunc(_testinternalcapi.TIER2_THRESHOLD)
         ex = get_first_executor(testfunc)
         assert ex is not None
         """))

Include/internal/pycore_uop_ids.h

@@ -2252,9 +2252,10 @@ def frame_2_jit(expected: bool) -> None:
 
             def frame_3_jit() -> None:
                 # JITs just before the last loop:
-                for i in range(_testinternalcapi.TIER2_THRESHOLD + 1):
+                # 1 extra iteration for tracing.
+                for i in range(_testinternalcapi.TIER2_THRESHOLD + 2):
                     # Careful, doing this in the reverse order breaks tracing:
-                    expected = {enabled} and i == _testinternalcapi.TIER2_THRESHOLD
+                    expected = {enabled} and i >= _testinternalcapi.TIER2_THRESHOLD + 1
                     assert sys._jit.is_active() is expected
                     frame_2_jit(expected)
                     assert sys._jit.is_active() is expected

Lib/test/test_capi/test_opt.py

@@ -2543,7 +2543,8 @@ module_exec(PyObject *module)
     }
 
     if (PyModule_Add(module, "TIER2_THRESHOLD",
-                        PyLong_FromLong(JUMP_BACKWARD_INITIAL_VALUE + 1)) < 0) {
+        // + 1 more due to one loop spent on tracing.
+                        PyLong_FromLong(JUMP_BACKWARD_INITIAL_VALUE + 2)) < 0) {
         return 1;
     }