Add _Py_uop_ prefix to all T2 symbols function names

Author: markshannon

Include/internal/pycore_optimizer.h

@@ -82,32 +82,32 @@ struct _Py_UOpsAbstractInterpContext {
 
 typedef struct _Py_UOpsAbstractInterpContext _Py_UOpsAbstractInterpContext;
 
-extern bool sym_is_null(_Py_UOpsSymType *sym);
-extern bool sym_is_not_null(_Py_UOpsSymType *sym);
-extern bool sym_is_const(_Py_UOpsSymType *sym);
-extern PyObject *sym_get_const(_Py_UOpsSymType *sym);
-extern _Py_UOpsSymType *sym_new_unknown(_Py_UOpsAbstractInterpContext *ctx);
-extern _Py_UOpsSymType *sym_new_known_notnull(_Py_UOpsAbstractInterpContext *ctx);
-extern _Py_UOpsSymType *sym_new_known_type(
+extern bool _Py_uop_sym_is_null(_Py_UOpsSymType *sym);
+extern bool _Py_uop_sym_is_not_null(_Py_UOpsSymType *sym);
+extern bool _Py_uop_sym_is_const(_Py_UOpsSymType *sym);
+extern PyObject *_Py_uop_sym_get_const(_Py_UOpsSymType *sym);
+extern _Py_UOpsSymType *_Py_uop_sym_newunknown(_Py_UOpsAbstractInterpContext *ctx);
+extern _Py_UOpsSymType *_Py_uop_sym_new_notnull(_Py_UOpsAbstractInterpContext *ctx);
+extern _Py_UOpsSymType *_Py_uop_sym_new_type(
     _Py_UOpsAbstractInterpContext *ctx, PyTypeObject *typ);
-extern _Py_UOpsSymType *sym_new_const(_Py_UOpsAbstractInterpContext *ctx, PyObject *const_val);
-extern _Py_UOpsSymType *sym_new_null(_Py_UOpsAbstractInterpContext *ctx);
-extern bool sym_matches_type(_Py_UOpsSymType *sym, PyTypeObject *typ);
-extern void sym_set_null(_Py_UOpsSymType *sym);
-extern void sym_set_type(_Py_UOpsSymType *sym, PyTypeObject *tp);
+extern _Py_UOpsSymType *_Py_uop_sym_newconst(_Py_UOpsAbstractInterpContext *ctx, PyObject *const_val);
+extern _Py_UOpsSymType *_Py_uop_sym_newnull(_Py_UOpsAbstractInterpContext *ctx);
+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 abstractcontext_init(
+extern int _Py_uop_abstractcontext_init(
     _Py_UOpsAbstractInterpContext *ctx, PyCodeObject *co,
     int curr_stacklen, int ir_entries);
-extern void abstractcontext_fini(_Py_UOpsAbstractInterpContext *ctx);
+extern void _Py_uop_abstractcontext_fini(_Py_UOpsAbstractInterpContext *ctx);
 
-extern _Py_UOpsAbstractFrame *ctx_frame_new(
+extern _Py_UOpsAbstractFrame *_Py_uop_ctx_frame_new(
     _Py_UOpsAbstractInterpContext *ctx,
     PyCodeObject *co,
     _Py_UOpsSymType **localsplus_start,
     int n_locals_already_filled,
     int curr_stackentries);
-extern int ctx_frame_pop(_Py_UOpsAbstractInterpContext *ctx);
+extern int _Py_uop_ctx_frame_pop(_Py_UOpsAbstractInterpContext *ctx);
 
 #ifdef __cplusplus
 }

Lib/test/test_generated_cases.py

@@ -900,7 +900,7 @@ def test_overridden_abstract_args(self):
 
         case OP2: {
             _Py_UOpsSymType *out;
-            out = sym_new_unknown(ctx);
+            out = _Py_uop_sym_newunknown(ctx);
             if (out == NULL) goto out_of_space;
             stack_pointer[-1] = out;
             break;
@@ -925,7 +925,7 @@ def test_no_overridden_case(self):
         output = """
         case OP: {
             _Py_UOpsSymType *out;
-            out = sym_new_unknown(ctx);
+            out = _Py_uop_sym_newunknown(ctx);
             if (out == NULL) goto out_of_space;
             stack_pointer[-1] = out;
             break;

Modules/_testinternalcapi.c

@@ -24,6 +24,7 @@
 #include "pycore_interp.h"        // _PyInterpreterState_GetConfigCopy()
 #include "pycore_long.h"          // _PyLong_Sign()
 #include "pycore_object.h"        // _PyObject_IsFreed()
+#include "pycore_optimizer.h"     // _Py_UOpsSymType, etc.
 #include "pycore_pathconfig.h"    // _PyPathConfig_ClearGlobal()
 #include "pycore_pyerrors.h"      // _PyErr_ChainExceptions1()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
@@ -1678,6 +1679,16 @@ 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},
@@ -1747,6 +1758,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},
     {NULL, NULL} /* sentinel */
 };
 

Python/optimizer_analysis.c

@@ -277,8 +277,8 @@ remove_globals(_PyInterpreterFrame *frame, _PyUOpInstruction *buffer,
 
 #define _LOAD_ATTR_NOT_NULL \
     do {                    \
-    OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx)); \
-    OUT_OF_SPACE_IF_NULL(null = sym_new_null(ctx)); \
+    OUT_OF_SPACE_IF_NULL(attr = _Py_uop_sym_new_notnull(ctx)); \
+    OUT_OF_SPACE_IF_NULL(null = _Py_uop_sym_newnull(ctx)); \
     } while (0);
 
 
@@ -296,7 +296,7 @@ uop_redundancy_eliminator(
     _Py_UOpsAbstractInterpContext context;
     _Py_UOpsAbstractInterpContext *ctx = &context;
 
-    if (abstractcontext_init(
+    if (_Py_uop_abstractcontext_init(
         ctx,
         co, curr_stacklen,
         trace_len) < 0) {
@@ -328,17 +328,17 @@ uop_redundancy_eliminator(
         assert(STACK_LEVEL() >= 0);
     }
 
-    abstractcontext_fini(ctx);
+    _Py_uop_abstractcontext_fini(ctx);
     return 1;
 
 out_of_space:
     DPRINTF(1, "Out of space in abstract interpreter\n");
-    abstractcontext_fini(ctx);
+    _Py_uop_abstractcontext_fini(ctx);
     return 0;
 
 error:
     DPRINTF(1, "Encountered error in abstract interpreter\n");
-    abstractcontext_fini(ctx);
+    _Py_uop_abstractcontext_fini(ctx);
     return 0;
 }