Skip to content

gh-106581: Project through calls #108067

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
gvanrossum merged 18 commits into from
Aug 17, 2023
Merged

gh-106581: Project through calls #108067

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
138fc0e
Add function-by-version cache
gvanrossum Aug 8, 2023
6e31431
Trace into function calls
gvanrossum Aug 8, 2023
e2c8fa7
Make RESUME a viable uop
gvanrossum Aug 12, 2023
5aeb1ea
Clear func_version_cache in interpreter_clear()
gvanrossum Aug 12, 2023
129dd39
Add a small essay on function and code versions
gvanrossum Aug 12, 2023
7579ff7
Move function cache clearing earlier in finalization
gvanrossum Aug 12, 2023
6096790
Cache borrowed references, cleared in func_dealloc
gvanrossum Aug 13, 2023
36a3e86
Correctly set instr_fmt metadata for macros
gvanrossum Aug 13, 2023
d31197d
Split RETURN_{VALUE,CONST} into uops (mostly works)
gvanrossum Aug 13, 2023
01c1cdb
Change LLTRACE debug to trigger on PYTHONUOPSDEBUG >= 5, not 4
gvanrossum Aug 13, 2023
4133880
Handle _POP_FRAME in superblock properly
gvanrossum Aug 14, 2023
7892940
Handle trace stack underflow
gvanrossum Aug 14, 2023
7760028
Add _Py_LeaveRecursiveCallPy to _POP_FRAME
gvanrossum Aug 15, 2023
976f867
Ensure co_stacksize >= 1, else RETURN_CONST may crash
gvanrossum Aug 15, 2023
20786b2
Fix failing test_code (co_stacksize is never 0)
gvanrossum Aug 16, 2023
23e9895
Don't trace into functions if func_version != co_version
gvanrossum Aug 16, 2023
bde6547
Fix RETURN_VALUE/CONST with hacks
gvanrossum Aug 16, 2023
d1953ae
Merge branch 'main' into project-uops
gvanrossum Aug 17, 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
Cache borrowed references, cleared in func_dealloc
  • Loading branch information
@gvanrossum
gvanrossum committed Aug 16, 2023
commit 60967905dce381e377eb81d6ea7f587bb40990af
8 changes: 4 additions & 4 deletions Include/internal/pycore_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ extern PyObject* _PyFunction_Vectorcall(
#define FUNC_VERSION_CACHE_SIZE (1<<12) /* Must be a power of 2 */
struct _py_func_state {
uint32_t next_version;
// Function objects whose func_version % FUNC_VERSION_CACHE_SIZE
// once equaled the index in the table. The references are owned:
// Call _PyFunction_ClearByVersionCache() to clear.
// Borrowed references to function objects whose
// func_version % FUNC_VERSION_CACHE_SIZE
// once was equal to the index in the table.
// They are cleared when the function is deallocated.
PyFunctionObject *func_version_cache[FUNC_VERSION_CACHE_SIZE];
};

Expand All @@ -30,7 +31,6 @@ extern PyFunctionObject* _PyFunction_FromConstructor(PyFrameConstructor *constr)
extern uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
extern void _PyFunction_SetVersion(PyFunctionObject *func, uint32_t version);
PyFunctionObject *_PyFunction_LookupByVersion(uint32_t version);
void _PyFunction_ClearByVersionCache(PyInterpreterState *interp);

extern PyObject *_Py_set_function_type_params(
PyThreadState* unused, PyObject *func, PyObject *type_params);
Expand Down
33 changes: 15 additions & 18 deletions Objects/funcobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,35 +271,23 @@ _PyFunction_SetVersion(PyFunctionObject *func, uint32_t version)
func->func_version = version;
if (version != 0) {
PyInterpreterState *interp = _PyInterpreterState_GET();
PyFunctionObject **slot =
interp->func_state.func_version_cache
+ (version % FUNC_VERSION_CACHE_SIZE);
Py_XSETREF(*slot, (PyFunctionObject *)Py_NewRef(func));
interp->func_state.func_version_cache[
version % FUNC_VERSION_CACHE_SIZE] = func;
Comment on lines +274 to +275

@erlend-aasland erlend-aasland Aug 17, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would be slightly more readable with something like this:

Suggested change
interp->func_state.func_version_cache[
version % FUNC_VERSION_CACHE_SIZE] = func;
uint32_t idx = version % FUNC_VERSION_CACHE_SIZE;
interp->func_state.func_version_cache[idx] = func;

Ditto for the function below.

@gvanrossum gvanrossum Aug 17, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry. It's probably not worth it to clean this up now that I landed it.

}
}

PyFunctionObject *
_PyFunction_LookupByVersion(uint32_t version)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
PyFunctionObject **slot =
interp->func_state.func_version_cache
+ (version % FUNC_VERSION_CACHE_SIZE);
if (*slot != NULL && (*slot)->func_version == version) {
return (PyFunctionObject *)Py_NewRef(*slot);
PyFunctionObject *func = interp->func_state.func_version_cache[
version % FUNC_VERSION_CACHE_SIZE];
if (func != NULL && func->func_version == version) {
return (PyFunctionObject *)Py_NewRef(func);
}
return NULL;
}

void
_PyFunction_ClearByVersionCache(PyInterpreterState *interp)
{
for (int i = 0; i < FUNC_VERSION_CACHE_SIZE; i++) {
PyFunctionObject **slot = interp->func_state.func_version_cache + i;
Py_CLEAR(*slot);
}
}

uint32_t
_PyFunction_GetVersionForCurrentState(PyFunctionObject *func)
{
Expand Down Expand Up @@ -929,6 +917,15 @@ func_dealloc(PyFunctionObject *op)
if (op->func_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) op);
}
if (op->func_version != 0) {
PyInterpreterState *interp = _PyInterpreterState_GET();
PyFunctionObject **slot =
interp->func_state.func_version_cache
+ (op->func_version % FUNC_VERSION_CACHE_SIZE);
if (*slot == op) {
*slot = NULL;
}
}
(void)func_clear(op);
// These aren't cleared by func_clear().
Py_DECREF(op->func_code);
Expand Down
4 changes: 4 additions & 0 deletions Python/abstract_interp_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1767,11 +1767,6 @@ Py_FinalizeEx(void)
// XXX assert(_Py_IsMainInterpreter(tstate->interp));
// XXX assert(_Py_IsMainThread());

// The function version cache keeps functions alive, so clear it.
// It's used for optimizations, which we don't need in this stage.
tstate->interp->func_state.next_version = 0; // No more new versions
_PyFunction_ClearByVersionCache(tstate->interp);

// Block some operations.
tstate->interp->finalizing = 1;

Expand Down
3 changes: 0 additions & 3 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,9 +2079,6 @@ sys__clear_type_cache_impl(PyObject *module)
/*[clinic end generated code: output=20e48ca54a6f6971 input=127f3e04a8d9b555]*/
{
PyType_ClearCache();
// Also clear the function-by-version cache
PyInterpreterState *interp = _PyInterpreterState_GET();
_PyFunction_ClearByVersionCache(interp);
Py_RETURN_NONE;
}

Expand Down