Skip to content

gh-134584: Eliminate redundant refcounting from _CALL_TYPE_1 #135818

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
Fidget-Spinner merged 13 commits into from
Dec 23, 2025
Merged

gh-134584: Eliminate redundant refcounting from _CALL_TYPE_1 #135818

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
85ab405
Eliminate redundant refcounting from _CALL_TYPE_1
tomasr8 Jun 23, 2025
f927209
Add a new uop
tomasr8 Jun 23, 2025
bbf1c9d
Add news entry
tomasr8 Jun 23, 2025
81f9b44
Do not close callable stackref
tomasr8 Jun 23, 2025
6934f63
Update remove_unneeded_uops with new uops
tomasr8 Jun 23, 2025
e86897a
Do not close arg
tomasr8 Dec 22, 2025
bd62d15
Merge remote-tracking branch 'upstream/main' into jit-refcount-call-type
tomasr8 Dec 22, 2025
ca15e78
Update test
tomasr8 Dec 22, 2025
bcb805d
Rename _SWAP_.. to _SHUFFLE_2_..
tomasr8 Dec 22, 2025
56fa30f
Merge remote-tracking branch 'upstream/main' into jit-refcount-call-type
tomasr8 Dec 23, 2025
225d6db
Regenerate files
tomasr8 Dec 23, 2025
bba9435
address review
Fidget-Spinner Dec 23, 2025
6ffffa6
Merge remote-tracking branch 'upstream/main' into pr/135818
Fidget-Spinner Dec 23, 2025
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
19 changes: 10 additions & 9 deletions Include/internal/pycore_uop_ids.h
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions Include/internal/pycore_uop_metadata.h
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-06-23-20-54-15.gh-issue-134584.ZNcziF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Eliminate redundant refcounting from ``_CALL_TYPE_1``. Patch by Tomas Roun
9 changes: 9 additions & 0 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5358,6 +5358,15 @@ dummy_func(
value = PyStackRef_FromPyObjectBorrow(ptr);
}

tier2 op(_SWAP_CALL_ONE_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, arg -- value, a)) {
PyStackRef_CLOSE(arg);
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher Jul 1, 2025

Choose a reason for hiding this comment

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

This shouldn't be here, right? Because we're leaving arg on the stack in a?

Copy link
Copy Markdown
Member Author

@tomasr8 tomasr8 Dec 22, 2025

Choose a reason for hiding this comment

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

Veery late response 😅 but I changed and renamed this op to _SHUFFLE_2_LOAD_CONST_INLINE_BORROW since it's analogous to the recently added _SHUFFLE_3_LOAD_CONST_INLINE_BORROW. This also resolves the issue with closing the ref! :)

(void)null; // Silence compiler warnings about unused variables
DEAD(null);
PyStackRef_CLOSE(callable);
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
value = PyStackRef_FromPyObjectBorrow(ptr);
a = arg;
}

tier2 op(_LOAD_CONST_UNDER_INLINE, (ptr/4, old -- value, new)) {
new = old;
DEAD(old);
Expand Down
30 changes: 30 additions & 0 deletions Python/executor_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.

7 changes: 6 additions & 1 deletion Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,11 @@ dummy_func(void) {
value = PyJitRef_Borrow(sym_new_const(ctx, ptr));
}

op(_SWAP_CALL_ONE_LOAD_CONST_INLINE_BORROW, (ptr/4, unused, unused, arg -- value, a)) {
value = PyJitRef_Borrow(sym_new_const(ctx, ptr));
a = arg;
}

op(_POP_TOP, (value -- )) {
PyTypeObject *typ = sym_get_type(value);
if (PyJitRef_IsBorrowed(value) ||
Expand Down Expand Up @@ -973,7 +978,7 @@ dummy_func(void) {
PyObject* type = (PyObject *)sym_get_type(arg);
if (type) {
res = sym_new_const(ctx, type);
Comment thread
Fidget-Spinner marked this conversation as resolved.
REPLACE_OP(this_instr, _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW, 0,
REPLACE_OP(this_instr, _SWAP_CALL_ONE_LOAD_CONST_INLINE_BORROW, 0,
(uintptr_t)type);
}
else {
Expand Down
17 changes: 16 additions & 1 deletion Python/optimizer_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.

Loading