reduce diff, add tests

Fidget-Spinner · Fidget-Spinner · commit e34a0f5cac17 · 2024-02-07T15:40:49.000+08:00
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
@@ -568,6 +568,30 @@ def testfunc(loops):
         self.assertGreaterEqual(len(binop_count), 3)
         self.assertLessEqual(len(guard_both_int_count), 1)
 
+    def test_int_type_propagation_through_frame(self):
+        def double(x):
+            return x + x
+        def testfunc(loops):
+            num = 0
+            while num < loops:
+                x = num + num
+                a = double(x)
+                num += 1
+            return a
+
+        opt = _testinternalcapi.get_uop_optimizer()
+        res = None
+        with temporary_optimizer(opt):
+            res = testfunc(32)
+
+        ex = get_first_executor(testfunc)
+        self.assertIsNotNone(ex)
+        self.assertEqual(res, 124)
+        binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
+        guard_both_int_count = [opname for opname, _, _ in ex if opname == "_GUARD_BOTH_INT"]
+        self.assertGreaterEqual(len(binop_count), 3)
+        self.assertLessEqual(len(guard_both_int_count), 1)
+
     def test_int_impure_region(self):
         def testfunc(loops):
             num = 0
@@ -705,9 +729,5 @@ def testfunc(n):
 
 
 
-class Foo:
-    attr = 1
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
@@ -551,7 +551,7 @@ emit_i(uops_emitter *emitter,
 
 
 #ifndef Py_DEBUG
-#define GETITEM(ctx, i) Py_UNREACHABLE();
+#define GETITEM(ctx, i) (_Py_UOpsSymType *)Py_UNREACHABLE();
 #else
 static inline _Py_UOpsSymType *
 GETITEM(_Py_UOpsAbstractInterpContext *ctx, Py_ssize_t i) {
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1252,7 +1252,7 @@ init_interp_main(PyThreadState *tstate)
         if (_Py_get_xoption(&config->xoptions, L"uops") != NULL) {
             enabled = 1;
         }
-        enabled = 1; // TEMPORARY: always enable
+
         if (enabled) {
 #else
         // Always enable tier two for JIT builds (ignoring the environment
diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py
@@ -3,6 +3,7 @@
 import parser
 from typing import Optional
 
+
 @dataclass
 class Properties:
     escapes: bool

Original file line number	Diff line number	Diff line change
`@@ -1252,7 +1252,7 @@ init_interp_main(PyThreadState *tstate)`
`1252`	`1252`	`if (_Py_get_xoption(&config->xoptions, L"uops") != NULL) {`
`1253`	`1253`	`enabled = 1;`
`1254`	`1254`	`}`
`1255`		`- enabled = 1; // TEMPORARY: always enable`
	`1255`	`+`
`1256`	`1256`	`if (enabled) {`
`1257`	`1257`	`#else`
`1258`	`1258`	`// Always enable tier two for JIT builds (ignoring the environment`