2023-06-02 07:46:18 -03:00
|
|
|
#include "Python.h"
|
|
|
|
#include "opcode.h"
|
|
|
|
#include "pycore_interp.h"
|
2023-09-11 15:20:24 -03:00
|
|
|
#include "pycore_bitutils.h" // _Py_popcount32()
|
2024-02-20 05:39:55 -04:00
|
|
|
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
|
2024-01-09 14:18:11 -04:00
|
|
|
#include "pycore_opcode_metadata.h" // _PyOpcode_OpName[]
|
2023-09-06 10:56:08 -03:00
|
|
|
#include "pycore_opcode_utils.h" // MAX_REAL_OPCODE
|
|
|
|
#include "pycore_optimizer.h" // _Py_uop_analyze_and_optimize()
|
2023-07-02 13:37:37 -03:00
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
2023-12-20 10:27:25 -04:00
|
|
|
#include "pycore_uop_ids.h"
|
2024-01-28 22:48:48 -04:00
|
|
|
#include "pycore_jit.h"
|
2023-06-02 07:46:18 -03:00
|
|
|
#include "cpython/optimizer.h"
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
|
2023-12-20 10:27:25 -04:00
|
|
|
#define NEED_OPCODE_METADATA
|
|
|
|
#include "pycore_uop_metadata.h" // Uop tables
|
|
|
|
#undef NEED_OPCODE_METADATA
|
|
|
|
|
2023-07-11 17:25:41 -03:00
|
|
|
#define MAX_EXECUTORS_SIZE 256
|
|
|
|
|
2023-12-20 10:27:25 -04:00
|
|
|
|
2023-06-19 06:32:20 -03:00
|
|
|
static bool
|
|
|
|
has_space_for_executor(PyCodeObject *code, _Py_CODEUNIT *instr)
|
|
|
|
{
|
|
|
|
if (instr->op.code == ENTER_EXECUTOR) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (code->co_executors == NULL) {
|
|
|
|
return true;
|
|
|
|
}
|
2023-07-11 17:25:41 -03:00
|
|
|
return code->co_executors->size < MAX_EXECUTORS_SIZE;
|
2023-06-19 06:32:20 -03:00
|
|
|
}
|
|
|
|
|
2023-06-02 07:46:18 -03:00
|
|
|
static int32_t
|
2023-06-19 06:32:20 -03:00
|
|
|
get_index_for_executor(PyCodeObject *code, _Py_CODEUNIT *instr)
|
2023-06-02 07:46:18 -03:00
|
|
|
{
|
2023-06-19 06:32:20 -03:00
|
|
|
if (instr->op.code == ENTER_EXECUTOR) {
|
|
|
|
return instr->op.arg;
|
|
|
|
}
|
2023-06-02 07:46:18 -03:00
|
|
|
_PyExecutorArray *old = code->co_executors;
|
|
|
|
int size = 0;
|
|
|
|
int capacity = 0;
|
|
|
|
if (old != NULL) {
|
|
|
|
size = old->size;
|
|
|
|
capacity = old->capacity;
|
2023-07-11 17:25:41 -03:00
|
|
|
assert(size < MAX_EXECUTORS_SIZE);
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
assert(size <= capacity);
|
|
|
|
if (size == capacity) {
|
|
|
|
/* Array is full. Grow array */
|
|
|
|
int new_capacity = capacity ? capacity * 2 : 4;
|
|
|
|
_PyExecutorArray *new = PyMem_Realloc(
|
|
|
|
old,
|
|
|
|
offsetof(_PyExecutorArray, executors) +
|
|
|
|
new_capacity * sizeof(_PyExecutorObject *));
|
|
|
|
if (new == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
new->capacity = new_capacity;
|
|
|
|
new->size = size;
|
|
|
|
code->co_executors = new;
|
|
|
|
}
|
|
|
|
assert(size < code->co_executors->capacity);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
insert_executor(PyCodeObject *code, _Py_CODEUNIT *instr, int index, _PyExecutorObject *executor)
|
|
|
|
{
|
2023-06-19 06:32:20 -03:00
|
|
|
Py_INCREF(executor);
|
2023-06-02 07:46:18 -03:00
|
|
|
if (instr->op.code == ENTER_EXECUTOR) {
|
|
|
|
assert(index == instr->op.arg);
|
2024-02-12 05:04:36 -04:00
|
|
|
_Py_ExecutorClear(code->co_executors->executors[index]);
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-06-19 06:32:20 -03:00
|
|
|
assert(code->co_executors->size == index);
|
|
|
|
assert(code->co_executors->capacity > index);
|
|
|
|
code->co_executors->size++;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
2024-02-12 05:04:36 -04:00
|
|
|
executor->vm_data.opcode = instr->op.code;
|
|
|
|
executor->vm_data.oparg = instr->op.arg;
|
|
|
|
executor->vm_data.code = code;
|
|
|
|
executor->vm_data.index = (int)(instr - _PyCode_CODE(code));
|
|
|
|
code->co_executors->executors[index] = executor;
|
|
|
|
assert(index < MAX_EXECUTORS_SIZE);
|
|
|
|
instr->op.code = ENTER_EXECUTOR;
|
|
|
|
instr->op.arg = index;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyUnstable_Replace_Executor(PyCodeObject *code, _Py_CODEUNIT *instr, _PyExecutorObject *new)
|
|
|
|
{
|
|
|
|
if (instr->op.code != ENTER_EXECUTOR) {
|
|
|
|
PyErr_Format(PyExc_ValueError, "No executor to replace");
|
|
|
|
return -1;
|
|
|
|
}
|
2023-06-19 06:32:20 -03:00
|
|
|
int index = instr->op.arg;
|
2023-06-02 07:46:18 -03:00
|
|
|
assert(index >= 0);
|
|
|
|
insert_executor(code, instr, index, new);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-06-05 05:44:23 -03:00
|
|
|
static int
|
2024-02-02 08:14:34 -04:00
|
|
|
never_optimize(
|
2023-06-02 07:46:18 -03:00
|
|
|
_PyOptimizerObject* self,
|
2024-02-02 08:14:34 -04:00
|
|
|
_PyInterpreterFrame *frame,
|
2023-06-05 05:44:23 -03:00
|
|
|
_Py_CODEUNIT *instr,
|
2023-08-15 15:04:17 -03:00
|
|
|
_PyExecutorObject **exec,
|
|
|
|
int Py_UNUSED(stack_entries))
|
2023-06-02 07:46:18 -03:00
|
|
|
{
|
2024-02-13 10:16:37 -04:00
|
|
|
/* Although it should be benign for this to be called,
|
|
|
|
* it shouldn't happen, so fail in debug builds. */
|
|
|
|
assert(0 && "never optimize should never be called");
|
2024-02-02 08:14:34 -04:00
|
|
|
return 0;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
|
2023-10-29 17:53:25 -03:00
|
|
|
PyTypeObject _PyDefaultOptimizer_Type = {
|
2023-06-02 07:46:18 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
.tp_name = "noop_optimizer",
|
|
|
|
.tp_basicsize = sizeof(_PyOptimizerObject),
|
|
|
|
.tp_itemsize = 0,
|
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
|
|
|
};
|
|
|
|
|
2024-02-13 10:16:37 -04:00
|
|
|
static _PyOptimizerObject _PyOptimizer_Default = {
|
2023-10-29 17:53:25 -03:00
|
|
|
PyObject_HEAD_INIT(&_PyDefaultOptimizer_Type)
|
2024-02-02 08:14:34 -04:00
|
|
|
.optimize = never_optimize,
|
2024-02-13 10:16:37 -04:00
|
|
|
.resume_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD,
|
|
|
|
.backedge_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD,
|
2024-02-20 05:39:55 -04:00
|
|
|
.side_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD,
|
2023-06-02 07:46:18 -03:00
|
|
|
};
|
|
|
|
|
2024-02-13 10:16:37 -04:00
|
|
|
static uint32_t
|
2024-02-20 05:39:55 -04:00
|
|
|
shift_and_offset_threshold(uint32_t threshold)
|
2024-02-13 10:16:37 -04:00
|
|
|
{
|
|
|
|
return (threshold << OPTIMIZER_BITS_IN_COUNTER) + (1 << 15);
|
|
|
|
}
|
|
|
|
|
2023-06-02 07:46:18 -03:00
|
|
|
_PyOptimizerObject *
|
|
|
|
PyUnstable_GetOptimizer(void)
|
|
|
|
{
|
2023-07-02 13:37:37 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-02-13 10:16:37 -04:00
|
|
|
assert(interp->optimizer_backedge_threshold ==
|
|
|
|
shift_and_offset_threshold(interp->optimizer->backedge_threshold));
|
|
|
|
assert(interp->optimizer_resume_threshold ==
|
|
|
|
shift_and_offset_threshold(interp->optimizer->resume_threshold));
|
2024-02-20 05:39:55 -04:00
|
|
|
if (interp->optimizer == &_PyOptimizer_Default) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-06-02 07:46:18 -03:00
|
|
|
Py_INCREF(interp->optimizer);
|
|
|
|
return interp->optimizer;
|
|
|
|
}
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
static _PyExecutorObject *
|
|
|
|
make_executor_from_uops(_PyUOpInstruction *buffer, const _PyBloomFilter *dependencies);
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_cold_exit_executor(_PyExecutorObject *executor, int oparg);
|
|
|
|
|
|
|
|
static int cold_exits_initialized = 0;
|
|
|
|
static _PyExecutorObject COLD_EXITS[UOP_MAX_TRACE_LENGTH] = { 0 };
|
|
|
|
|
|
|
|
static const _PyBloomFilter EMPTY_FILTER = { 0 };
|
|
|
|
|
2024-02-13 10:16:37 -04:00
|
|
|
_PyOptimizerObject *
|
|
|
|
_Py_SetOptimizer(PyInterpreterState *interp, _PyOptimizerObject *optimizer)
|
2023-06-02 07:46:18 -03:00
|
|
|
{
|
|
|
|
if (optimizer == NULL) {
|
|
|
|
optimizer = &_PyOptimizer_Default;
|
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
else if (cold_exits_initialized == 0) {
|
|
|
|
cold_exits_initialized = 1;
|
|
|
|
for (int i = 0; i < UOP_MAX_TRACE_LENGTH; i++) {
|
|
|
|
if (init_cold_exit_executor(&COLD_EXITS[i], i)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-06-02 07:46:18 -03:00
|
|
|
_PyOptimizerObject *old = interp->optimizer;
|
2024-02-20 05:39:55 -04:00
|
|
|
if (old == NULL) {
|
|
|
|
old = &_PyOptimizer_Default;
|
|
|
|
}
|
2023-06-02 07:46:18 -03:00
|
|
|
Py_INCREF(optimizer);
|
|
|
|
interp->optimizer = optimizer;
|
2024-02-13 10:16:37 -04:00
|
|
|
interp->optimizer_backedge_threshold = shift_and_offset_threshold(optimizer->backedge_threshold);
|
|
|
|
interp->optimizer_resume_threshold = shift_and_offset_threshold(optimizer->resume_threshold);
|
2024-02-20 05:39:55 -04:00
|
|
|
interp->optimizer_side_threshold = optimizer->side_threshold;
|
|
|
|
if (optimizer == &_PyOptimizer_Default) {
|
|
|
|
assert(interp->optimizer_backedge_threshold > (1 << 16));
|
|
|
|
assert(interp->optimizer_resume_threshold > (1 << 16));
|
|
|
|
}
|
2024-02-13 10:16:37 -04:00
|
|
|
return old;
|
|
|
|
}
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
int
|
2024-02-13 10:16:37 -04:00
|
|
|
PyUnstable_SetOptimizer(_PyOptimizerObject *optimizer)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
_PyOptimizerObject *old = _Py_SetOptimizer(interp, optimizer);
|
2024-02-20 05:39:55 -04:00
|
|
|
Py_XDECREF(old);
|
|
|
|
return old == NULL ? -1 : 0;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
/* Returns 1 if optimized, 0 if not optimized, and -1 for an error.
|
|
|
|
* If optimized, *executor_ptr contains a new reference to the executor
|
|
|
|
*/
|
2023-09-13 14:26:50 -03:00
|
|
|
int
|
2024-02-20 05:39:55 -04:00
|
|
|
_PyOptimizer_Optimize(
|
|
|
|
_PyInterpreterFrame *frame, _Py_CODEUNIT *start,
|
|
|
|
PyObject **stack_pointer, _PyExecutorObject **executor_ptr)
|
2023-06-02 07:46:18 -03:00
|
|
|
{
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
PyCodeObject *code = _PyFrame_GetCode(frame);
|
2023-06-14 09:46:37 -03:00
|
|
|
assert(PyCode_Check(code));
|
2023-07-02 13:37:37 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-01-11 14:20:42 -04:00
|
|
|
if (!has_space_for_executor(code, start)) {
|
2023-09-13 14:26:50 -03:00
|
|
|
return 0;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
_PyOptimizerObject *opt = interp->optimizer;
|
2024-02-20 05:39:55 -04:00
|
|
|
int err = opt->optimize(opt, frame, start, executor_ptr, (int)(stack_pointer - _PyFrame_Stackbase(frame)));
|
2023-06-05 05:44:23 -03:00
|
|
|
if (err <= 0) {
|
2023-09-13 14:26:50 -03:00
|
|
|
return err;
|
2023-06-19 06:32:20 -03:00
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
assert(*executor_ptr != NULL);
|
2024-01-11 14:20:42 -04:00
|
|
|
int index = get_index_for_executor(code, start);
|
2023-06-19 06:32:20 -03:00
|
|
|
if (index < 0) {
|
|
|
|
/* Out of memory. Don't raise and assume that the
|
|
|
|
* error will show up elsewhere.
|
|
|
|
*
|
|
|
|
* If an optimizer has already produced an executor,
|
|
|
|
* it might get confused by the executor disappearing,
|
|
|
|
* but there is not much we can do about that here. */
|
2024-02-20 05:39:55 -04:00
|
|
|
Py_DECREF(*executor_ptr);
|
2023-09-13 14:26:50 -03:00
|
|
|
return 0;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
insert_executor(code, start, index, *executor_ptr);
|
|
|
|
assert((*executor_ptr)->vm_data.valid);
|
2023-09-13 14:26:50 -03:00
|
|
|
return 1;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
|
2023-07-04 13:23:00 -03:00
|
|
|
_PyExecutorObject *
|
|
|
|
PyUnstable_GetExecutor(PyCodeObject *code, int offset)
|
|
|
|
{
|
|
|
|
int code_len = (int)Py_SIZE(code);
|
|
|
|
for (int i = 0 ; i < code_len;) {
|
|
|
|
if (_PyCode_CODE(code)[i].op.code == ENTER_EXECUTOR && i*2 == offset) {
|
|
|
|
int oparg = _PyCode_CODE(code)[i].op.arg;
|
|
|
|
_PyExecutorObject *res = code->co_executors->executors[oparg];
|
|
|
|
Py_INCREF(res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
i += _PyInstruction_GetLength(code, i);
|
|
|
|
}
|
2023-07-06 15:39:53 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, "no executor at given byte offset");
|
2023-07-04 13:23:00 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2023-10-26 07:31:51 -03:00
|
|
|
static PyObject *
|
|
|
|
is_valid(PyObject *self, PyObject *Py_UNUSED(ignored))
|
|
|
|
{
|
|
|
|
return PyBool_FromLong(((_PyExecutorObject *)self)->vm_data.valid);
|
|
|
|
}
|
|
|
|
|
2024-02-20 16:24:35 -04:00
|
|
|
static PyObject *
|
|
|
|
get_opcode(PyObject *self, PyObject *Py_UNUSED(ignored))
|
|
|
|
{
|
|
|
|
return PyLong_FromUnsignedLong(((_PyExecutorObject *)self)->vm_data.opcode);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_oparg(PyObject *self, PyObject *Py_UNUSED(ignored))
|
|
|
|
{
|
|
|
|
return PyLong_FromUnsignedLong(((_PyExecutorObject *)self)->vm_data.oparg);
|
|
|
|
}
|
|
|
|
|
2023-10-26 07:31:51 -03:00
|
|
|
static PyMethodDef executor_methods[] = {
|
|
|
|
{ "is_valid", is_valid, METH_NOARGS, NULL },
|
2024-02-20 16:24:35 -04:00
|
|
|
{ "get_opcode", get_opcode, METH_NOARGS, NULL },
|
|
|
|
{ "get_oparg", get_oparg, METH_NOARGS, NULL },
|
2023-10-26 07:31:51 -03:00
|
|
|
{ NULL, NULL },
|
2023-10-23 10:49:09 -03:00
|
|
|
};
|
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
///////////////////// Experimental UOp Optimizer /////////////////////
|
|
|
|
|
|
|
|
static void
|
2024-01-12 07:58:23 -04:00
|
|
|
uop_dealloc(_PyExecutorObject *self) {
|
2024-02-20 05:39:55 -04:00
|
|
|
_PyObject_GC_UNTRACK(self);
|
2024-01-12 07:58:23 -04:00
|
|
|
_Py_ExecutorClear(self);
|
2024-01-28 22:48:48 -04:00
|
|
|
#ifdef _Py_JIT
|
|
|
|
_PyJIT_Free(self);
|
|
|
|
#endif
|
2024-02-20 05:39:55 -04:00
|
|
|
PyObject_GC_Del(self);
|
2023-06-26 23:02:57 -03:00
|
|
|
}
|
|
|
|
|
2023-11-17 18:25:57 -04:00
|
|
|
const char *
|
2023-11-28 21:10:11 -04:00
|
|
|
_PyUOpName(int index)
|
2023-11-17 15:49:42 -04:00
|
|
|
{
|
2024-02-20 16:24:35 -04:00
|
|
|
if (index < 0 || index > MAX_UOP_ID) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-07-04 13:23:00 -03:00
|
|
|
return _PyOpcode_uop_name[index];
|
|
|
|
}
|
|
|
|
|
2024-02-20 16:24:35 -04:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
void
|
|
|
|
_PyUOpPrint(const _PyUOpInstruction *uop)
|
|
|
|
{
|
|
|
|
const char *name = _PyUOpName(uop->opcode);
|
|
|
|
if (name == NULL) {
|
|
|
|
printf("<uop %d>", uop->opcode);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
printf("%s", name);
|
|
|
|
}
|
2024-03-18 15:08:43 -03:00
|
|
|
printf(" (%d, target=%d, operand=%#" PRIx64 ")",
|
2024-02-20 16:24:35 -04:00
|
|
|
uop->oparg,
|
|
|
|
uop->target,
|
|
|
|
(uint64_t)uop->operand);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2023-07-04 13:23:00 -03:00
|
|
|
static Py_ssize_t
|
2024-01-12 07:58:23 -04:00
|
|
|
uop_len(_PyExecutorObject *self)
|
2023-07-04 13:23:00 -03:00
|
|
|
{
|
2024-02-20 05:39:55 -04:00
|
|
|
return self->code_size;
|
2023-07-04 13:23:00 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2024-01-12 07:58:23 -04:00
|
|
|
uop_item(_PyExecutorObject *self, Py_ssize_t index)
|
2023-07-04 13:23:00 -03:00
|
|
|
{
|
2023-07-10 20:04:26 -03:00
|
|
|
Py_ssize_t len = uop_len(self);
|
|
|
|
if (index < 0 || index >= len) {
|
|
|
|
PyErr_SetNone(PyExc_IndexError);
|
|
|
|
return NULL;
|
2023-07-04 13:23:00 -03:00
|
|
|
}
|
2023-11-28 21:10:11 -04:00
|
|
|
const char *name = _PyUOpName(self->trace[index].opcode);
|
2023-07-10 20:04:26 -03:00
|
|
|
if (name == NULL) {
|
|
|
|
name = "<nil>";
|
|
|
|
}
|
|
|
|
PyObject *oname = _PyUnicode_FromASCII(name, strlen(name));
|
|
|
|
if (oname == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-07-17 16:12:33 -03:00
|
|
|
PyObject *oparg = PyLong_FromUnsignedLong(self->trace[index].oparg);
|
|
|
|
if (oparg == NULL) {
|
|
|
|
Py_DECREF(oname);
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-02-20 16:24:35 -04:00
|
|
|
PyObject *target = PyLong_FromUnsignedLong(self->trace[index].target);
|
|
|
|
if (oparg == NULL) {
|
|
|
|
Py_DECREF(oparg);
|
|
|
|
Py_DECREF(oname);
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-07-10 20:04:26 -03:00
|
|
|
PyObject *operand = PyLong_FromUnsignedLongLong(self->trace[index].operand);
|
|
|
|
if (operand == NULL) {
|
2024-02-20 16:24:35 -04:00
|
|
|
Py_DECREF(target);
|
2023-07-17 16:12:33 -03:00
|
|
|
Py_DECREF(oparg);
|
2023-07-10 20:04:26 -03:00
|
|
|
Py_DECREF(oname);
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-02-20 16:24:35 -04:00
|
|
|
PyObject *args[4] = { oname, oparg, target, operand };
|
|
|
|
return _PyTuple_FromArraySteal(args, 4);
|
2023-07-04 13:23:00 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PySequenceMethods uop_as_sequence = {
|
|
|
|
.sq_length = (lenfunc)uop_len,
|
|
|
|
.sq_item = (ssizeargfunc)uop_item,
|
|
|
|
};
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
static int
|
|
|
|
executor_clear(PyObject *o)
|
|
|
|
{
|
|
|
|
_Py_ExecutorClear((_PyExecutorObject *)o);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
executor_traverse(PyObject *o, visitproc visit, void *arg)
|
|
|
|
{
|
|
|
|
_PyExecutorObject *executor = (_PyExecutorObject *)o;
|
|
|
|
for (uint32_t i = 0; i < executor->exit_count; i++) {
|
|
|
|
Py_VISIT(executor->exits[i].executor);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-10-29 17:53:25 -03:00
|
|
|
PyTypeObject _PyUOpExecutor_Type = {
|
2023-06-26 23:02:57 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
.tp_name = "uop_executor",
|
2024-02-20 05:39:55 -04:00
|
|
|
.tp_basicsize = offsetof(_PyExecutorObject, exits),
|
|
|
|
.tp_itemsize = 1,
|
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION | Py_TPFLAGS_HAVE_GC,
|
2023-06-26 23:02:57 -03:00
|
|
|
.tp_dealloc = (destructor)uop_dealloc,
|
2023-07-04 13:23:00 -03:00
|
|
|
.tp_as_sequence = &uop_as_sequence,
|
2023-10-26 07:31:51 -03:00
|
|
|
.tp_methods = executor_methods,
|
2024-02-20 05:39:55 -04:00
|
|
|
.tp_traverse = executor_traverse,
|
|
|
|
.tp_clear = executor_clear,
|
2023-06-26 23:02:57 -03:00
|
|
|
};
|
|
|
|
|
2023-11-14 11:30:33 -04:00
|
|
|
/* TO DO -- Generate these tables */
|
2023-11-08 09:31:55 -04:00
|
|
|
static const uint16_t
|
2023-12-20 10:27:25 -04:00
|
|
|
_PyUOp_Replacements[MAX_UOP_ID + 1] = {
|
2023-11-08 09:31:55 -04:00
|
|
|
[_ITER_JUMP_RANGE] = _GUARD_NOT_EXHAUSTED_RANGE,
|
|
|
|
[_ITER_JUMP_LIST] = _GUARD_NOT_EXHAUSTED_LIST,
|
|
|
|
[_ITER_JUMP_TUPLE] = _GUARD_NOT_EXHAUSTED_TUPLE,
|
2023-11-20 14:08:53 -04:00
|
|
|
[_FOR_ITER] = _FOR_ITER_TIER_TWO,
|
2023-11-08 09:31:55 -04:00
|
|
|
};
|
|
|
|
|
2023-11-14 11:30:33 -04:00
|
|
|
static const uint16_t
|
|
|
|
BRANCH_TO_GUARD[4][2] = {
|
|
|
|
[POP_JUMP_IF_FALSE - POP_JUMP_IF_FALSE][0] = _GUARD_IS_TRUE_POP,
|
|
|
|
[POP_JUMP_IF_FALSE - POP_JUMP_IF_FALSE][1] = _GUARD_IS_FALSE_POP,
|
|
|
|
[POP_JUMP_IF_TRUE - POP_JUMP_IF_FALSE][0] = _GUARD_IS_FALSE_POP,
|
|
|
|
[POP_JUMP_IF_TRUE - POP_JUMP_IF_FALSE][1] = _GUARD_IS_TRUE_POP,
|
|
|
|
[POP_JUMP_IF_NONE - POP_JUMP_IF_FALSE][0] = _GUARD_IS_NOT_NONE_POP,
|
|
|
|
[POP_JUMP_IF_NONE - POP_JUMP_IF_FALSE][1] = _GUARD_IS_NONE_POP,
|
|
|
|
[POP_JUMP_IF_NOT_NONE - POP_JUMP_IF_FALSE][0] = _GUARD_IS_NONE_POP,
|
|
|
|
[POP_JUMP_IF_NOT_NONE - POP_JUMP_IF_FALSE][1] = _GUARD_IS_NOT_NONE_POP,
|
|
|
|
};
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
|
2023-12-12 17:43:08 -04:00
|
|
|
#define CONFIDENCE_RANGE 1000
|
|
|
|
#define CONFIDENCE_CUTOFF 333
|
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
#ifdef Py_DEBUG
|
2023-07-03 17:05:11 -03:00
|
|
|
#define DPRINTF(level, ...) \
|
2023-08-08 01:36:25 -03:00
|
|
|
if (lltrace >= (level)) { printf(__VA_ARGS__); }
|
2023-06-26 23:02:57 -03:00
|
|
|
#else
|
2023-07-03 17:05:11 -03:00
|
|
|
#define DPRINTF(level, ...)
|
2023-06-26 23:02:57 -03:00
|
|
|
#endif
|
|
|
|
|
2023-11-15 11:48:58 -04:00
|
|
|
|
2024-02-20 16:24:35 -04:00
|
|
|
// Beware: Macro arg order differs from struct member order
|
|
|
|
#ifdef Py_DEBUG
|
2023-11-15 11:48:58 -04:00
|
|
|
#define ADD_TO_TRACE(OPCODE, OPARG, OPERAND, TARGET) \
|
2023-07-03 17:05:11 -03:00
|
|
|
assert(trace_length < max_length); \
|
|
|
|
trace[trace_length].opcode = (OPCODE); \
|
2023-07-17 16:12:33 -03:00
|
|
|
trace[trace_length].oparg = (OPARG); \
|
2024-02-20 16:24:35 -04:00
|
|
|
trace[trace_length].target = (TARGET); \
|
2023-07-03 17:05:11 -03:00
|
|
|
trace[trace_length].operand = (OPERAND); \
|
2024-02-20 16:24:35 -04:00
|
|
|
if (lltrace >= 2) { \
|
|
|
|
printf("%4d ADD_TO_TRACE: ", trace_length); \
|
|
|
|
_PyUOpPrint(&trace[trace_length]); \
|
|
|
|
printf("\n"); \
|
|
|
|
} \
|
|
|
|
trace_length++;
|
|
|
|
#else
|
|
|
|
#define ADD_TO_TRACE(OPCODE, OPARG, OPERAND, TARGET) \
|
|
|
|
assert(trace_length < max_length); \
|
|
|
|
trace[trace_length].opcode = (OPCODE); \
|
|
|
|
trace[trace_length].oparg = (OPARG); \
|
2023-11-15 11:48:58 -04:00
|
|
|
trace[trace_length].target = (TARGET); \
|
2024-02-20 16:24:35 -04:00
|
|
|
trace[trace_length].operand = (OPERAND); \
|
2023-07-03 17:05:11 -03:00
|
|
|
trace_length++;
|
2024-02-20 16:24:35 -04:00
|
|
|
#endif
|
2023-07-03 17:05:11 -03:00
|
|
|
|
2023-07-11 17:25:41 -03:00
|
|
|
#define INSTR_IP(INSTR, CODE) \
|
2023-07-17 16:12:33 -03:00
|
|
|
((uint32_t)((INSTR) - ((_Py_CODEUNIT *)(CODE)->co_code_adaptive)))
|
2023-07-11 17:25:41 -03:00
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
// Reserve space for n uops
|
|
|
|
#define RESERVE_RAW(n, opname) \
|
|
|
|
if (trace_length + (n) > max_length) { \
|
|
|
|
DPRINTF(2, "No room for %s (need %d, got %d)\n", \
|
|
|
|
(opname), (n), max_length - trace_length); \
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(trace_too_long); \
|
2023-07-13 21:27:35 -03:00
|
|
|
goto done; \
|
2023-11-20 14:45:42 -04:00
|
|
|
}
|
2023-07-13 21:27:35 -03:00
|
|
|
|
2023-11-20 14:45:42 -04:00
|
|
|
// Reserve space for N uops, plus 3 for _SET_IP, _CHECK_VALIDITY and _EXIT_TRACE
|
2023-11-28 21:10:11 -04:00
|
|
|
#define RESERVE(needed) RESERVE_RAW((needed) + 3, _PyUOpName(opcode))
|
2023-07-13 21:27:35 -03:00
|
|
|
|
2023-08-17 15:29:58 -03:00
|
|
|
// Trace stack operations (used by _PUSH_FRAME, _POP_FRAME)
|
|
|
|
#define TRACE_STACK_PUSH() \
|
|
|
|
if (trace_stack_depth >= TRACE_STACK_SIZE) { \
|
|
|
|
DPRINTF(2, "Trace stack overflow\n"); \
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(trace_stack_overflow); \
|
2024-03-23 19:19:17 -03:00
|
|
|
ADD_TO_TRACE(uop, oparg, operand, target); \
|
2023-11-15 11:48:58 -04:00
|
|
|
ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0); \
|
2023-08-17 15:29:58 -03:00
|
|
|
goto done; \
|
|
|
|
} \
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
assert(func == NULL || func->func_code == (PyObject *)code); \
|
2024-02-02 08:14:34 -04:00
|
|
|
trace_stack[trace_stack_depth].func = func; \
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
trace_stack[trace_stack_depth].code = code; \
|
2023-08-17 15:29:58 -03:00
|
|
|
trace_stack[trace_stack_depth].instr = instr; \
|
|
|
|
trace_stack_depth++;
|
|
|
|
#define TRACE_STACK_POP() \
|
|
|
|
if (trace_stack_depth <= 0) { \
|
|
|
|
Py_FatalError("Trace stack underflow\n"); \
|
|
|
|
} \
|
|
|
|
trace_stack_depth--; \
|
2024-02-02 08:14:34 -04:00
|
|
|
func = trace_stack[trace_stack_depth].func; \
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
code = trace_stack[trace_stack_depth].code; \
|
|
|
|
assert(func == NULL || func->func_code == (PyObject *)code); \
|
2023-08-17 15:29:58 -03:00
|
|
|
instr = trace_stack[trace_stack_depth].instr;
|
|
|
|
|
2024-01-11 14:20:42 -04:00
|
|
|
/* Returns 1 on success,
|
|
|
|
* 0 if it failed to produce a worthwhile trace,
|
|
|
|
* and -1 on an error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
translate_bytecode_to_trace(
|
2024-02-02 08:14:34 -04:00
|
|
|
_PyInterpreterFrame *frame,
|
2024-01-11 14:20:42 -04:00
|
|
|
_Py_CODEUNIT *instr,
|
|
|
|
_PyUOpInstruction *trace,
|
|
|
|
int buffer_size,
|
|
|
|
_PyBloomFilter *dependencies)
|
|
|
|
{
|
|
|
|
bool progress_needed = true;
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
PyCodeObject *code = _PyFrame_GetCode(frame);
|
2024-02-02 08:14:34 -04:00
|
|
|
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
|
|
|
|
assert(PyFunction_Check(func));
|
2024-01-11 14:20:42 -04:00
|
|
|
PyCodeObject *initial_code = code;
|
|
|
|
_Py_BloomFilter_Add(dependencies, initial_code);
|
|
|
|
_Py_CODEUNIT *initial_instr = instr;
|
|
|
|
int trace_length = 0;
|
|
|
|
int max_length = buffer_size;
|
|
|
|
struct {
|
2024-02-02 08:14:34 -04:00
|
|
|
PyFunctionObject *func;
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
PyCodeObject *code;
|
2024-01-11 14:20:42 -04:00
|
|
|
_Py_CODEUNIT *instr;
|
|
|
|
} trace_stack[TRACE_STACK_SIZE];
|
|
|
|
int trace_stack_depth = 0;
|
|
|
|
int confidence = CONFIDENCE_RANGE; // Adjusted by branch instructions
|
|
|
|
|
|
|
|
#ifdef Py_DEBUG
|
|
|
|
char *python_lltrace = Py_GETENV("PYTHON_LLTRACE");
|
|
|
|
int lltrace = 0;
|
|
|
|
if (python_lltrace != NULL && *python_lltrace >= '0') {
|
|
|
|
lltrace = *python_lltrace - '0'; // TODO: Parse an int and all that
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2024-03-18 15:08:43 -03:00
|
|
|
DPRINTF(2,
|
2023-07-17 16:12:33 -03:00
|
|
|
"Optimizing %s (%s:%d) at byte offset %d\n",
|
2023-07-03 17:05:11 -03:00
|
|
|
PyUnicode_AsUTF8(code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(code->co_filename),
|
|
|
|
code->co_firstlineno,
|
2023-07-11 17:25:41 -03:00
|
|
|
2 * INSTR_IP(initial_instr, code));
|
2023-11-15 11:48:58 -04:00
|
|
|
uint32_t target = 0;
|
2024-01-11 14:20:42 -04:00
|
|
|
|
2023-09-11 15:20:24 -03:00
|
|
|
top: // Jump here after _PUSH_FRAME or likely branches
|
2023-07-03 17:05:11 -03:00
|
|
|
for (;;) {
|
2023-11-15 11:48:58 -04:00
|
|
|
target = INSTR_IP(instr, code);
|
2024-02-13 12:28:19 -04:00
|
|
|
RESERVE_RAW(2, "epilogue"); // Always need space for _SET_IP, _CHECK_VALIDITY and _EXIT_TRACE
|
|
|
|
ADD_TO_TRACE(_CHECK_VALIDITY_AND_SET_IP, 0, (uintptr_t)instr, target);
|
2023-07-13 21:27:35 -03:00
|
|
|
|
2023-07-17 16:12:33 -03:00
|
|
|
uint32_t opcode = instr->op.code;
|
|
|
|
uint32_t oparg = instr->op.arg;
|
2023-12-24 14:07:34 -04:00
|
|
|
uint32_t extended = 0;
|
2023-07-13 21:27:35 -03:00
|
|
|
|
2024-03-18 15:08:43 -03:00
|
|
|
DPRINTF(2, "%d: %s(%d)\n", target, _PyOpcode_OpName[opcode], oparg);
|
2024-02-22 16:23:48 -04:00
|
|
|
|
2024-01-11 14:20:42 -04:00
|
|
|
if (opcode == ENTER_EXECUTOR) {
|
|
|
|
assert(oparg < 256);
|
2024-01-12 07:58:23 -04:00
|
|
|
_PyExecutorObject *executor = code->co_executors->executors[oparg];
|
2024-01-11 14:20:42 -04:00
|
|
|
opcode = executor->vm_data.opcode;
|
|
|
|
DPRINTF(2, " * ENTER_EXECUTOR -> %s\n", _PyOpcode_OpName[opcode]);
|
|
|
|
oparg = executor->vm_data.oparg;
|
|
|
|
}
|
|
|
|
|
2023-11-15 11:48:58 -04:00
|
|
|
if (opcode == EXTENDED_ARG) {
|
2023-07-06 20:46:06 -03:00
|
|
|
instr++;
|
2023-12-24 14:07:34 -04:00
|
|
|
extended = 1;
|
2023-07-06 20:46:06 -03:00
|
|
|
opcode = instr->op.code;
|
2023-07-07 14:42:10 -03:00
|
|
|
oparg = (oparg << 8) | instr->op.arg;
|
2023-11-15 11:48:58 -04:00
|
|
|
if (opcode == EXTENDED_ARG) {
|
|
|
|
instr--;
|
|
|
|
goto done;
|
|
|
|
}
|
2023-07-06 20:46:06 -03:00
|
|
|
}
|
2024-01-11 14:20:42 -04:00
|
|
|
assert(opcode != ENTER_EXECUTOR && opcode != EXTENDED_ARG);
|
|
|
|
|
|
|
|
/* Special case the first instruction,
|
|
|
|
* so that we can guarantee forward progress */
|
|
|
|
if (progress_needed) {
|
|
|
|
progress_needed = false;
|
|
|
|
if (opcode == JUMP_BACKWARD || opcode == JUMP_BACKWARD_NO_INTERRUPT) {
|
|
|
|
instr += 1 + _PyOpcode_Caches[opcode] - (int32_t)oparg;
|
|
|
|
initial_instr = instr;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (OPCODE_HAS_DEOPT(opcode)) {
|
|
|
|
opcode = _PyOpcode_Deopt[opcode];
|
|
|
|
}
|
|
|
|
assert(!OPCODE_HAS_DEOPT(opcode));
|
|
|
|
}
|
2023-07-07 15:41:42 -03:00
|
|
|
}
|
2023-07-13 21:27:35 -03:00
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
switch (opcode) {
|
2023-07-17 14:06:05 -03:00
|
|
|
case POP_JUMP_IF_NONE:
|
|
|
|
case POP_JUMP_IF_NOT_NONE:
|
2023-07-10 20:04:26 -03:00
|
|
|
case POP_JUMP_IF_FALSE:
|
|
|
|
case POP_JUMP_IF_TRUE:
|
|
|
|
{
|
2023-11-20 14:45:42 -04:00
|
|
|
RESERVE(1);
|
2023-09-11 15:20:24 -03:00
|
|
|
int counter = instr[1].cache;
|
|
|
|
int bitcount = _Py_popcount32(counter);
|
2023-11-14 11:30:33 -04:00
|
|
|
int jump_likely = bitcount > 8;
|
2024-02-22 16:23:48 -04:00
|
|
|
/* If bitcount is 8 (half the jumps were taken), adjust confidence by 50%.
|
|
|
|
If it's 16 or 0 (all or none were taken), adjust by 10%
|
|
|
|
(since the future is still somewhat uncertain).
|
|
|
|
For values in between, adjust proportionally. */
|
2023-12-12 17:43:08 -04:00
|
|
|
if (jump_likely) {
|
2024-02-22 16:23:48 -04:00
|
|
|
confidence = confidence * (bitcount + 2) / 20;
|
2023-12-12 17:43:08 -04:00
|
|
|
}
|
|
|
|
else {
|
2024-02-22 16:23:48 -04:00
|
|
|
confidence = confidence * (18 - bitcount) / 20;
|
2023-12-12 17:43:08 -04:00
|
|
|
}
|
2024-02-22 16:23:48 -04:00
|
|
|
uint32_t uopcode = BRANCH_TO_GUARD[opcode - POP_JUMP_IF_FALSE][jump_likely];
|
2024-03-18 15:08:43 -03:00
|
|
|
DPRINTF(2, "%d: %s(%d): counter=%04x, bitcount=%d, likely=%d, confidence=%d, uopcode=%s\n",
|
2024-02-22 16:23:48 -04:00
|
|
|
target, _PyOpcode_OpName[opcode], oparg,
|
|
|
|
counter, bitcount, jump_likely, confidence, _PyUOpName(uopcode));
|
2023-12-12 17:43:08 -04:00
|
|
|
if (confidence < CONFIDENCE_CUTOFF) {
|
2024-02-22 16:23:48 -04:00
|
|
|
DPRINTF(2, "Confidence too low (%d < %d)\n", confidence, CONFIDENCE_CUTOFF);
|
2023-12-12 17:43:08 -04:00
|
|
|
OPT_STAT_INC(low_confidence);
|
|
|
|
goto done;
|
|
|
|
}
|
2024-01-15 07:41:06 -04:00
|
|
|
_Py_CODEUNIT *next_instr = instr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[opcode]];
|
|
|
|
_Py_CODEUNIT *target_instr = next_instr + oparg;
|
2023-09-11 15:20:24 -03:00
|
|
|
if (jump_likely) {
|
2024-03-18 15:08:43 -03:00
|
|
|
DPRINTF(2, "Jump likely (%04x = %d bits), continue at byte offset %d\n",
|
2023-09-11 15:20:24 -03:00
|
|
|
instr[1].cache, bitcount, 2 * INSTR_IP(target_instr, code));
|
|
|
|
instr = target_instr;
|
2024-01-15 07:41:06 -04:00
|
|
|
ADD_TO_TRACE(uopcode, max_length, 0, INSTR_IP(next_instr, code));
|
2023-09-11 15:20:24 -03:00
|
|
|
goto top;
|
|
|
|
}
|
2024-01-15 07:41:06 -04:00
|
|
|
ADD_TO_TRACE(uopcode, max_length, 0, INSTR_IP(target_instr, code));
|
2023-07-10 20:04:26 -03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2023-07-11 15:08:10 -03:00
|
|
|
case JUMP_BACKWARD:
|
2023-12-24 14:07:34 -04:00
|
|
|
case JUMP_BACKWARD_NO_INTERRUPT:
|
2023-07-11 15:08:10 -03:00
|
|
|
{
|
2024-01-11 14:20:42 -04:00
|
|
|
_Py_CODEUNIT *target = instr + 1 + _PyOpcode_Caches[opcode] - (int)oparg;
|
|
|
|
if (target == initial_instr) {
|
|
|
|
/* We have looped round to the start */
|
2023-11-20 14:45:42 -04:00
|
|
|
RESERVE(1);
|
2023-11-15 11:48:58 -04:00
|
|
|
ADD_TO_TRACE(_JUMP_TO_TOP, 0, 0, 0);
|
2023-07-11 15:08:10 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(inner_loop);
|
2023-07-11 15:08:10 -03:00
|
|
|
DPRINTF(2, "JUMP_BACKWARD not to top ends trace\n");
|
|
|
|
}
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2023-07-11 19:13:57 -03:00
|
|
|
case JUMP_FORWARD:
|
|
|
|
{
|
2023-11-20 14:45:42 -04:00
|
|
|
RESERVE(0);
|
2023-09-11 19:39:19 -03:00
|
|
|
// This will emit two _SET_IP instructions; leave it to the optimizer
|
2023-07-11 19:13:57 -03:00
|
|
|
instr += oparg;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
default:
|
|
|
|
{
|
|
|
|
const struct opcode_macro_expansion *expansion = &_PyOpcode_macro_expansion[opcode];
|
|
|
|
if (expansion->nuops > 0) {
|
2023-09-11 19:39:19 -03:00
|
|
|
// Reserve space for nuops (+ _SET_IP + _EXIT_TRACE)
|
2023-06-26 23:02:57 -03:00
|
|
|
int nuops = expansion->nuops;
|
2023-11-20 14:45:42 -04:00
|
|
|
RESERVE(nuops);
|
2023-08-17 15:29:58 -03:00
|
|
|
if (expansion->uops[nuops-1].uop == _POP_FRAME) {
|
|
|
|
// Check for trace stack underflow now:
|
|
|
|
// We can't bail e.g. in the middle of
|
|
|
|
// LOAD_CONST + _POP_FRAME.
|
|
|
|
if (trace_stack_depth == 0) {
|
|
|
|
DPRINTF(2, "Trace stack underflow\n");
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(trace_stack_underflow);
|
|
|
|
goto done;
|
|
|
|
}
|
2023-08-17 15:29:58 -03:00
|
|
|
}
|
2023-07-17 16:12:33 -03:00
|
|
|
uint32_t orig_oparg = oparg; // For OPARG_TOP/BOTTOM
|
2023-06-26 23:02:57 -03:00
|
|
|
for (int i = 0; i < nuops; i++) {
|
2023-07-17 16:12:33 -03:00
|
|
|
oparg = orig_oparg;
|
2023-10-12 06:34:32 -03:00
|
|
|
uint32_t uop = expansion->uops[i].uop;
|
2023-07-17 16:12:33 -03:00
|
|
|
uint64_t operand = 0;
|
2023-07-31 18:16:57 -03:00
|
|
|
// Add one to account for the actual opcode/oparg pair:
|
|
|
|
int offset = expansion->uops[i].offset + 1;
|
2023-06-26 23:02:57 -03:00
|
|
|
switch (expansion->uops[i].size) {
|
2023-07-07 14:42:10 -03:00
|
|
|
case OPARG_FULL:
|
2023-12-24 14:07:34 -04:00
|
|
|
assert(opcode != JUMP_BACKWARD_NO_INTERRUPT && opcode != JUMP_BACKWARD);
|
2023-06-26 23:02:57 -03:00
|
|
|
break;
|
2023-07-07 14:42:10 -03:00
|
|
|
case OPARG_CACHE_1:
|
2023-06-26 23:02:57 -03:00
|
|
|
operand = read_u16(&instr[offset].cache);
|
|
|
|
break;
|
2023-07-07 14:42:10 -03:00
|
|
|
case OPARG_CACHE_2:
|
2023-06-26 23:02:57 -03:00
|
|
|
operand = read_u32(&instr[offset].cache);
|
|
|
|
break;
|
2023-07-07 14:42:10 -03:00
|
|
|
case OPARG_CACHE_4:
|
2023-06-26 23:02:57 -03:00
|
|
|
operand = read_u64(&instr[offset].cache);
|
|
|
|
break;
|
2023-07-07 14:42:10 -03:00
|
|
|
case OPARG_TOP: // First half of super-instr
|
2023-07-17 16:12:33 -03:00
|
|
|
oparg = orig_oparg >> 4;
|
2023-07-07 14:42:10 -03:00
|
|
|
break;
|
|
|
|
case OPARG_BOTTOM: // Second half of super-instr
|
2023-07-17 16:12:33 -03:00
|
|
|
oparg = orig_oparg & 0xF;
|
2023-07-07 14:42:10 -03:00
|
|
|
break;
|
2023-10-26 10:43:10 -03:00
|
|
|
case OPARG_SAVE_RETURN_OFFSET: // op=_SAVE_RETURN_OFFSET; oparg=return_offset
|
|
|
|
oparg = offset;
|
|
|
|
assert(uop == _SAVE_RETURN_OFFSET);
|
2023-08-16 20:26:43 -03:00
|
|
|
break;
|
2023-12-20 10:27:25 -04:00
|
|
|
case OPARG_REPLACED:
|
|
|
|
uop = _PyUOp_Replacements[uop];
|
|
|
|
assert(uop != 0);
|
|
|
|
if (uop == _FOR_ITER_TIER_TWO) {
|
2024-01-24 11:10:17 -04:00
|
|
|
target += 1 + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 2 + extended;
|
|
|
|
assert(_PyCode_CODE(code)[target-2].op.code == END_FOR ||
|
|
|
|
_PyCode_CODE(code)[target-2].op.code == INSTRUMENTED_END_FOR);
|
|
|
|
assert(_PyCode_CODE(code)[target-1].op.code == POP_TOP);
|
2023-12-20 10:27:25 -04:00
|
|
|
}
|
|
|
|
break;
|
2023-06-26 23:02:57 -03:00
|
|
|
default:
|
|
|
|
fprintf(stderr,
|
2023-07-07 14:42:10 -03:00
|
|
|
"opcode=%d, oparg=%d; nuops=%d, i=%d; size=%d, offset=%d\n",
|
|
|
|
opcode, oparg, nuops, i,
|
2023-06-26 23:02:57 -03:00
|
|
|
expansion->uops[i].size,
|
|
|
|
expansion->uops[i].offset);
|
|
|
|
Py_FatalError("garbled expansion");
|
|
|
|
}
|
2024-03-18 15:08:43 -03:00
|
|
|
|
2023-10-12 06:34:32 -03:00
|
|
|
if (uop == _POP_FRAME) {
|
2023-08-17 15:29:58 -03:00
|
|
|
TRACE_STACK_POP();
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
/* Set the operand to the function or code object returned to,
|
|
|
|
* to assist optimization passes. (See _PUSH_FRAME below.)
|
|
|
|
*/
|
|
|
|
if (func != NULL) {
|
|
|
|
operand = (uintptr_t)func;
|
|
|
|
}
|
|
|
|
else if (code != NULL) {
|
|
|
|
operand = (uintptr_t)code | 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
operand = 0;
|
|
|
|
}
|
|
|
|
ADD_TO_TRACE(uop, oparg, operand, target);
|
2023-08-17 15:29:58 -03:00
|
|
|
DPRINTF(2,
|
|
|
|
"Returning to %s (%s:%d) at byte offset %d\n",
|
|
|
|
PyUnicode_AsUTF8(code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(code->co_filename),
|
|
|
|
code->co_firstlineno,
|
|
|
|
2 * INSTR_IP(instr, code));
|
|
|
|
goto top;
|
|
|
|
}
|
2024-03-18 15:08:43 -03:00
|
|
|
|
2023-10-12 06:34:32 -03:00
|
|
|
if (uop == _PUSH_FRAME) {
|
2023-08-16 20:26:43 -03:00
|
|
|
assert(i + 1 == nuops);
|
2023-08-17 15:29:58 -03:00
|
|
|
int func_version_offset =
|
|
|
|
offsetof(_PyCallCache, func_version)/sizeof(_Py_CODEUNIT)
|
|
|
|
// Add one to account for the actual opcode/oparg pair:
|
|
|
|
+ 1;
|
|
|
|
uint32_t func_version = read_u32(&instr[func_version_offset].cache);
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
PyCodeObject *new_code = NULL;
|
|
|
|
PyFunctionObject *new_func =
|
|
|
|
_PyFunction_LookupByVersion(func_version, (PyObject **) &new_code);
|
|
|
|
DPRINTF(2, "Function: version=%#x; new_func=%p, new_code=%p\n",
|
|
|
|
(int)func_version, new_func, new_code);
|
|
|
|
if (new_code != NULL) {
|
2023-08-17 15:29:58 -03:00
|
|
|
if (new_code == code) {
|
|
|
|
// Recursive call, bail (we could be here forever).
|
|
|
|
DPRINTF(2, "Bailing on recursive call to %s (%s:%d)\n",
|
|
|
|
PyUnicode_AsUTF8(new_code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(new_code->co_filename),
|
|
|
|
new_code->co_firstlineno);
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(recursive_call);
|
2024-03-18 15:08:43 -03:00
|
|
|
ADD_TO_TRACE(uop, oparg, 0, target);
|
2023-11-15 11:48:58 -04:00
|
|
|
ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0);
|
2023-08-17 15:29:58 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (new_code->co_version != func_version) {
|
|
|
|
// func.__code__ was updated.
|
|
|
|
// Perhaps it may happen again, so don't bother tracing.
|
|
|
|
// TODO: Reason about this -- is it better to bail or not?
|
|
|
|
DPRINTF(2, "Bailing because co_version != func_version\n");
|
2024-03-18 15:08:43 -03:00
|
|
|
ADD_TO_TRACE(uop, oparg, 0, target);
|
2023-11-15 11:48:58 -04:00
|
|
|
ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0);
|
2023-08-17 15:29:58 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
// Increment IP to the return address
|
|
|
|
instr += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]] + 1;
|
|
|
|
TRACE_STACK_PUSH();
|
2023-10-23 10:49:09 -03:00
|
|
|
_Py_BloomFilter_Add(dependencies, new_code);
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
/* Set the operand to the callee's function or code object,
|
|
|
|
* to assist optimization passes.
|
|
|
|
* We prefer setting it to the function (for remove_globals())
|
|
|
|
* but if that's not available but the code is available,
|
|
|
|
* use the code, setting the low bit so the optimizer knows.
|
|
|
|
*/
|
|
|
|
if (new_func != NULL) {
|
|
|
|
operand = (uintptr_t)new_func;
|
|
|
|
}
|
|
|
|
else if (new_code != NULL) {
|
|
|
|
operand = (uintptr_t)new_code | 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
operand = 0;
|
|
|
|
}
|
|
|
|
ADD_TO_TRACE(uop, oparg, operand, target);
|
2023-08-17 15:29:58 -03:00
|
|
|
code = new_code;
|
2024-02-02 08:14:34 -04:00
|
|
|
func = new_func;
|
2023-08-17 15:29:58 -03:00
|
|
|
instr = _PyCode_CODE(code);
|
|
|
|
DPRINTF(2,
|
|
|
|
"Continuing in %s (%s:%d) at byte offset %d\n",
|
|
|
|
PyUnicode_AsUTF8(code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(code->co_filename),
|
|
|
|
code->co_firstlineno,
|
|
|
|
2 * INSTR_IP(instr, code));
|
|
|
|
goto top;
|
|
|
|
}
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
DPRINTF(2, "Bail, new_code == NULL\n");
|
|
|
|
ADD_TO_TRACE(uop, oparg, 0, target);
|
2023-11-15 11:48:58 -04:00
|
|
|
ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0);
|
2023-08-16 20:26:43 -03:00
|
|
|
goto done;
|
|
|
|
}
|
2024-03-18 15:08:43 -03:00
|
|
|
|
|
|
|
// All other instructions
|
|
|
|
ADD_TO_TRACE(uop, oparg, operand, target);
|
2023-06-26 23:02:57 -03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2024-01-09 14:18:11 -04:00
|
|
|
DPRINTF(2, "Unsupported opcode %s\n", _PyOpcode_OpName[opcode]);
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_UNSUPPORTED_OPCODE(opcode);
|
2023-07-03 17:05:11 -03:00
|
|
|
goto done; // Break out of loop
|
2023-07-13 21:27:35 -03:00
|
|
|
} // End default
|
|
|
|
|
|
|
|
} // End switch (opcode)
|
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
instr++;
|
|
|
|
// Add cache size for opcode
|
|
|
|
instr += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]];
|
2023-07-13 21:27:35 -03:00
|
|
|
} // End for (;;)
|
2023-07-03 17:05:11 -03:00
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
done:
|
2023-08-17 15:29:58 -03:00
|
|
|
while (trace_stack_depth > 0) {
|
|
|
|
TRACE_STACK_POP();
|
|
|
|
}
|
|
|
|
assert(code == initial_code);
|
2023-09-11 19:39:19 -03:00
|
|
|
// Skip short traces like _SET_IP, LOAD_FAST, _SET_IP, _EXIT_TRACE
|
2024-01-11 14:20:42 -04:00
|
|
|
if (progress_needed || trace_length < 5) {
|
2023-10-05 12:12:06 -03:00
|
|
|
OPT_STAT_INC(trace_too_short);
|
2024-03-18 15:08:43 -03:00
|
|
|
DPRINTF(2,
|
|
|
|
"No trace for %s (%s:%d) at byte offset %d (%s)\n",
|
2023-07-03 17:05:11 -03:00
|
|
|
PyUnicode_AsUTF8(code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(code->co_filename),
|
|
|
|
code->co_firstlineno,
|
2024-03-18 15:08:43 -03:00
|
|
|
2 * INSTR_IP(initial_instr, code),
|
|
|
|
progress_needed ? "no progress" : "too short");
|
2024-01-11 14:20:42 -04:00
|
|
|
return 0;
|
2023-06-26 23:02:57 -03:00
|
|
|
}
|
2024-01-11 14:20:42 -04:00
|
|
|
ADD_TO_TRACE(_EXIT_TRACE, 0, 0, target);
|
|
|
|
DPRINTF(1,
|
2024-03-18 15:08:43 -03:00
|
|
|
"Created a proto-trace for %s (%s:%d) at byte offset %d -- length %d\n",
|
2024-01-11 14:20:42 -04:00
|
|
|
PyUnicode_AsUTF8(code->co_qualname),
|
|
|
|
PyUnicode_AsUTF8(code->co_filename),
|
|
|
|
code->co_firstlineno,
|
|
|
|
2 * INSTR_IP(initial_instr, code),
|
|
|
|
trace_length);
|
|
|
|
OPT_HIST(trace_length + buffer_size - max_length, trace_length_hist);
|
|
|
|
return 1;
|
|
|
|
}
|
2023-06-26 23:02:57 -03:00
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
#undef RESERVE
|
|
|
|
#undef RESERVE_RAW
|
|
|
|
#undef INSTR_IP
|
2023-06-26 23:02:57 -03:00
|
|
|
#undef ADD_TO_TRACE
|
2023-07-03 17:05:11 -03:00
|
|
|
#undef DPRINTF
|
2023-06-26 23:02:57 -03:00
|
|
|
|
2023-11-06 07:28:52 -04:00
|
|
|
#define UNSET_BIT(array, bit) (array[(bit)>>5] &= ~(1<<((bit)&31)))
|
|
|
|
#define SET_BIT(array, bit) (array[(bit)>>5] |= (1<<((bit)&31)))
|
|
|
|
#define BIT_IS_SET(array, bit) (array[(bit)>>5] & (1<<((bit)&31)))
|
|
|
|
|
|
|
|
/* Count the number of used uops, and mark them in the bit vector `used`.
|
|
|
|
* This can be done in a single pass using simple reachability analysis,
|
|
|
|
* as there are no backward jumps.
|
|
|
|
* NOPs are excluded from the count.
|
|
|
|
*/
|
2023-08-29 13:51:51 -03:00
|
|
|
static int
|
2024-02-20 05:39:55 -04:00
|
|
|
compute_used(_PyUOpInstruction *buffer, uint32_t *used, int *exit_count_ptr)
|
2023-08-29 13:51:51 -03:00
|
|
|
{
|
2023-11-06 07:28:52 -04:00
|
|
|
int count = 0;
|
2024-02-20 05:39:55 -04:00
|
|
|
int exit_count = 0;
|
2023-11-06 07:28:52 -04:00
|
|
|
SET_BIT(used, 0);
|
2024-01-12 07:58:23 -04:00
|
|
|
for (int i = 0; i < UOP_MAX_TRACE_LENGTH; i++) {
|
2023-11-06 07:28:52 -04:00
|
|
|
if (!BIT_IS_SET(used, i)) {
|
|
|
|
continue;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
count++;
|
|
|
|
int opcode = buffer[i].opcode;
|
2024-02-20 05:39:55 -04:00
|
|
|
if (_PyUop_Flags[opcode] & HAS_EXIT_FLAG) {
|
|
|
|
exit_count++;
|
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
if (opcode == _JUMP_TO_TOP || opcode == _EXIT_TRACE) {
|
|
|
|
continue;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
/* All other micro-ops fall through, so i+1 is reachable */
|
|
|
|
SET_BIT(used, i+1);
|
2023-12-20 10:27:25 -04:00
|
|
|
assert(opcode <= MAX_UOP_ID);
|
|
|
|
if (_PyUop_Flags[opcode] & HAS_JUMP_FLAG) {
|
2023-11-14 11:30:33 -04:00
|
|
|
/* Mark target as reachable */
|
|
|
|
SET_BIT(used, buffer[i].oparg);
|
|
|
|
}
|
|
|
|
if (opcode == NOP) {
|
|
|
|
count--;
|
|
|
|
UNSET_BIT(used, i);
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
*exit_count_ptr = exit_count;
|
2023-11-06 07:28:52 -04:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
/* Executor side exits */
|
|
|
|
|
|
|
|
static _PyExecutorObject *
|
|
|
|
allocate_executor(int exit_count, int length)
|
|
|
|
{
|
|
|
|
int size = exit_count*sizeof(_PyExitData) + length*sizeof(_PyUOpInstruction);
|
|
|
|
_PyExecutorObject *res = PyObject_GC_NewVar(_PyExecutorObject, &_PyUOpExecutor_Type, size);
|
|
|
|
if (res == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
res->trace = (_PyUOpInstruction *)(res->exits + exit_count);
|
|
|
|
res->code_size = length;
|
|
|
|
res->exit_count = exit_count;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2023-11-06 07:28:52 -04:00
|
|
|
/* Makes an executor from a buffer of uops.
|
|
|
|
* Account for the buffer having gaps and NOPs by computing a "used"
|
|
|
|
* bit vector and only copying the used uops. Here "used" means reachable
|
|
|
|
* and not a NOP.
|
|
|
|
*/
|
|
|
|
static _PyExecutorObject *
|
2024-02-20 05:39:55 -04:00
|
|
|
make_executor_from_uops(_PyUOpInstruction *buffer, const _PyBloomFilter *dependencies)
|
2023-11-06 07:28:52 -04:00
|
|
|
{
|
2024-01-12 07:58:23 -04:00
|
|
|
uint32_t used[(UOP_MAX_TRACE_LENGTH + 31)/32] = { 0 };
|
2024-02-20 05:39:55 -04:00
|
|
|
int exit_count;
|
|
|
|
int length = compute_used(buffer, used, &exit_count);
|
2024-03-05 14:05:29 -04:00
|
|
|
length += 1; // For _START_EXECUTOR
|
|
|
|
_PyExecutorObject *executor = allocate_executor(exit_count, length);
|
2023-11-06 07:28:52 -04:00
|
|
|
if (executor == NULL) {
|
|
|
|
return NULL;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2024-03-19 08:06:43 -03:00
|
|
|
OPT_HIST(length, optimized_trace_length_hist);
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
/* Initialize exits */
|
|
|
|
for (int i = 0; i < exit_count; i++) {
|
|
|
|
executor->exits[i].executor = &COLD_EXITS[i];
|
|
|
|
executor->exits[i].temperature = 0;
|
|
|
|
}
|
|
|
|
int next_exit = exit_count-1;
|
2024-03-05 14:05:29 -04:00
|
|
|
_PyUOpInstruction *dest = (_PyUOpInstruction *)&executor->trace[length-1];
|
2023-11-06 07:28:52 -04:00
|
|
|
/* Scan backwards, so that we see the destinations of jumps before the jumps themselves. */
|
2024-01-12 07:58:23 -04:00
|
|
|
for (int i = UOP_MAX_TRACE_LENGTH-1; i >= 0; i--) {
|
2023-11-06 07:28:52 -04:00
|
|
|
if (!BIT_IS_SET(used, i)) {
|
|
|
|
continue;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
*dest = buffer[i];
|
2023-11-06 07:28:52 -04:00
|
|
|
int opcode = buffer[i].opcode;
|
|
|
|
if (opcode == _POP_JUMP_IF_FALSE ||
|
|
|
|
opcode == _POP_JUMP_IF_TRUE)
|
|
|
|
{
|
|
|
|
/* The oparg of the target will already have been set to its new offset */
|
2024-02-20 05:39:55 -04:00
|
|
|
int oparg = dest->oparg;
|
|
|
|
dest->oparg = buffer[oparg].oparg;
|
|
|
|
}
|
|
|
|
if (_PyUop_Flags[opcode] & HAS_EXIT_FLAG) {
|
|
|
|
executor->exits[next_exit].target = buffer[i].target;
|
|
|
|
dest->exit_index = next_exit;
|
|
|
|
next_exit--;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
/* Set the oparg to be the destination offset,
|
|
|
|
* so that we can set the oparg of earlier jumps correctly. */
|
2024-02-20 05:39:55 -04:00
|
|
|
buffer[i].oparg = (uint16_t)(dest - executor->trace);
|
2023-11-06 07:28:52 -04:00
|
|
|
dest--;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
assert(next_exit == -1);
|
|
|
|
assert(dest == executor->trace);
|
|
|
|
dest->opcode = _START_EXECUTOR;
|
2024-03-18 15:08:43 -03:00
|
|
|
dest->oparg = 0;
|
|
|
|
dest->target = 0;
|
2024-02-20 05:39:55 -04:00
|
|
|
dest->operand = (uintptr_t)executor;
|
2024-01-12 07:58:23 -04:00
|
|
|
_Py_ExecutorInit(executor, dependencies);
|
2023-11-17 15:49:42 -04:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
char *python_lltrace = Py_GETENV("PYTHON_LLTRACE");
|
|
|
|
int lltrace = 0;
|
|
|
|
if (python_lltrace != NULL && *python_lltrace >= '0') {
|
|
|
|
lltrace = *python_lltrace - '0'; // TODO: Parse an int and all that
|
|
|
|
}
|
|
|
|
if (lltrace >= 2) {
|
2024-03-18 15:08:43 -03:00
|
|
|
printf("Optimized trace (length %d):\n", length);
|
2023-11-17 15:49:42 -04:00
|
|
|
for (int i = 0; i < length; i++) {
|
2024-02-20 16:24:35 -04:00
|
|
|
printf("%4d OPTIMIZED: ", i);
|
|
|
|
_PyUOpPrint(&executor->trace[i]);
|
|
|
|
printf("\n");
|
2023-11-17 15:49:42 -04:00
|
|
|
}
|
|
|
|
}
|
2024-01-28 22:48:48 -04:00
|
|
|
#endif
|
|
|
|
#ifdef _Py_JIT
|
|
|
|
executor->jit_code = NULL;
|
|
|
|
executor->jit_size = 0;
|
2024-03-05 14:05:29 -04:00
|
|
|
if (_PyJIT_Compile(executor, executor->trace, length)) {
|
2024-01-28 22:48:48 -04:00
|
|
|
Py_DECREF(executor);
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-11-17 15:49:42 -04:00
|
|
|
#endif
|
2024-02-20 05:39:55 -04:00
|
|
|
_PyObject_GC_TRACK(executor);
|
2024-01-12 07:58:23 -04:00
|
|
|
return executor;
|
2023-08-29 13:51:51 -03:00
|
|
|
}
|
|
|
|
|
2024-02-20 05:39:55 -04:00
|
|
|
static int
|
|
|
|
init_cold_exit_executor(_PyExecutorObject *executor, int oparg)
|
|
|
|
{
|
2024-03-20 05:54:42 -03:00
|
|
|
_Py_SetImmortalUntracked((PyObject *)executor);
|
2024-02-20 05:39:55 -04:00
|
|
|
Py_SET_TYPE(executor, &_PyUOpExecutor_Type);
|
|
|
|
executor->trace = (_PyUOpInstruction *)executor->exits;
|
|
|
|
executor->code_size = 1;
|
|
|
|
executor->exit_count = 0;
|
|
|
|
_PyUOpInstruction *inst = (_PyUOpInstruction *)&executor->trace[0];
|
|
|
|
inst->opcode = _COLD_EXIT;
|
|
|
|
inst->oparg = oparg;
|
|
|
|
executor->vm_data.valid = true;
|
|
|
|
for (int i = 0; i < BLOOM_FILTER_WORDS; i++) {
|
|
|
|
assert(executor->vm_data.bloom.bits[i] == 0);
|
|
|
|
}
|
|
|
|
#ifdef _Py_JIT
|
|
|
|
executor->jit_code = NULL;
|
|
|
|
executor->jit_size = 0;
|
|
|
|
if (_PyJIT_Compile(executor, executor->trace, 1)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-06-26 23:02:57 -03:00
|
|
|
static int
|
|
|
|
uop_optimize(
|
|
|
|
_PyOptimizerObject *self,
|
2024-02-02 08:14:34 -04:00
|
|
|
_PyInterpreterFrame *frame,
|
2023-06-26 23:02:57 -03:00
|
|
|
_Py_CODEUNIT *instr,
|
2023-08-15 15:04:17 -03:00
|
|
|
_PyExecutorObject **exec_ptr,
|
|
|
|
int curr_stackentries)
|
2023-06-26 23:02:57 -03:00
|
|
|
{
|
2023-10-23 10:49:09 -03:00
|
|
|
_PyBloomFilter dependencies;
|
|
|
|
_Py_BloomFilter_Init(&dependencies);
|
2024-01-12 07:58:23 -04:00
|
|
|
_PyUOpInstruction buffer[UOP_MAX_TRACE_LENGTH];
|
2024-03-13 19:13:33 -03:00
|
|
|
OPT_STAT_INC(attempts);
|
2024-02-02 08:14:34 -04:00
|
|
|
int err = translate_bytecode_to_trace(frame, instr, buffer, UOP_MAX_TRACE_LENGTH, &dependencies);
|
2023-11-06 07:28:52 -04:00
|
|
|
if (err <= 0) {
|
2023-06-26 23:02:57 -03:00
|
|
|
// Error or nothing translated
|
2023-11-06 07:28:52 -04:00
|
|
|
return err;
|
2023-06-26 23:02:57 -03:00
|
|
|
}
|
2023-10-04 18:52:28 -03:00
|
|
|
OPT_STAT_INC(traces_created);
|
2024-02-28 18:38:01 -04:00
|
|
|
char *env_var = Py_GETENV("PYTHON_UOPS_OPTIMIZE");
|
|
|
|
if (env_var == NULL || *env_var == '\0' || *env_var > '0') {
|
2024-02-02 08:14:34 -04:00
|
|
|
err = _Py_uop_analyze_and_optimize(frame, buffer,
|
2024-02-13 09:24:48 -04:00
|
|
|
UOP_MAX_TRACE_LENGTH,
|
|
|
|
curr_stackentries, &dependencies);
|
2024-02-02 08:14:34 -04:00
|
|
|
if (err <= 0) {
|
|
|
|
return err;
|
2023-11-06 07:28:52 -04:00
|
|
|
}
|
2023-08-15 15:04:17 -03:00
|
|
|
}
|
2024-02-13 09:24:48 -04:00
|
|
|
assert(err == 1);
|
2024-02-20 06:50:59 -04:00
|
|
|
/* Fix up */
|
|
|
|
for (int pc = 0; pc < UOP_MAX_TRACE_LENGTH; pc++) {
|
|
|
|
int opcode = buffer[pc].opcode;
|
|
|
|
int oparg = buffer[pc].oparg;
|
|
|
|
if (_PyUop_Flags[opcode] & HAS_OPARG_AND_1_FLAG) {
|
|
|
|
buffer[pc].opcode = opcode + 1 + (oparg & 1);
|
|
|
|
}
|
|
|
|
else if (oparg < _PyUop_Replication[opcode]) {
|
|
|
|
buffer[pc].opcode = opcode + oparg + 1;
|
|
|
|
}
|
|
|
|
else if (opcode == _JUMP_TO_TOP || opcode == _EXIT_TRACE) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
assert(_PyOpcode_uop_name[buffer[pc].opcode]);
|
2024-03-11 10:37:48 -03:00
|
|
|
assert(strncmp(_PyOpcode_uop_name[buffer[pc].opcode], _PyOpcode_uop_name[opcode], strlen(_PyOpcode_uop_name[opcode])) == 0);
|
2024-02-20 06:50:59 -04:00
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
_PyExecutorObject *executor = make_executor_from_uops(buffer, &dependencies);
|
2023-06-26 23:02:57 -03:00
|
|
|
if (executor == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2023-11-06 07:28:52 -04:00
|
|
|
*exec_ptr = executor;
|
2023-06-26 23:02:57 -03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2023-07-06 19:45:56 -03:00
|
|
|
static void
|
|
|
|
uop_opt_dealloc(PyObject *self) {
|
|
|
|
PyObject_Free(self);
|
|
|
|
}
|
|
|
|
|
2023-10-29 17:53:25 -03:00
|
|
|
PyTypeObject _PyUOpOptimizer_Type = {
|
2023-06-26 23:02:57 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
.tp_name = "uop_optimizer",
|
|
|
|
.tp_basicsize = sizeof(_PyOptimizerObject),
|
|
|
|
.tp_itemsize = 0,
|
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
2023-07-06 19:45:56 -03:00
|
|
|
.tp_dealloc = uop_opt_dealloc,
|
2023-06-26 23:02:57 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyUnstable_Optimizer_NewUOpOptimizer(void)
|
|
|
|
{
|
2023-10-29 17:53:25 -03:00
|
|
|
_PyOptimizerObject *opt = PyObject_New(_PyOptimizerObject, &_PyUOpOptimizer_Type);
|
2023-06-26 23:02:57 -03:00
|
|
|
if (opt == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
opt->optimize = uop_optimize;
|
2024-02-13 10:16:37 -04:00
|
|
|
opt->resume_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD;
|
|
|
|
// Need a few iterations to settle specializations,
|
|
|
|
// and to ammortize the cost of optimization.
|
2024-02-20 05:39:55 -04:00
|
|
|
opt->side_threshold = 16;
|
2024-02-13 10:16:37 -04:00
|
|
|
opt->backedge_threshold = 16;
|
2023-06-26 23:02:57 -03:00
|
|
|
return (PyObject *)opt;
|
|
|
|
}
|
2023-10-23 10:49:09 -03:00
|
|
|
|
2024-01-10 11:44:34 -04:00
|
|
|
static void
|
2024-01-12 07:58:23 -04:00
|
|
|
counter_dealloc(_PyExecutorObject *self) {
|
2024-02-20 05:39:55 -04:00
|
|
|
/* The optimizer is the operand of the second uop. */
|
|
|
|
PyObject *opt = (PyObject *)self->trace[1].operand;
|
2024-01-10 11:44:34 -04:00
|
|
|
Py_DECREF(opt);
|
|
|
|
uop_dealloc(self);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyTypeObject _PyCounterExecutor_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
.tp_name = "counting_executor",
|
2024-02-20 05:39:55 -04:00
|
|
|
.tp_basicsize = offsetof(_PyExecutorObject, exits),
|
|
|
|
.tp_itemsize = 1,
|
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION | Py_TPFLAGS_HAVE_GC,
|
2024-01-10 11:44:34 -04:00
|
|
|
.tp_dealloc = (destructor)counter_dealloc,
|
|
|
|
.tp_methods = executor_methods,
|
2024-02-20 05:39:55 -04:00
|
|
|
.tp_traverse = executor_traverse,
|
|
|
|
.tp_clear = executor_clear,
|
2024-01-10 11:44:34 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
counter_optimize(
|
|
|
|
_PyOptimizerObject* self,
|
2024-02-02 08:14:34 -04:00
|
|
|
_PyInterpreterFrame *frame,
|
2024-01-10 11:44:34 -04:00
|
|
|
_Py_CODEUNIT *instr,
|
|
|
|
_PyExecutorObject **exec_ptr,
|
|
|
|
int Py_UNUSED(curr_stackentries)
|
|
|
|
)
|
|
|
|
{
|
gh-117045: Add code object to function version cache (#117028)
Changes to the function version cache:
- In addition to the function object, also store the code object,
and allow the latter to be retrieved even if the function has been evicted.
- Stop assigning new function versions after a critical attribute (e.g. `__code__`)
has been modified; the version is permanently reset to zero in this case.
- Changes to `__annotations__` are no longer considered critical. (This fixes gh-109998.)
Changes to the Tier 2 optimization machinery:
- If we cannot map a function version to a function, but it is still mapped to a code object,
we continue projecting the trace.
The operand of the `_PUSH_FRAME` and `_POP_FRAME` opcodes can be either NULL,
a function object, or a code object with the lowest bit set.
This allows us to trace through code that calls an ephemeral function,
i.e., a function that may not be alive when we are constructing the executor,
e.g. a generator expression or certain nested functions.
We will lose globals removal inside such functions,
but we can still do other peephole operations
(and even possibly [call inlining](https://github.com/python/cpython/pull/116290),
if we decide to do it), which only need the code object.
As before, if we cannot retrieve the code object from the cache, we stop projecting.
2024-03-21 16:37:41 -03:00
|
|
|
PyCodeObject *code = _PyFrame_GetCode(frame);
|
2024-01-11 14:20:42 -04:00
|
|
|
int oparg = instr->op.arg;
|
|
|
|
while (instr->op.code == EXTENDED_ARG) {
|
|
|
|
instr++;
|
|
|
|
oparg = (oparg << 8) | instr->op.arg;
|
|
|
|
}
|
|
|
|
if (instr->op.code != JUMP_BACKWARD) {
|
|
|
|
/* Counter optimizer can only handle backward edges */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
_Py_CODEUNIT *target = instr + 1 + _PyOpcode_Caches[JUMP_BACKWARD] - oparg;
|
2024-01-10 11:44:34 -04:00
|
|
|
_PyUOpInstruction buffer[3] = {
|
|
|
|
{ .opcode = _LOAD_CONST_INLINE_BORROW, .operand = (uintptr_t)self },
|
|
|
|
{ .opcode = _INTERNAL_INCREMENT_OPT_COUNTER },
|
2024-01-11 14:20:42 -04:00
|
|
|
{ .opcode = _EXIT_TRACE, .target = (uint32_t)(target - _PyCode_CODE(code)) }
|
2024-01-10 11:44:34 -04:00
|
|
|
};
|
2024-02-20 05:39:55 -04:00
|
|
|
_PyExecutorObject *executor = make_executor_from_uops(buffer, &EMPTY_FILTER);
|
2024-01-10 11:44:34 -04:00
|
|
|
if (executor == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_INCREF(self);
|
|
|
|
Py_SET_TYPE(executor, &_PyCounterExecutor_Type);
|
|
|
|
*exec_ptr = executor;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
counter_get_counter(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return PyLong_FromLongLong(((_PyCounterOptimizerObject *)self)->count);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef counter_optimizer_methods[] = {
|
|
|
|
{ "get_count", counter_get_counter, METH_NOARGS, NULL },
|
|
|
|
{ NULL, NULL },
|
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject _PyCounterOptimizer_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
.tp_name = "Counter optimizer",
|
|
|
|
.tp_basicsize = sizeof(_PyCounterOptimizerObject),
|
|
|
|
.tp_itemsize = 0,
|
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
|
|
|
.tp_methods = counter_optimizer_methods,
|
|
|
|
.tp_dealloc = (destructor)PyObject_Del,
|
|
|
|
};
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyUnstable_Optimizer_NewCounter(void)
|
|
|
|
{
|
|
|
|
_PyCounterOptimizerObject *opt = (_PyCounterOptimizerObject *)_PyObject_New(&_PyCounterOptimizer_Type);
|
|
|
|
if (opt == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
opt->base.optimize = counter_optimize;
|
2024-02-13 10:16:37 -04:00
|
|
|
opt->base.resume_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD;
|
2024-02-20 05:39:55 -04:00
|
|
|
opt->base.side_threshold = OPTIMIZER_UNREACHABLE_THRESHOLD;
|
2024-01-10 11:44:34 -04:00
|
|
|
opt->base.backedge_threshold = 0;
|
|
|
|
opt->count = 0;
|
|
|
|
return (PyObject *)opt;
|
|
|
|
}
|
|
|
|
|
2023-10-23 10:49:09 -03:00
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* Executor management
|
|
|
|
****************************************/
|
|
|
|
|
|
|
|
/* We use a bloomfilter with k = 6, m = 256
|
|
|
|
* The choice of k and the following constants
|
|
|
|
* could do with a more rigourous analysis,
|
|
|
|
* but here is a simple analysis:
|
|
|
|
*
|
|
|
|
* We want to keep the false positive rate low.
|
|
|
|
* For n = 5 (a trace depends on 5 objects),
|
|
|
|
* we expect 30 bits set, giving a false positive
|
|
|
|
* rate of (30/256)**6 == 2.5e-6 which is plenty
|
|
|
|
* good enough.
|
|
|
|
*
|
|
|
|
* However with n = 10 we expect 60 bits set (worst case),
|
|
|
|
* giving a false positive of (60/256)**6 == 0.0001
|
|
|
|
*
|
|
|
|
* We choose k = 6, rather than a higher number as
|
|
|
|
* it means the false positive rate grows slower for high n.
|
|
|
|
*
|
|
|
|
* n = 5, k = 6 => fp = 2.6e-6
|
|
|
|
* n = 5, k = 8 => fp = 3.5e-7
|
|
|
|
* n = 10, k = 6 => fp = 1.6e-4
|
|
|
|
* n = 10, k = 8 => fp = 0.9e-4
|
|
|
|
* n = 15, k = 6 => fp = 0.18%
|
|
|
|
* n = 15, k = 8 => fp = 0.23%
|
|
|
|
* n = 20, k = 6 => fp = 1.1%
|
|
|
|
* n = 20, k = 8 => fp = 2.3%
|
|
|
|
*
|
|
|
|
* The above analysis assumes perfect hash functions,
|
|
|
|
* but those don't exist, so the real false positive
|
|
|
|
* rates may be worse.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define K 6
|
|
|
|
|
|
|
|
#define SEED 20221211
|
|
|
|
|
|
|
|
/* TO DO -- Use more modern hash functions with better distribution of bits */
|
|
|
|
static uint64_t
|
|
|
|
address_to_hash(void *ptr) {
|
|
|
|
assert(ptr != NULL);
|
|
|
|
uint64_t uhash = SEED;
|
|
|
|
uintptr_t addr = (uintptr_t)ptr;
|
|
|
|
for (int i = 0; i < SIZEOF_VOID_P; i++) {
|
|
|
|
uhash ^= addr & 255;
|
|
|
|
uhash *= (uint64_t)_PyHASH_MULTIPLIER;
|
|
|
|
addr >>= 8;
|
|
|
|
}
|
|
|
|
return uhash;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Py_BloomFilter_Init(_PyBloomFilter *bloom)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < BLOOM_FILTER_WORDS; i++) {
|
|
|
|
bloom->bits[i] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We want K hash functions that each set 1 bit.
|
|
|
|
* A hash function that sets 1 bit in M bits can be trivially
|
|
|
|
* derived from a log2(M) bit hash function.
|
|
|
|
* So we extract 8 (log2(256)) bits at a time from
|
|
|
|
* the 64bit hash. */
|
|
|
|
void
|
|
|
|
_Py_BloomFilter_Add(_PyBloomFilter *bloom, void *ptr)
|
|
|
|
{
|
|
|
|
uint64_t hash = address_to_hash(ptr);
|
|
|
|
assert(K <= 8);
|
|
|
|
for (int i = 0; i < K; i++) {
|
|
|
|
uint8_t bits = hash & 255;
|
|
|
|
bloom->bits[bits >> 5] |= (1 << (bits&31));
|
|
|
|
hash >>= 8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
bloom_filter_may_contain(_PyBloomFilter *bloom, _PyBloomFilter *hashes)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < BLOOM_FILTER_WORDS; i++) {
|
|
|
|
if ((bloom->bits[i] & hashes->bits[i]) != hashes->bits[i]) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
link_executor(_PyExecutorObject *executor)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
_PyExecutorLinkListNode *links = &executor->vm_data.links;
|
|
|
|
_PyExecutorObject *head = interp->executor_list_head;
|
|
|
|
if (head == NULL) {
|
|
|
|
interp->executor_list_head = executor;
|
|
|
|
links->previous = NULL;
|
|
|
|
links->next = NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
_PyExecutorObject *next = head->vm_data.links.next;
|
|
|
|
links->previous = head;
|
|
|
|
links->next = next;
|
|
|
|
if (next != NULL) {
|
|
|
|
next->vm_data.links.previous = executor;
|
|
|
|
}
|
|
|
|
head->vm_data.links.next = executor;
|
|
|
|
}
|
2024-02-12 05:04:36 -04:00
|
|
|
executor->vm_data.valid = true;
|
2023-10-23 10:49:09 -03:00
|
|
|
/* executor_list_head must be first in list */
|
|
|
|
assert(interp->executor_list_head->vm_data.links.previous == NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
unlink_executor(_PyExecutorObject *executor)
|
|
|
|
{
|
|
|
|
_PyExecutorLinkListNode *links = &executor->vm_data.links;
|
|
|
|
_PyExecutorObject *next = links->next;
|
|
|
|
_PyExecutorObject *prev = links->previous;
|
|
|
|
if (next != NULL) {
|
|
|
|
next->vm_data.links.previous = prev;
|
|
|
|
}
|
|
|
|
if (prev != NULL) {
|
|
|
|
prev->vm_data.links.next = next;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// prev == NULL implies that executor is the list head
|
|
|
|
PyInterpreterState *interp = PyInterpreterState_Get();
|
|
|
|
assert(interp->executor_list_head == executor);
|
|
|
|
interp->executor_list_head = next;
|
|
|
|
}
|
2024-02-12 05:04:36 -04:00
|
|
|
executor->vm_data.valid = false;
|
2023-10-23 10:49:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This must be called by optimizers before using the executor */
|
|
|
|
void
|
2024-02-20 05:39:55 -04:00
|
|
|
_Py_ExecutorInit(_PyExecutorObject *executor, const _PyBloomFilter *dependency_set)
|
2023-10-23 10:49:09 -03:00
|
|
|
{
|
|
|
|
executor->vm_data.valid = true;
|
|
|
|
for (int i = 0; i < BLOOM_FILTER_WORDS; i++) {
|
|
|
|
executor->vm_data.bloom.bits[i] = dependency_set->bits[i];
|
|
|
|
}
|
|
|
|
link_executor(executor);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This must be called by executors during dealloc */
|
|
|
|
void
|
|
|
|
_Py_ExecutorClear(_PyExecutorObject *executor)
|
|
|
|
{
|
2024-02-20 05:39:55 -04:00
|
|
|
if (!executor->vm_data.valid) {
|
|
|
|
return;
|
|
|
|
}
|
2023-10-23 10:49:09 -03:00
|
|
|
unlink_executor(executor);
|
2024-02-12 05:04:36 -04:00
|
|
|
PyCodeObject *code = executor->vm_data.code;
|
|
|
|
if (code == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2024-02-20 05:39:55 -04:00
|
|
|
for (uint32_t i = 0; i < executor->exit_count; i++) {
|
|
|
|
Py_DECREF(executor->exits[i].executor);
|
|
|
|
executor->exits[i].executor = &COLD_EXITS[i];
|
|
|
|
executor->exits[i].temperature = INT16_MIN;
|
|
|
|
}
|
2024-02-12 05:04:36 -04:00
|
|
|
_Py_CODEUNIT *instruction = &_PyCode_CODE(code)[executor->vm_data.index];
|
|
|
|
assert(instruction->op.code == ENTER_EXECUTOR);
|
|
|
|
int index = instruction->op.arg;
|
|
|
|
assert(code->co_executors->executors[index] == executor);
|
|
|
|
instruction->op.code = executor->vm_data.opcode;
|
|
|
|
instruction->op.arg = executor->vm_data.oparg;
|
|
|
|
executor->vm_data.code = NULL;
|
|
|
|
Py_CLEAR(code->co_executors->executors[index]);
|
2023-10-23 10:49:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj)
|
|
|
|
{
|
2024-02-12 05:04:36 -04:00
|
|
|
assert(executor->vm_data.valid);
|
2023-10-23 10:49:09 -03:00
|
|
|
_Py_BloomFilter_Add(&executor->vm_data.bloom, obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Invalidate all executors that depend on `obj`
|
|
|
|
* May cause other executors to be invalidated as well
|
|
|
|
*/
|
|
|
|
void
|
2024-02-26 13:51:47 -04:00
|
|
|
_Py_Executors_InvalidateDependency(PyInterpreterState *interp, void *obj, int is_invalidation)
|
2023-10-23 10:49:09 -03:00
|
|
|
{
|
|
|
|
_PyBloomFilter obj_filter;
|
|
|
|
_Py_BloomFilter_Init(&obj_filter);
|
|
|
|
_Py_BloomFilter_Add(&obj_filter, obj);
|
|
|
|
/* Walk the list of executors */
|
|
|
|
/* TO DO -- Use a tree to avoid traversing as many objects */
|
|
|
|
for (_PyExecutorObject *exec = interp->executor_list_head; exec != NULL;) {
|
|
|
|
assert(exec->vm_data.valid);
|
|
|
|
_PyExecutorObject *next = exec->vm_data.links.next;
|
|
|
|
if (bloom_filter_may_contain(&exec->vm_data.bloom, &obj_filter)) {
|
2024-02-12 05:04:36 -04:00
|
|
|
_Py_ExecutorClear(exec);
|
2024-02-26 13:51:47 -04:00
|
|
|
if (is_invalidation) {
|
|
|
|
OPT_STAT_INC(executors_invalidated);
|
|
|
|
}
|
2023-10-23 10:49:09 -03:00
|
|
|
}
|
|
|
|
exec = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Invalidate all executors */
|
|
|
|
void
|
2024-02-26 13:51:47 -04:00
|
|
|
_Py_Executors_InvalidateAll(PyInterpreterState *interp, int is_invalidation)
|
2023-10-23 10:49:09 -03:00
|
|
|
{
|
2024-02-12 05:04:36 -04:00
|
|
|
while (interp->executor_list_head) {
|
|
|
|
_PyExecutorObject *executor = interp->executor_list_head;
|
|
|
|
if (executor->vm_data.code) {
|
|
|
|
// Clear the entire code object so its co_executors array be freed:
|
|
|
|
_PyCode_Clear_Executors(executor->vm_data.code);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
_Py_ExecutorClear(executor);
|
|
|
|
}
|
2024-02-26 13:51:47 -04:00
|
|
|
if (is_invalidation) {
|
|
|
|
OPT_STAT_INC(executors_invalidated);
|
|
|
|
}
|
2023-10-23 10:49:09 -03:00
|
|
|
}
|
|
|
|
}
|