mirror of
https://github.com/python/cpython
synced 2024-09-15 22:58:09 +00:00
gh-93382: Cache result of PyCode_GetCode
in codeobject (GH-93383)
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>
This commit is contained in:
parent
d8f40ead92
commit
d52ffc1d1f
|
@ -88,6 +88,7 @@ typedef uint16_t _Py_CODEUNIT;
|
||||||
PyObject *co_qualname; /* unicode (qualname, for reference) */ \
|
PyObject *co_qualname; /* unicode (qualname, for reference) */ \
|
||||||
PyObject *co_linetable; /* bytes object that holds location info */ \
|
PyObject *co_linetable; /* bytes object that holds location info */ \
|
||||||
PyObject *co_weakreflist; /* to support weakrefs to code objects */ \
|
PyObject *co_weakreflist; /* to support weakrefs to code objects */ \
|
||||||
|
void *_co_code; /* cached co_code object/attribute */ \
|
||||||
/* Scratch space for extra data relating to the code object. \
|
/* Scratch space for extra data relating to the code object. \
|
||||||
Type is a void* to keep the format private in codeobject.c to force \
|
Type is a void* to keep the format private in codeobject.c to force \
|
||||||
people to go through the proper APIs. */ \
|
people to go through the proper APIs. */ \
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Speed up the :c:func:`PyCode_GetCode` function which also improves accessing the :attr:`~types.CodeType.co_code` attribute in Python.
|
|
@ -334,6 +334,7 @@ init_code(PyCodeObject *co, struct _PyCodeConstructor *con)
|
||||||
/* not set */
|
/* not set */
|
||||||
co->co_weakreflist = NULL;
|
co->co_weakreflist = NULL;
|
||||||
co->co_extra = NULL;
|
co->co_extra = NULL;
|
||||||
|
co->_co_code = NULL;
|
||||||
|
|
||||||
co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;
|
co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;
|
||||||
memcpy(_PyCode_CODE(co), PyBytes_AS_STRING(con->code),
|
memcpy(_PyCode_CODE(co), PyBytes_AS_STRING(con->code),
|
||||||
|
@ -1367,12 +1368,17 @@ deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)
|
||||||
PyObject *
|
PyObject *
|
||||||
_PyCode_GetCode(PyCodeObject *co)
|
_PyCode_GetCode(PyCodeObject *co)
|
||||||
{
|
{
|
||||||
|
if (co->_co_code != NULL) {
|
||||||
|
return Py_NewRef(co->_co_code);
|
||||||
|
}
|
||||||
PyObject *code = PyBytes_FromStringAndSize((const char *)_PyCode_CODE(co),
|
PyObject *code = PyBytes_FromStringAndSize((const char *)_PyCode_CODE(co),
|
||||||
_PyCode_NBYTES(co));
|
_PyCode_NBYTES(co));
|
||||||
if (code == NULL) {
|
if (code == NULL) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
deopt_code((_Py_CODEUNIT *)PyBytes_AS_STRING(code), Py_SIZE(co));
|
deopt_code((_Py_CODEUNIT *)PyBytes_AS_STRING(code), Py_SIZE(co));
|
||||||
|
assert(co->_co_code == NULL);
|
||||||
|
co->_co_code = (void *)Py_NewRef(code);
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1531,6 +1537,7 @@ code_dealloc(PyCodeObject *co)
|
||||||
Py_XDECREF(co->co_qualname);
|
Py_XDECREF(co->co_qualname);
|
||||||
Py_XDECREF(co->co_linetable);
|
Py_XDECREF(co->co_linetable);
|
||||||
Py_XDECREF(co->co_exceptiontable);
|
Py_XDECREF(co->co_exceptiontable);
|
||||||
|
Py_XDECREF(co->_co_code);
|
||||||
if (co->co_weakreflist != NULL) {
|
if (co->co_weakreflist != NULL) {
|
||||||
PyObject_ClearWeakRefs((PyObject*)co);
|
PyObject_ClearWeakRefs((PyObject*)co);
|
||||||
}
|
}
|
||||||
|
|
|
@ -458,22 +458,30 @@ _PyFrame_GetState(PyFrameObject *frame)
|
||||||
static void
|
static void
|
||||||
add_load_fast_null_checks(PyCodeObject *co)
|
add_load_fast_null_checks(PyCodeObject *co)
|
||||||
{
|
{
|
||||||
|
int changed = 0;
|
||||||
_Py_CODEUNIT *instructions = _PyCode_CODE(co);
|
_Py_CODEUNIT *instructions = _PyCode_CODE(co);
|
||||||
for (Py_ssize_t i = 0; i < Py_SIZE(co); i++) {
|
for (Py_ssize_t i = 0; i < Py_SIZE(co); i++) {
|
||||||
switch (_Py_OPCODE(instructions[i])) {
|
switch (_Py_OPCODE(instructions[i])) {
|
||||||
case LOAD_FAST:
|
case LOAD_FAST:
|
||||||
case LOAD_FAST__LOAD_FAST:
|
case LOAD_FAST__LOAD_FAST:
|
||||||
case LOAD_FAST__LOAD_CONST:
|
case LOAD_FAST__LOAD_CONST:
|
||||||
|
changed = 1;
|
||||||
_Py_SET_OPCODE(instructions[i], LOAD_FAST_CHECK);
|
_Py_SET_OPCODE(instructions[i], LOAD_FAST_CHECK);
|
||||||
break;
|
break;
|
||||||
case LOAD_CONST__LOAD_FAST:
|
case LOAD_CONST__LOAD_FAST:
|
||||||
|
changed = 1;
|
||||||
_Py_SET_OPCODE(instructions[i], LOAD_CONST);
|
_Py_SET_OPCODE(instructions[i], LOAD_CONST);
|
||||||
break;
|
break;
|
||||||
case STORE_FAST__LOAD_FAST:
|
case STORE_FAST__LOAD_FAST:
|
||||||
|
changed = 1;
|
||||||
_Py_SET_OPCODE(instructions[i], STORE_FAST);
|
_Py_SET_OPCODE(instructions[i], STORE_FAST);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (changed) {
|
||||||
|
// invalidate cached co_code object
|
||||||
|
Py_CLEAR(co->_co_code);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Setter for f_lineno - you can set f_lineno from within a trace function in
|
/* Setter for f_lineno - you can set f_lineno from within a trace function in
|
||||||
|
|
8
Programs/test_frozenmain.h
generated
8
Programs/test_frozenmain.h
generated
|
@ -1,7 +1,7 @@
|
||||||
// Auto-generated by Programs/freeze_test_frozenmain.py
|
// Auto-generated by Programs/freeze_test_frozenmain.py
|
||||||
unsigned char M_test_frozenmain[] = {
|
unsigned char M_test_frozenmain[] = {
|
||||||
227,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
|
227,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
|
||||||
0,0,0,0,0,115,160,0,0,0,151,0,100,0,100,1,
|
0,0,0,0,0,243,160,0,0,0,151,0,100,0,100,1,
|
||||||
108,0,90,0,100,0,100,1,108,1,90,1,2,0,101,2,
|
108,0,90,0,100,0,100,1,108,1,90,1,2,0,101,2,
|
||||||
100,2,171,1,0,0,0,0,0,0,0,0,1,0,2,0,
|
100,2,171,1,0,0,0,0,0,0,0,0,1,0,2,0,
|
||||||
101,2,100,3,101,0,106,3,0,0,0,0,0,0,0,0,
|
101,2,100,3,101,0,106,3,0,0,0,0,0,0,0,0,
|
||||||
|
@ -23,10 +23,10 @@ unsigned char M_test_frozenmain[] = {
|
||||||
32,122,2,58,32,41,7,218,3,115,121,115,218,17,95,116,
|
32,122,2,58,32,41,7,218,3,115,121,115,218,17,95,116,
|
||||||
101,115,116,105,110,116,101,114,110,97,108,99,97,112,105,218,
|
101,115,116,105,110,116,101,114,110,97,108,99,97,112,105,218,
|
||||||
5,112,114,105,110,116,218,4,97,114,103,118,218,11,103,101,
|
5,112,114,105,110,116,218,4,97,114,103,118,218,11,103,101,
|
||||||
116,95,99,111,110,102,105,103,115,114,2,0,0,0,218,3,
|
116,95,99,111,110,102,105,103,115,114,3,0,0,0,218,3,
|
||||||
107,101,121,169,0,243,0,0,0,0,250,18,116,101,115,116,
|
107,101,121,169,0,243,0,0,0,0,250,18,116,101,115,116,
|
||||||
95,102,114,111,122,101,110,109,97,105,110,46,112,121,250,8,
|
95,102,114,111,122,101,110,109,97,105,110,46,112,121,250,8,
|
||||||
60,109,111,100,117,108,101,62,114,17,0,0,0,1,0,0,
|
60,109,111,100,117,108,101,62,114,18,0,0,0,1,0,0,
|
||||||
0,115,140,0,0,0,248,240,6,0,1,11,128,10,128,10,
|
0,115,140,0,0,0,248,240,6,0,1,11,128,10,128,10,
|
||||||
128,10,216,0,24,208,0,24,208,0,24,208,0,24,224,0,
|
128,10,216,0,24,208,0,24,208,0,24,208,0,24,224,0,
|
||||||
5,128,5,208,6,26,212,0,27,208,0,27,216,0,5,128,
|
5,128,5,208,6,26,212,0,27,208,0,27,216,0,5,128,
|
||||||
|
@ -36,5 +36,5 @@ unsigned char M_test_frozenmain[] = {
|
||||||
67,240,14,0,5,10,128,69,208,10,40,144,67,208,10,40,
|
67,240,14,0,5,10,128,69,208,10,40,144,67,208,10,40,
|
||||||
208,10,40,152,54,160,35,156,59,208,10,40,208,10,40,212,
|
208,10,40,152,54,160,35,156,59,208,10,40,208,10,40,212,
|
||||||
4,41,208,4,41,208,4,41,240,15,7,1,42,240,0,7,
|
4,41,208,4,41,208,4,41,240,15,7,1,42,240,0,7,
|
||||||
1,42,114,15,0,0,0,
|
1,42,114,16,0,0,0,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue