Skip to content

bpo-46420: Use NOTRACE_DISPATCH() in specialized opcodes #30652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2022
Merged

bpo-46420: Use NOTRACE_DISPATCH() in specialized opcodes #30652

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753f04c
Use NOTRACE_DISPATCH() in specialized opcodes
sweeneyde Jan 17, 2022
ad47ec2
Use DISPATCH() on BINARY_SUBSCR_DICT, STORE_SUBSCR_DICT, CALL_NO_KW_B…
sweeneyde Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 43 additions & 26 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2048,6 +2048,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(BINARY_OP_MULTIPLY_INT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
Expand All @@ -2061,10 +2062,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (prod == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_MULTIPLY_FLOAT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
Expand All @@ -2080,10 +2082,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (prod == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_SUBTRACT_INT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
Expand All @@ -2097,10 +2100,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (sub == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_SUBTRACT_FLOAT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
Expand All @@ -2115,10 +2119,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (sub == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_ADD_UNICODE) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
Expand All @@ -2132,10 +2137,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (TOP() == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_INPLACE_ADD_UNICODE) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
Expand All @@ -2160,10 +2166,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (TOP() == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_ADD_FLOAT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
Expand All @@ -2179,10 +2186,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (sum == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_OP_ADD_INT) {
assert(cframe.use_tracing == 0);
PyObject *left = SECOND();
PyObject *right = TOP();
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
Expand All @@ -2196,7 +2204,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (sum == NULL) {
goto error;
}
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_SUBSCR) {
Expand Down Expand Up @@ -2233,6 +2241,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(BINARY_SUBSCR_LIST_INT) {
assert(cframe.use_tracing == 0);
PyObject *sub = TOP();
PyObject *list = SECOND();
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
Expand All @@ -2252,10 +2261,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(sub);
SET_TOP(res);
Py_DECREF(list);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_SUBSCR_TUPLE_INT) {
assert(cframe.use_tracing == 0);
PyObject *sub = TOP();
PyObject *tuple = SECOND();
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
Expand All @@ -2275,10 +2285,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(sub);
SET_TOP(res);
Py_DECREF(tuple);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(BINARY_SUBSCR_DICT) {
assert(cframe.use_tracing == 0);
PyObject *dict = SECOND();
DEOPT_IF(!PyDict_CheckExact(SECOND()), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
Expand Down Expand Up @@ -2385,6 +2396,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(STORE_SUBSCR_LIST_INT) {
assert(cframe.use_tracing == 0);
PyObject *sub = TOP();
PyObject *list = SECOND();
PyObject *value = THIRD();
Expand All @@ -2405,10 +2417,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(old_value);
Py_DECREF(sub);
Py_DECREF(list);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(STORE_SUBSCR_DICT) {
assert(cframe.use_tracing == 0);
PyObject *sub = TOP();
PyObject *dict = SECOND();
PyObject *value = THIRD();
Expand Down Expand Up @@ -3103,7 +3116,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
STAT_INC(LOAD_GLOBAL, hit);
Py_INCREF(res);
PUSH(res);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_GLOBAL_BUILTIN) {
Expand All @@ -3123,7 +3136,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
STAT_INC(LOAD_GLOBAL, hit);
Py_INCREF(res);
PUSH(res);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(DELETE_FAST) {
Expand Down Expand Up @@ -3555,7 +3568,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_INCREF(res);
SET_TOP(res);
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_ATTR_MODULE) {
Expand All @@ -3566,7 +3579,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
LOAD_MODULE_ATTR_OR_METHOD(ATTR);
SET_TOP(res);
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_ATTR_WITH_HINT) {
Expand Down Expand Up @@ -3594,7 +3607,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_INCREF(res);
SET_TOP(res);
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_ATTR_SLOT) {
Expand All @@ -3614,7 +3627,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_INCREF(res);
SET_TOP(res);
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(STORE_ATTR_ADAPTIVE) {
Expand Down Expand Up @@ -3663,7 +3676,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(old_value);
}
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(STORE_ATTR_WITH_HINT) {
Expand Down Expand Up @@ -3698,7 +3711,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
/* PEP 509 */
dict->ma_version_tag = DICT_NEXT_VERSION();
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(STORE_ATTR_SLOT) {
Expand All @@ -3718,7 +3731,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(COMPARE_OP) {
Expand Down Expand Up @@ -4506,10 +4519,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_INCREF(res);
SET_TOP(res);
PUSH(self);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_METHOD_NO_DICT) {
assert(cframe.use_tracing == 0);
PyObject *self = TOP();
PyTypeObject *self_cls = Py_TYPE(self);
SpecializedCacheEntry *caches = GET_CACHE();
Expand All @@ -4524,7 +4538,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_INCREF(res);
SET_TOP(res);
PUSH(self);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_METHOD_MODULE) {
Expand All @@ -4536,7 +4550,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
SET_TOP(NULL);
Py_DECREF(owner);
PUSH(res);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(LOAD_METHOD_CLASS) {
Expand All @@ -4559,7 +4573,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
SET_TOP(NULL);
Py_DECREF(cls);
PUSH(res);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(PRECALL_METHOD) {
Expand Down Expand Up @@ -4744,6 +4758,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(CALL_NO_KW_TYPE_1) {
assert(cframe.use_tracing == 0);
assert(STACK_ADJUST_IS_RESET);
assert(GET_CACHE()->adaptive.original_oparg == 1);
PyObject *obj = TOP();
Expand All @@ -4754,10 +4769,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(callable);
Py_DECREF(obj);
SET_TOP(res);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(CALL_NO_KW_BUILTIN_CLASS_1) {
assert(cframe.use_tracing == 0);
assert(STACK_ADJUST_IS_RESET);
SpecializedCacheEntry *caches = GET_CACHE();
_PyAdaptiveEntry *cache0 = &caches[0].adaptive;
Expand Down Expand Up @@ -4908,6 +4924,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(CALL_NO_KW_LIST_APPEND) {
assert(cframe.use_tracing == 0);
assert(_Py_OPCODE(next_instr[-2]) == PRECALL_METHOD);
assert(GET_CACHE()->adaptive.original_oparg == 1);
DEOPT_IF(extra_args == 0, CALL_NO_KW);
Expand All @@ -4929,7 +4946,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
STACK_SHRINK(2);
SET_TOP(Py_None);
Py_DECREF(callable);
DISPATCH();
NOTRACE_DISPATCH();
}

TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
Expand Down