Add test for T2 symbols

Author: markshannon

Include/internal/pycore_optimizer.h

@@ -96,9 +96,7 @@ extern bool _Py_uop_sym_matches_type(_Py_UOpsSymType *sym, PyTypeObject *typ);
 extern void _Py_uop_sym_set_null(_Py_UOpsSymType *sym);
 extern void _Py_uop_sym_set_type(_Py_UOpsSymType *sym, PyTypeObject *tp);
 
-extern int _Py_uop_abstractcontext_init(
-    _Py_UOpsAbstractInterpContext *ctx, PyCodeObject *co,
-    int curr_stacklen, int ir_entries);
+extern int _Py_uop_abstractcontext_init(_Py_UOpsAbstractInterpContext *ctx);
 extern void _Py_uop_abstractcontext_fini(_Py_UOpsAbstractInterpContext *ctx);
 
 extern _Py_UOpsAbstractFrame *_Py_uop_ctx_frame_new(
@@ -109,6 +107,9 @@ extern _Py_UOpsAbstractFrame *_Py_uop_ctx_frame_new(
     int curr_stackentries);
 extern int _Py_uop_ctx_frame_pop(_Py_UOpsAbstractInterpContext *ctx);
 
+PyAPI_FUNC(PyObject *)
+_Py_uop_symbols_test(PyObject *self, PyObject *ignored);
+
 #ifdef __cplusplus
 }
 #endif

Lib/test/test_optimizer.py

@@ -77,5 +77,12 @@ def func(x=0):
                 _testinternalcapi.get_rare_event_counters()["func_modification"]
             )
 
+
+class TestOptimizerSymbols(unittest.TestCase):
+
+    def test_optimizer_symbols(self):
+        _testinternalcapi.uop_symbols_test()
+
+
 if __name__ == "__main__":
     unittest.main()

Modules/_testinternalcapi.c

@@ -1678,17 +1678,6 @@ get_py_thread_id(PyObject *self, PyObject *Py_UNUSED(ignored))
 }
 #endif
 
-
-static PyObject *
-test_uop_symbols(PyObject *self, PyObject *Py_UNUSED(ignored))
-{
-    _Py_UOpsAbstractInterpContext context;
-    _Py_UOpsAbstractInterpContext *ctx = &context;
-    _Py_UOpsSymType * unknown = Py_uop_sym_newunknown(ctx);
-
-}
-
-
 static PyMethodDef module_functions[] = {
     {"get_configs", get_configs, METH_NOARGS},
     {"get_recursion_depth", get_recursion_depth, METH_NOARGS},
@@ -1758,7 +1747,7 @@ static PyMethodDef module_functions[] = {
 #ifdef Py_GIL_DISABLED
     {"py_thread_id", get_py_thread_id, METH_NOARGS},
 #endif
-    {"test_uop_symbols", test_uop_symbols, METH_NOARGS},
+    {"uop_symbols_test", _Py_uop_symbols_test, METH_NOARGS},
     {NULL, NULL} /* sentinel */
 };
 

Python/optimizer_analysis.c

@@ -296,12 +296,15 @@ uop_redundancy_eliminator(
     _Py_UOpsAbstractInterpContext context;
     _Py_UOpsAbstractInterpContext *ctx = &context;
 
-    if (_Py_uop_abstractcontext_init(
-        ctx,
-        co, curr_stacklen,
-        trace_len) < 0) {
+    if (_Py_uop_abstractcontext_init(ctx) < 0) {
         goto out_of_space;
     }
+    _Py_UOpsAbstractFrame *frame = _Py_uop_ctx_frame_new(ctx, co, ctx->n_consumed, 0, curr_stacklen);
+    if (frame == NULL) {
+        return -1;
+    }
+    ctx->curr_frame_depth++;
+    ctx->frame = frame;
 
     for (_PyUOpInstruction *this_instr = trace;
          this_instr < trace + trace_len && !op_is_end(this_instr->opcode);