mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
gh-118335: Configure Tier 2 interpreter at build time (#118339)
The code for Tier 2 is now only compiled when configured with `--enable-experimental-jit[=yes|interpreter]`. We drop support for `PYTHON_UOPS` and -`Xuops`, but you can disable the interpreter or JIT at runtime by setting `PYTHON_JIT=0`. You can also build it without enabling it by default using `--enable-experimental-jit=yes-off`; enable with `PYTHON_JIT=1`. On Windows, the `build.bat` script supports `--experimental-jit`, `--experimental-jit-off`, `--experimental-interpreter`. In the C code, `_Py_JIT` is defined as before when the JIT is enabled; the new variable `_Py_TIER2` is defined when the JIT *or* the interpreter is enabled. It is actually a bitmask: 1: JIT; 2: default-off; 4: interpreter.
This commit is contained in:
parent
9c468e2c5d
commit
7d83f7bcc4
32 changed files with 181 additions and 42 deletions
|
@ -1496,6 +1496,8 @@ PyCode_GetFreevars(PyCodeObject *code)
|
|||
return _PyCode_GetFreevars(code);
|
||||
}
|
||||
|
||||
#ifdef _Py_TIER2
|
||||
|
||||
static void
|
||||
clear_executors(PyCodeObject *co)
|
||||
{
|
||||
|
@ -1515,6 +1517,8 @@ _PyCode_Clear_Executors(PyCodeObject *code)
|
|||
clear_executors(code);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void
|
||||
deopt_code(PyCodeObject *code, _Py_CODEUNIT *instructions)
|
||||
{
|
||||
|
@ -1739,9 +1743,11 @@ code_dealloc(PyCodeObject *co)
|
|||
|
||||
PyMem_Free(co_extra);
|
||||
}
|
||||
#ifdef _Py_TIER2
|
||||
if (co->co_executors != NULL) {
|
||||
clear_executors(co);
|
||||
}
|
||||
#endif
|
||||
|
||||
Py_XDECREF(co->co_consts);
|
||||
Py_XDECREF(co->co_names);
|
||||
|
|
|
@ -2281,9 +2281,11 @@ static PyTypeObject* static_types[] = {
|
|||
&_PyBufferWrapper_Type,
|
||||
&_PyContextTokenMissing_Type,
|
||||
&_PyCoroWrapper_Type,
|
||||
#ifdef _Py_TIER2
|
||||
&_PyCounterExecutor_Type,
|
||||
&_PyCounterOptimizer_Type,
|
||||
&_PyDefaultOptimizer_Type,
|
||||
#endif
|
||||
&_Py_GenericAliasIterType,
|
||||
&_PyHamtItems_Type,
|
||||
&_PyHamtKeys_Type,
|
||||
|
@ -2304,8 +2306,10 @@ static PyTypeObject* static_types[] = {
|
|||
&_PyPositionsIterator,
|
||||
&_PyUnicodeASCIIIter_Type,
|
||||
&_PyUnion_Type,
|
||||
#ifdef _Py_TIER2
|
||||
&_PyUOpExecutor_Type,
|
||||
&_PyUOpOptimizer_Type,
|
||||
#endif
|
||||
&_PyWeakref_CallableProxyType,
|
||||
&_PyWeakref_ProxyType,
|
||||
&_PyWeakref_RefType,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue