Skip to content

GH-118093: Specialize CALL_KW #123006

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 12 commits into from
Aug 16, 2024
Merged

GH-118093: Specialize CALL_KW #123006

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1d101af
Extract eval breaker check from CALL_KW
markshannon Aug 13, 2024
4d5910e
Add inline cache to CALL_KW
markshannon Aug 14, 2024
6ed3368
Add CALL_KW_PY specialization
markshannon Aug 14, 2024
464c6dc
Add CALL_KW_BOUND_METHOD specialization
markshannon Aug 14, 2024
343a54c
Add CALL_KW_NON_PY specialization
markshannon Aug 14, 2024
6b9055c
Handle _PY_FRAME_KW in tier 2 optimizer
markshannon Aug 14, 2024
e9ca1f9
Add news item
markshannon Aug 14, 2024
e71448f
Fix rst formatting
markshannon Aug 14, 2024
4f9f9d8
Merge branch 'main' into specialize-call-kw
markshannon Aug 14, 2024
56e4e7a
Add CALL_KW cache format to opcode.py
markshannon Aug 16, 2024
abad721
Merge branch 'main' into specialize-call-kw
markshannon Aug 16, 2024
8b504ae
Update Include/internal/pycore_code.h
markshannon Aug 16, 2024
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
Handle _PY_FRAME_KW in tier 2 optimizer
  • Loading branch information
@markshannon
markshannon committed Aug 14, 2024
commit 6b9055c6e84817f4d15d6b3d5eeff3eddeb8ee04
2 changes: 1 addition & 1 deletion Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ translate_bytecode_to_trace(
ADD_TO_TRACE(_DYNAMIC_EXIT, 0, 0, 0);
goto done;
}
assert(_PyOpcode_Deopt[opcode] == CALL);
assert(_PyOpcode_Deopt[opcode] == CALL || _PyOpcode_Deopt[opcode] == CALL_KW);
int func_version_offset =
offsetof(_PyCallCache, func_version)/sizeof(_Py_CODEUNIT)
// Add one to account for the actual opcode/oparg pair:
Expand Down
9 changes: 9 additions & 0 deletions Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,15 @@ dummy_func(void) {
ctx->done = true;
}

op(_PY_FRAME_KW, (callable, self_or_null, args[oparg], kwnames -- new_frame: _Py_UOpsAbstractFrame*)) {
(void)callable;
(void)self_or_null;
(void)args;
(void)kwnames;
new_frame = NULL;
ctx->done = true;
}

op(_RETURN_VALUE, (retval -- res)) {
SYNC_SP();
ctx->frame->stack_pointer = stack_pointer;
Expand Down
17 changes: 15 additions & 2 deletions 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.

6 changes: 3 additions & 3 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,9 +2049,9 @@ _Py_Specialize_CallKw(_PyStackRef callable_st, _Py_CODEUNIT *instr, int nargs)
fail = -1;
}
}
else {
instr->op.code = CALL_KW_NON_PY;
fail = 0;
else {
instr->op.code = CALL_KW_NON_PY;
fail = 0;
}
if (fail) {
STAT_INC(CALL, failure);
Expand Down