Skip to content

GH-104584: Optimizer API #105100

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
markshannon merged 18 commits into from
Jun 2, 2023
Merged

GH-104584: Optimizer API #105100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
099d919
Optimizer API. Work in progress.
markshannon May 22, 2023
c991ccb
Add plugin optimizer API.
markshannon May 22, 2023
c342f26
Executors are responsible for checking the eval breaker.
markshannon May 24, 2023
e2d74f3
Rename optimize.c to optimizer.c
markshannon May 24, 2023
6dcd1d5
Let the optimizer choose the thresholds
markshannon May 24, 2023
4b145a8
Tidy up
markshannon May 25, 2023
df91062
Make VM responsible for linking in executors. Add test.
markshannon May 25, 2023
96715b3
Remove dead code
markshannon May 25, 2023
8801b57
Completely turn off optimization when clearing interpreter.
markshannon May 25, 2023
5b89fb5
Remove unused function declaration.
markshannon May 25, 2023
4b70ee7
Add news
markshannon May 25, 2023
1e9822b
Address code review.
markshannon May 25, 2023
037a2bc
More precise type for C Api function.
markshannon May 25, 2023
736f7f0
Merge branch 'main' into optimizer-api
markshannon May 26, 2023
977800e
Add static symbols to list.
markshannon May 26, 2023
2eeebba
Address review comments.
markshannon Jun 1, 2023
30d79a6
Merge branch 'main' into optimizer-api
markshannon Jun 1, 2023
faff8a5
Address review comments.
markshannon Jun 2, 2023
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
Prev Previous commit
Next Next commit
Address code review.
  • Loading branch information
@markshannon
markshannon committed May 25, 2023
commit 1e9822bbc3d5bb3c881ebca4003a530314f18726
3 changes: 3 additions & 0 deletions Include/cpython/optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ PyAPI_FUNC(int) PyUnstable_Replace_Executor(PyCodeObject *code, int offset, _PyE

PyAPI_FUNC(void) PyUnstable_SetOptimizer(_PyOptimizerObject* optimizer);

PyAPI_FUNC(PyObject *)
PyUnstable_GetOptimizer(void)

struct _PyInterpreterFrame *
_PyOptimizer_BackEdge(struct _PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest, PyObject **stack_pointer);

Expand Down
42 changes: 19 additions & 23 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,24 @@ get_next_free_in_executor_array(PyCodeObject *code)
return -1;
}
}
for (uintptr_t i = 0; i < size; i++) {
if (old->executors[i] == NULL) {
return i;
}
}
if (size >= capacity) {
assert(size <= capacity);
if (size == capacity) {
/* Array is full. Grow array */
int new_capacity = capacity ? capacity * 2 : 4;
_PyExecutorArray *new = PyMem_Malloc(offsetof(_PyExecutorArray, executors) +
_PyExecutorArray *new = PyMem_Realloc(
old,
offsetof(_PyExecutorArray, executors) +
new_capacity * sizeof(_PyExecutorObject *));
if (new == NULL) {
PyErr_NoMemory();
return -1;
}
code->co_executors = new;
new->capacity = new_capacity;
for (uintptr_t i = 0; i < size; i++) {
new->executors[i] = old->executors[i];
}
if (old != NULL) {
PyMem_Free(old);
}
new->size = size;
code->co_executors = new;
}
assert(size < code->co_executors->capacity);
code->co_executors->size = size + 1;
code->co_executors->size++;
return size;
}

Expand All @@ -60,6 +54,7 @@ insert_executor(PyCodeObject *code, int offset, _PyExecutorObject *executor)
executor->vm_data.opcode = old->vm_data.opcode;
executor->vm_data.oparg = old->vm_data.oparg;
old->vm_data.opcode = 0;
Py_INCREF(executor);
code->co_executors->executors[original.op.arg] = executor;
Py_DECREF(old);
}
Expand All @@ -79,7 +74,8 @@ insert_executor(PyCodeObject *code, int offset, _PyExecutorObject *executor)
return 0;
}

int PyUnstable_Replace_Executor(PyCodeObject *code, int offset, _PyExecutorObject *new)
int
PyUnstable_Replace_Executor(PyCodeObject *code, int offset, _PyExecutorObject *new)
{

_Py_CODEUNIT original = _PyCode_CODE(code)[offset];
Expand Down Expand Up @@ -115,10 +111,9 @@ _PyOptimizerObject _PyOptimizer_Default = {
.backedge_threshold = UINT16_MAX,
};

PyObject*
PyUnstable_GetOptimizer(_PyOptimizerObject* optimizer)
PyObject *
PyUnstable_GetOptimizer(void)
{
/* Ignore costs for now */
PyInterpreterState *interp = PyInterpreterState_Get();
if (interp->optimizer == &_PyOptimizer_Default) {
Py_RETURN_NONE;
Expand All @@ -129,7 +124,6 @@ PyUnstable_GetOptimizer(_PyOptimizerObject* optimizer)
void
PyUnstable_SetOptimizer(_PyOptimizerObject *optimizer)
Comment thread
carljm marked this conversation as resolved.
{
/* Ignore costs for now */
PyInterpreterState *interp = PyInterpreterState_Get();
if (optimizer == NULL) {
optimizer = &_PyOptimizer_Default;
Expand All @@ -152,6 +146,7 @@ _PyOptimizer_BackEdge(_PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNI
return NULL;
}
if (insert_executor(frame->f_code, src - _PyCode_CODE(frame->f_code), executor)) {
Comment thread
markshannon marked this conversation as resolved.
Outdated
Py_DECREF(executor);
return NULL;
}
return executor->execute(executor, frame, stack_pointer);
Expand Down Expand Up @@ -187,7 +182,8 @@ static PyTypeObject CounterExecutor_Type = {
.tp_dealloc = (destructor)counter_dealloc,
};

static _PyInterpreterFrame *counter_execute(_PyExecutorObject *self, _PyInterpreterFrame *frame, PyObject **stack_pointer)
static _PyInterpreterFrame *
counter_execute(_PyExecutorObject *self, _PyInterpreterFrame *frame, PyObject **stack_pointer)
{
((_PyCounterExecutorObject *)self)->optimizer->count++;
_PyFrame_SetStackPointer(frame, stack_pointer);
Expand Down Expand Up @@ -233,7 +229,8 @@ static PyTypeObject CounterOptimizer_Type = {
.tp_methods = counter_methods,
};

PyObject *PyUnstable_Optimizer_NewCounter(void)
PyObject *
PyUnstable_Optimizer_NewCounter(void)
{
_PyCounterOptimizerObject *opt = (_PyCounterOptimizerObject *)_PyObject_New(&CounterOptimizer_Type);
if (opt == NULL) {
Expand All @@ -245,4 +242,3 @@ PyObject *PyUnstable_Optimizer_NewCounter(void)
opt->count = 0;
return (PyObject *)opt;
}