mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
GH-106701: Move _PyUopExecute to Python/executor.c (GH-106924)
This commit is contained in:
Brandt Bucher
GitHub
parent
9c81fc2dbe
commit
8f4de57699
13 changed files with 276 additions and 247 deletions
195
Python/ceval.c
195
Python/ceval.c
|
|
@ -96,13 +96,6 @@
|
|||
} while (0)
|
||||
#endif
|
||||
|
||||
// GH-89279: Similar to above, force inlining by using a macro.
|
||||
#if defined(_MSC_VER) && SIZEOF_INT == 4
|
||||
#define _Py_atomic_load_relaxed_int32(ATOMIC_VAL) (assert(sizeof((ATOMIC_VAL)->_value) == 4), *((volatile int*)&((ATOMIC_VAL)->_value)))
|
||||
#else
|
||||
#define _Py_atomic_load_relaxed_int32(ATOMIC_VAL) _Py_atomic_load_relaxed(ATOMIC_VAL)
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef LLTRACE
|
||||
static void
|
||||
|
|
@ -206,13 +199,7 @@ static void monitor_throw(PyThreadState *tstate,
|
|||
static PyObject * import_name(PyThreadState *, _PyInterpreterFrame *,
|
||||
PyObject *, PyObject *, PyObject *);
|
||||
static PyObject * import_from(PyThreadState *, PyObject *, PyObject *);
|
||||
static void format_exc_check_arg(PyThreadState *, PyObject *, const char *, PyObject *);
|
||||
static void format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg);
|
||||
static int check_args_iterable(PyThreadState *, PyObject *func, PyObject *vararg);
|
||||
static int check_except_type_valid(PyThreadState *tstate, PyObject* right);
|
||||
static int check_except_star_type_valid(PyThreadState *tstate, PyObject* right);
|
||||
static void format_kwargs_error(PyThreadState *, PyObject *func, PyObject *kwargs);
|
||||
static void format_awaitable_error(PyThreadState *, PyTypeObject *, int);
|
||||
static int get_exception_handler(PyCodeObject *, int, int*, int*, int*);
|
||||
static _PyInterpreterFrame *
|
||||
_PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
|
||||
|
|
@ -224,12 +211,6 @@ _PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
|
|||
static void
|
||||
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);
|
||||
|
||||
#define UNBOUNDLOCAL_ERROR_MSG \
|
||||
"cannot access local variable '%s' where it is not associated with a value"
|
||||
#define UNBOUNDFREE_ERROR_MSG \
|
||||
"cannot access free variable '%s' where it is not associated with a" \
|
||||
" value in enclosing scope"
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
|
@ -286,7 +267,7 @@ _Py_CheckRecursiveCall(PyThreadState *tstate, const char *where)
|
|||
}
|
||||
|
||||
|
||||
static const binaryfunc binary_ops[] = {
|
||||
const binaryfunc _PyEval_BinaryOps[] = {
|
||||
[NB_ADD] = PyNumber_Add,
|
||||
[NB_AND] = PyNumber_And,
|
||||
[NB_FLOOR_DIVIDE] = PyNumber_FloorDivide,
|
||||
|
|
@ -321,8 +302,8 @@ static const binaryfunc binary_ops[] = {
|
|||
|
||||
// Return a tuple of values corresponding to keys, with error checks for
|
||||
// duplicate/missing keys.
|
||||
static PyObject*
|
||||
match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
|
||||
PyObject *
|
||||
_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, PyObject *keys)
|
||||
{
|
||||
assert(PyTuple_CheckExact(keys));
|
||||
Py_ssize_t nkeys = PyTuple_GET_SIZE(keys);
|
||||
|
|
@ -403,7 +384,7 @@ fail:
|
|||
// Extract a named attribute from the subject, with additional bookkeeping to
|
||||
// raise TypeErrors for repeated lookups. On failure, return NULL (with no
|
||||
// error set). Use _PyErr_Occurred(tstate) to disambiguate.
|
||||
static PyObject*
|
||||
static PyObject *
|
||||
match_class_attr(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
||||
PyObject *name, PyObject *seen)
|
||||
{
|
||||
|
|
@ -425,9 +406,9 @@ match_class_attr(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
|||
|
||||
// On success (match), return a tuple of extracted attributes. On failure (no
|
||||
// match), return NULL. Use _PyErr_Occurred(tstate) to disambiguate.
|
||||
static PyObject*
|
||||
match_class(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
||||
Py_ssize_t nargs, PyObject *kwargs)
|
||||
PyObject*
|
||||
_PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
||||
Py_ssize_t nargs, PyObject *kwargs)
|
||||
{
|
||||
if (!PyType_Check(type)) {
|
||||
const char *e = "called match pattern must be a class";
|
||||
|
|
@ -533,11 +514,6 @@ fail:
|
|||
|
||||
|
||||
static int do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause);
|
||||
static int exception_group_match(
|
||||
PyObject* exc_value, PyObject *match_type,
|
||||
PyObject **match, PyObject **rest);
|
||||
|
||||
static int unpack_iterable(PyThreadState *, PyObject *, int, int, PyObject **);
|
||||
|
||||
PyObject *
|
||||
PyEval_EvalCode(PyObject *co, PyObject *globals, PyObject *locals)
|
||||
|
|
@ -827,7 +803,7 @@ resume_frame:
|
|||
|
||||
unbound_local_error:
|
||||
{
|
||||
format_exc_check_arg(tstate, PyExc_UnboundLocalError,
|
||||
_PyEval_FormatExcCheckArg(tstate, PyExc_UnboundLocalError,
|
||||
UNBOUNDLOCAL_ERROR_MSG,
|
||||
PyTuple_GetItem(_PyFrame_GetCode(frame)->co_localsplusnames, oparg)
|
||||
);
|
||||
|
|
@ -1777,9 +1753,9 @@ raise_error:
|
|||
complicated for inlining).
|
||||
*/
|
||||
|
||||
static int
|
||||
exception_group_match(PyObject* exc_value, PyObject *match_type,
|
||||
PyObject **match, PyObject **rest)
|
||||
int
|
||||
_PyEval_ExceptionGroupMatch(PyObject* exc_value, PyObject *match_type,
|
||||
PyObject **match, PyObject **rest)
|
||||
{
|
||||
if (Py_IsNone(exc_value)) {
|
||||
*match = Py_NewRef(Py_None);
|
||||
|
|
@ -1840,9 +1816,9 @@ exception_group_match(PyObject* exc_value, PyObject *match_type,
|
|||
with a variable target.
|
||||
*/
|
||||
|
||||
static int
|
||||
unpack_iterable(PyThreadState *tstate, PyObject *v,
|
||||
int argcnt, int argcntafter, PyObject **sp)
|
||||
int
|
||||
_PyEval_UnpackIterable(PyThreadState *tstate, PyObject *v,
|
||||
int argcnt, int argcntafter, PyObject **sp)
|
||||
{
|
||||
int i = 0, j = 0;
|
||||
Py_ssize_t ll = 0;
|
||||
|
|
@ -2487,8 +2463,8 @@ import_from(PyThreadState *tstate, PyObject *v, PyObject *name)
|
|||
#define CANNOT_EXCEPT_STAR_EG "catching ExceptionGroup with except* "\
|
||||
"is not allowed. Use except instead."
|
||||
|
||||
static int
|
||||
check_except_type_valid(PyThreadState *tstate, PyObject* right)
|
||||
int
|
||||
_PyEval_CheckExceptTypeValid(PyThreadState *tstate, PyObject* right)
|
||||
{
|
||||
if (PyTuple_Check(right)) {
|
||||
Py_ssize_t i, length;
|
||||
|
|
@ -2512,10 +2488,10 @@ check_except_type_valid(PyThreadState *tstate, PyObject* right)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
check_except_star_type_valid(PyThreadState *tstate, PyObject* right)
|
||||
int
|
||||
_PyEval_CheckExceptStarTypeValid(PyThreadState *tstate, PyObject* right)
|
||||
{
|
||||
if (check_except_type_valid(tstate, right) < 0) {
|
||||
if (_PyEval_CheckExceptTypeValid(tstate, right) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -2569,8 +2545,8 @@ check_args_iterable(PyThreadState *tstate, PyObject *func, PyObject *args)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
format_kwargs_error(PyThreadState *tstate, PyObject *func, PyObject *kwargs)
|
||||
void
|
||||
_PyEval_FormatKwargsError(PyThreadState *tstate, PyObject *func, PyObject *kwargs)
|
||||
{
|
||||
/* _PyDict_MergeEx raises attribute
|
||||
* error (percolated from an attempt
|
||||
|
|
@ -2611,9 +2587,9 @@ format_kwargs_error(PyThreadState *tstate, PyObject *func, PyObject *kwargs)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
format_exc_check_arg(PyThreadState *tstate, PyObject *exc,
|
||||
const char *format_str, PyObject *obj)
|
||||
void
|
||||
_PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc,
|
||||
const char *format_str, PyObject *obj)
|
||||
{
|
||||
const char *obj_str;
|
||||
|
||||
|
|
@ -2640,8 +2616,8 @@ format_exc_check_arg(PyThreadState *tstate, PyObject *exc,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
|
||||
void
|
||||
_PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
|
||||
{
|
||||
PyObject *name;
|
||||
/* Don't stomp existing exception */
|
||||
|
|
@ -2649,16 +2625,16 @@ format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
|
|||
return;
|
||||
name = PyTuple_GET_ITEM(co->co_localsplusnames, oparg);
|
||||
if (oparg < PyCode_GetFirstFree(co)) {
|
||||
format_exc_check_arg(tstate, PyExc_UnboundLocalError,
|
||||
UNBOUNDLOCAL_ERROR_MSG, name);
|
||||
_PyEval_FormatExcCheckArg(tstate, PyExc_UnboundLocalError,
|
||||
UNBOUNDLOCAL_ERROR_MSG, name);
|
||||
} else {
|
||||
format_exc_check_arg(tstate, PyExc_NameError,
|
||||
UNBOUNDFREE_ERROR_MSG, name);
|
||||
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
|
||||
UNBOUNDFREE_ERROR_MSG, name);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
format_awaitable_error(PyThreadState *tstate, PyTypeObject *type, int oparg)
|
||||
void
|
||||
_PyEval_FormatAwaitableError(PyThreadState *tstate, PyTypeObject *type, int oparg)
|
||||
{
|
||||
if (type->tp_as_async == NULL || type->tp_as_async->am_await == NULL) {
|
||||
if (oparg == 1) {
|
||||
|
|
@ -2703,110 +2679,3 @@ void Py_LeaveRecursiveCall(void)
|
|||
{
|
||||
_Py_LeaveRecursiveCall();
|
||||
}
|
||||
|
||||
///////////////////// Experimental UOp Interpreter /////////////////////
|
||||
|
||||
#undef ASSERT_KWNAMES_IS_NULL
|
||||
#define ASSERT_KWNAMES_IS_NULL() (void)0
|
||||
|
||||
#undef DEOPT_IF
|
||||
#define DEOPT_IF(COND, INSTNAME) \
|
||||
if ((COND)) { \
|
||||
goto deoptimize; \
|
||||
}
|
||||
|
||||
_PyInterpreterFrame *
|
||||
_PyUopExecute(_PyExecutorObject *executor, _PyInterpreterFrame *frame, PyObject **stack_pointer)
|
||||
{
|
||||
#ifdef Py_DEBUG
|
||||
char *uop_debug = Py_GETENV("PYTHONUOPSDEBUG");
|
||||
int lltrace = 0;
|
||||
if (uop_debug != NULL && *uop_debug >= '0') {
|
||||
lltrace = *uop_debug - '0'; // TODO: Parse an int and all that
|
||||
}
|
||||
#define DPRINTF(level, ...) \
|
||||
if (lltrace >= (level)) { fprintf(stderr, __VA_ARGS__); }
|
||||
#else
|
||||
#define DPRINTF(level, ...)
|
||||
#endif
|
||||
|
||||
DPRINTF(3,
|
||||
"Entering _PyUopExecute for %s (%s:%d) at byte offset %ld\n",
|
||||
PyUnicode_AsUTF8(_PyFrame_GetCode(frame)->co_qualname),
|
||||
PyUnicode_AsUTF8(_PyFrame_GetCode(frame)->co_filename),
|
||||
_PyFrame_GetCode(frame)->co_firstlineno,
|
||||
2 * (long)(frame->prev_instr + 1 -
|
||||
(_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive));
|
||||
|
||||
PyThreadState *tstate = _PyThreadState_GET();
|
||||
_PyUOpExecutorObject *self = (_PyUOpExecutorObject *)executor;
|
||||
|
||||
CHECK_EVAL_BREAKER();
|
||||
|
||||
OBJECT_STAT_INC(optimization_traces_executed);
|
||||
_Py_CODEUNIT *ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive;
|
||||
int pc = 0;
|
||||
int opcode;
|
||||
int oparg;
|
||||
uint64_t operand;
|
||||
|
||||
for (;;) {
|
||||
opcode = self->trace[pc].opcode;
|
||||
oparg = self->trace[pc].oparg;
|
||||
operand = self->trace[pc].operand;
|
||||
DPRINTF(3,
|
||||
"%4d: uop %s, oparg %d, operand %" PRIu64 ", stack_level %d\n",
|
||||
pc,
|
||||
opcode < 256 ? _PyOpcode_OpName[opcode] : _PyOpcode_uop_name[opcode],
|
||||
oparg,
|
||||
operand,
|
||||
(int)(stack_pointer - _PyFrame_Stackbase(frame)));
|
||||
pc++;
|
||||
OBJECT_STAT_INC(optimization_uops_executed);
|
||||
switch (opcode) {
|
||||
|
||||
#undef ENABLE_SPECIALIZATION
|
||||
#define ENABLE_SPECIALIZATION 0
|
||||
#include "executor_cases.c.h"
|
||||
|
||||
default:
|
||||
{
|
||||
fprintf(stderr, "Unknown uop %d, operand %" PRIu64 "\n", opcode, operand);
|
||||
Py_FatalError("Unknown uop");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
unbound_local_error:
|
||||
format_exc_check_arg(tstate, PyExc_UnboundLocalError,
|
||||
UNBOUNDLOCAL_ERROR_MSG,
|
||||
PyTuple_GetItem(_PyFrame_GetCode(frame)->co_localsplusnames, oparg)
|
||||
);
|
||||
goto error;
|
||||
|
||||
pop_4_error:
|
||||
STACK_SHRINK(1);
|
||||
pop_3_error:
|
||||
STACK_SHRINK(1);
|
||||
pop_2_error:
|
||||
STACK_SHRINK(1);
|
||||
pop_1_error:
|
||||
STACK_SHRINK(1);
|
||||
error:
|
||||
// On ERROR_IF we return NULL as the frame.
|
||||
// The caller recovers the frame from cframe.current_frame.
|
||||
DPRINTF(2, "Error: [Opcode %d, operand %" PRIu64 "]\n", opcode, operand);
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
Py_DECREF(self);
|
||||
return NULL;
|
||||
|
||||
deoptimize:
|
||||
// On DEOPT_IF we just repeat the last instruction.
|
||||
// This presumes nothing was popped from the stack (nor pushed).
|
||||
DPRINTF(2, "DEOPT: [Opcode %d, operand %" PRIu64 "]\n", opcode, operand);
|
||||
frame->prev_instr--; // Back up to just before destination
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
Py_DECREF(self);
|
||||
return frame;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue