Skip to content

gh-146099: Optimize _GUARD_CODE_VERSION+IP via function version symbols #146101

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 5 commits into from
Mar 20, 2026
Merged

gh-146099: Optimize _GUARD_CODE_VERSION+IP via function version symbols #146101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65e1f94
Optimize _GUARD_CODE_VERSION+IP via fun version symbols
Fidget-Spinner Mar 18, 2026
15961e8
try removing buggy thing
Fidget-Spinner Mar 18, 2026
0b05457
fix macOS builds
Fidget-Spinner Mar 18, 2026
1ae5bbd
Address review
Fidget-Spinner Mar 19, 2026
418eeea
reduce diff
Fidget-Spinner Mar 19, 2026
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 review
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Mar 19, 2026
commit 1ae5bbd6fa22bb4e3a10a9499d746b5c21fff479
3 changes: 2 additions & 1 deletion Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,8 @@ dummy_func(void) {
PyCodeObject *co = get_current_code_object(ctx);
if (co->co_version == version) {
_Py_BloomFilter_Add(dependencies, co);
if (sym_get_func_version(ctx->frame->callable) != 0) {
// Functions derive their version from code objects.
if (sym_get_func_version(ctx->frame->callable) == version) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
}
Expand Down
2 changes: 1 addition & 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.

7 changes: 4 additions & 3 deletions Python/optimizer_symbols.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ NULL | | RECORDED_VALUE*
| KNOWN_CLASS--+ | | |
| | | | | | PREDICATE RECORDED_VALUE(known type)
| | | INT* | | | |
| | | | FUNC_VERSION | | | <- Anything below this level has a known truthiness.
| | | | | | | | <- Anything below this level has a known truthiness.
| | | | FUNC_VERSION | | |
| TUPLE | | | TRUTHINESS | |
| | | | | | | | <- Anything below this level is a known constant.
| KNOWN_VALUE--+-------+----+------+
Expand Down Expand Up @@ -100,7 +101,7 @@ _PyUOpSymPrint(JitOptRef ref)
printf("<v%u at %p>", sym->version.version, (void *)sym);
break;
case JIT_SYM_FUNC_VERSION_TAG:
printf("<fv%u at %p>", sym->func_version.func_version, (void *)sym);
printf("<function version=%u>", sym->func_version.func_version);
break;
case JIT_SYM_KNOWN_CLASS_TAG:
printf("<%s at %p>", sym->cls.type->tp_name, (void *)sym);
Expand Down Expand Up @@ -527,7 +528,7 @@ _Py_uop_sym_set_func_version(JitOptContext *ctx, JitOptRef ref, uint32_t version
((PyFunctionObject *)sym->recorded_value.value)->func_version != version) {
sym_set_bottom(ctx, sym);
return false;
}
}
// Promote to known value, as we have guarded/checked on it.
sym->tag = JIT_SYM_KNOWN_VALUE_TAG;
// New ownership. We need to NewRef here, as
Expand Down
Loading