use table for common consts

Author: iritkatriel

Include/internal/pycore_interp_structs.h

@@ -4,6 +4,7 @@
 extern "C" {
 #endif
 
+#include "pycore_opcode_utils.h" // NUM_COMMON_CONSTANTS
 #include "pycore_structs.h"
 #include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR
 #include "pycore_llist.h"
@@ -655,8 +656,6 @@ struct _Py_unicode_state {
 struct callable_cache {
     PyObject *isinstance;
     PyObject *len;
-    PyObject *all;
-    PyObject *any;
     PyObject *list_append;
     PyObject *object__getattribute__;
 };
@@ -927,6 +926,7 @@ struct _is {
     struct ast_state ast;
     struct types_state types;
     struct callable_cache callable_cache;
+    PyObject *common_consts[NUM_COMMON_CONSTANTS];
     bool jit;
     struct _PyExecutorObject *executor_list_head;
     size_t trace_run_counter;

Include/internal/pycore_opcode_metadata.h

@@ -8,8 +8,6 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-#include "opcode_ids.h"
-
 #define MAX_REAL_OPCODE 254
 
 #define IS_WITHIN_OPCODE_RANGE(opcode) \

Include/internal/pycore_opcode_utils.h

@@ -17,6 +17,8 @@
 #include "pycore_pyerrors.h"      // _PyErr_ClearExcState()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 
+#include "opcode_ids.h"           // RESUME, etc
+
 // Forward declarations
 static PyObject* gen_close(PyObject *, PyObject *);
 static PyObject* async_gen_asend_new(PyAsyncGenObject *, PyObject *);

Include/internal/pycore_uop_metadata.h

@@ -1405,25 +1405,8 @@ dummy_func(
         inst(LOAD_COMMON_CONSTANT, ( -- value)) {
             // Keep in sync with _common_constants in opcode.py
             // If we ever have more than two constants, use a lookup table
-            if (oparg == CONSTANT_ASSERTIONERROR) {
-                value = PyStackRef_FromPyObjectImmortal(PyExc_AssertionError);
-            }
-            else if (oparg == CONSTANT_NOTIMPLEMENTEDERROR) {
-                value = PyStackRef_FromPyObjectImmortal(PyExc_NotImplementedError);
-            }
-            else if (oparg == CONSTANT_BUILTIN_TUPLE) {
-                value = PyStackRef_FromPyObjectImmortal((PyObject*)&PyTuple_Type);
-            }
-            else if (oparg == CONSTANT_BUILTIN_ALL) {
-                value = PyStackRef_FromPyObjectNew(tstate->interp->callable_cache.all);
-            }
-            else if (oparg == CONSTANT_BUILTIN_ANY) {
-                value = PyStackRef_FromPyObjectNew(tstate->interp->callable_cache.any);
-            }
-            else {
-                _PyErr_SetString(tstate, PyExc_ValueError, "unknown common const");
-                ERROR_IF(true, error);
-            }
+            assert(oparg < NUM_COMMON_CONSTANTS);
+            value = PyStackRef_FromPyObjectNew(tstate->interp->common_consts[oparg]);
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {

Objects/genobject.c

@@ -798,13 +798,21 @@ pycore_init_builtins(PyThreadState *tstate)
     if (!all) {
         goto error;
     }
-    interp->callable_cache.all = all;
 
     PyObject *any = PyDict_GetItemWithError(builtins_dict, &_Py_ID(any));
     if (!any) {
         goto error;
     }
-    interp->callable_cache.any = any;
+
+    interp->common_consts[CONSTANT_ASSERTIONERROR] = (PyObject*)&PyTuple_Type;
+    interp->common_consts[CONSTANT_NOTIMPLEMENTEDERROR] = (PyObject*)&PyTuple_Type;
+    interp->common_consts[CONSTANT_BUILTIN_TUPLE] = (PyObject*)&PyTuple_Type;
+    interp->common_consts[CONSTANT_BUILTIN_ALL] = all;
+    interp->common_consts[CONSTANT_BUILTIN_ANY] = any;
+
+    for (int i=0; i < NUM_COMMON_CONSTANTS; i++) {
+        assert(interp->common_consts[i] != NULL);
+    }
 
     PyObject *list_append = _PyType_Lookup(&PyList_Type, &_Py_ID(append));
     if (list_append == NULL) {