Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.7k
gh-87729: add LOAD_SUPER_ATTR instruction for faster super()#103497
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
23 commits Select commitHold shift + click to select a range
0a0ebe2 gh-87729: add instruction for faster zero-arg super()
carljmf14a3bf add news entry
carljm5625e73 document LOAD_ZERO_SUPER_ATTR
carljm0775efe fix gdb test_wrapper_call
carljmf229b5b optimize 2-arg super also
carljm626999d fix incompatible assignment
carljm9384106 Merge branch 'main' into superopt
carljm92c943b fix bad first arg
carljm775ed0f Apply suggestions from code review
carljm2077f1a don't unnecessarily re-find args in error case
carljm64da49f Merge branch 'main' into superopt
carljm4759ad9 update generated cases
carljm94399c2 fix incompatible types
carljm5136459 Merge branch 'main' into superopt
carljm82945b2 review comments
carljm3a3cb74 update generated cases with new comment
carljme4466a7 simplify oparg & 2 handling
carljm5c0a21c Merge branch 'main' into superopt
carljmf161268 cleanup and clarification
carljmdf442c0 move __class__ special case out of the fast path
carljm19b8025 Merge branch 'main' into superopt
carljm0de5bc6 Merge branch 'main' into superopt
carljmdbe1665 Merge branch 'main' into superopt
carljmFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
optimize 2-arg super also
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitf229b5bdf08fb21f64b7de91f07eedb1ec879096
There are no files selected for viewing
22 changes: 14 additions & 8 deletionsDoc/library/dis.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletionsInclude/internal/pycore_opcode.h
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
10 changes: 7 additions & 3 deletionsInclude/opcode.h
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
8 changes: 6 additions & 2 deletionsLib/dis.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletionsLib/opcode.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletionsLib/test/test_super.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1551,8 +1551,8 @@ dummy_func( | ||
| PREDICT(JUMP_BACKWARD); | ||
| } | ||
| inst(LOAD_SUPER_ATTR, (global_super, class, self -- res2 if (oparg & 1), res)) { | ||
| PyObject *name = GETITEM(frame->f_code->co_names, oparg >>2); | ||
| if (global_super == (PyObject *)&PySuper_Type) { | ||
| int meth_found = 0; | ||
| Py_DECREF(global_super); | ||
| @@ -1571,7 +1571,13 @@ dummy_func( | ||
| Py_DECREF(self); | ||
| } | ||
| } else { | ||
| PyObject *super; | ||
| if (oparg & 2) { | ||
| super = PyObject_Vectorcall(global_super, NULL, 0, NULL); | ||
carljm marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } else { | ||
| PyObject *stack[] = {class, self}; | ||
| super = PyObject_Vectorcall(global_super, stack, 2, NULL); | ||
| } | ||
carljm marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| DECREF_INPUTS(); | ||
| ERROR_IF(super == NULL, error); | ||
| res = PyObject_GetAttr(super, name); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -829,7 +829,9 @@ stack_effect(int opcode, int oparg, int jump) | ||
| case LOAD_METHOD: | ||
| return 1; | ||
| case LOAD_SUPER_METHOD: | ||
| case LOAD_ZERO_SUPER_METHOD: | ||
| case LOAD_ZERO_SUPER_ATTR: | ||
| return -1; | ||
| default: | ||
| return PY_INVALID_STACK_EFFECT; | ||
| @@ -1041,19 +1043,32 @@ compiler_addop_name(struct compiler_unit *u, location loc, | ||
| if (arg < 0) { | ||
| return ERROR; | ||
| } | ||
| if (opcode == LOAD_ATTR) { | ||
| arg <<= 1; | ||
| } | ||
| if (opcode == LOAD_METHOD) { | ||
| opcode = LOAD_ATTR; | ||
| arg <<= 1; | ||
| arg |= 1; | ||
| } | ||
| if (opcode == LOAD_SUPER_ATTR) { | ||
| arg <<= 2; | ||
| } | ||
| if (opcode == LOAD_SUPER_METHOD) { | ||
| opcode = LOAD_SUPER_ATTR; | ||
| arg <<= 2; | ||
| arg |= 1; | ||
| } | ||
| if (opcode == LOAD_ZERO_SUPER_ATTR) { | ||
| opcode = LOAD_SUPER_ATTR; | ||
| arg <<= 2; | ||
| arg |= 2; | ||
| } | ||
| if (opcode == LOAD_ZERO_SUPER_METHOD) { | ||
| opcode = LOAD_SUPER_ATTR; | ||
| arg <<= 2; | ||
carljm marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| arg |= 3; | ||
| } | ||
| return codegen_addop_i(&u->u_instr_sequence, opcode, arg, loc); | ||
| } | ||
| @@ -4222,15 +4237,15 @@ is_import_originated(struct compiler *c, expr_ty e) | ||
| } | ||
| static int | ||
| can_optimize_super_call(struct compiler *c, expr_ty e) | ||
| { | ||
| if (e->kind != Call_kind || | ||
| e->v.Call.func->kind != Name_kind || | ||
| !_PyUnicode_EqualToASCIIString(e->v.Call.func->v.Name.id, "super") || | ||
| asdl_seq_LEN(e->v.Call.keywords) != 0) { | ||
| return 0; | ||
| } | ||
| Py_ssize_t num_args = asdl_seq_LEN(e->v.Call.args); | ||
| PyObject *super_name = e->v.Call.func->v.Name.id; | ||
| // try to detect statically-visible shadowing of 'super' name | ||
| @@ -4242,6 +4257,24 @@ is_zero_arg_super_call(struct compiler *c, expr_ty e) | ||
| if (scope != 0) { | ||
| return 0; | ||
| } | ||
| if (num_args == 2) { | ||
| for (Py_ssize_t i = 0; i < num_args; i++) { | ||
| expr_ty elt = asdl_seq_GET(e->v.Call.args, i); | ||
| if (elt->kind == Starred_kind) { | ||
| return 0; | ||
| } | ||
| } | ||
| // exactly two non-starred args; we can just load | ||
| // the provided args | ||
| return 1; | ||
| } | ||
| if (num_args != 0) { | ||
| return 0; | ||
| } | ||
| // we need the following for zero-arg super(): | ||
| // enclosing function should have at least one argument | ||
| if (c->u->u_metadata.u_argcount == 0 && | ||
| c->u->u_metadata.u_posonlyargcount == 0) { | ||
| @@ -4255,13 +4288,19 @@ is_zero_arg_super_call(struct compiler *c, expr_ty e) | ||
| } | ||
| static int | ||
| load_args_for_super(struct compiler *c, expr_ty e) { | ||
| location loc = LOC(e); | ||
| // load super() global | ||
| PyObject *super_name = e->v.Call.func->v.Name.id; | ||
| RETURN_IF_ERROR(compiler_nameop(c, loc, super_name, Load)); | ||
| if (asdl_seq_LEN(e->v.Call.args) == 2) { | ||
| VISIT(c, expr, asdl_seq_GET(e->v.Call.args, 0)); | ||
| VISIT(c, expr, asdl_seq_GET(e->v.Call.args, 1)); | ||
| return SUCCESS; | ||
| } | ||
| // load __class__ cell | ||
| PyObject *name = &_Py_ID(__class__); | ||
| assert(get_ref_type(c, name) == FREE); | ||
| @@ -4349,9 +4388,11 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e) | ||
| /* Alright, we can optimize the code. */ | ||
| location loc = LOC(meth); | ||
| if (can_optimize_super_call(c, meth->v.Attribute.value)) { | ||
| RETURN_IF_ERROR(load_args_for_super(c, meth->v.Attribute.value)); | ||
| int opcode = asdl_seq_LEN(meth->v.Attribute.value->v.Call.args) ? | ||
| LOAD_SUPER_METHOD : LOAD_ZERO_SUPER_METHOD; | ||
| ADDOP_NAME(c, loc, opcode, meth->v.Attribute.attr, names); | ||
| } else { | ||
| VISIT(c, expr, meth->v.Attribute.value); | ||
| loc = update_start_location_to_match_attr(c, loc, meth); | ||
| @@ -5365,9 +5406,11 @@ compiler_visit_expr1(struct compiler *c, expr_ty e) | ||
| return compiler_formatted_value(c, e); | ||
| /* The following exprs can be assignment targets. */ | ||
| case Attribute_kind: | ||
| if (e->v.Attribute.ctx == Load && can_optimize_super_call(c, e->v.Attribute.value)) { | ||
| RETURN_IF_ERROR(load_args_for_super(c, e->v.Attribute.value)); | ||
| int opcode = asdl_seq_LEN(e->v.Attribute.value->v.Call.args) ? | ||
| LOAD_SUPER_ATTR : LOAD_ZERO_SUPER_ATTR; | ||
| ADDOP_NAME(c, loc, opcode, e->v.Attribute.attr, names); | ||
| return SUCCESS; | ||
| } | ||
| VISIT(c, expr, e->v.Attribute.value); | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.