GH-118093: Add tier two support for BINARY_OP_INPLACE_ADD_UNICODE
#122253
Conversation
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
brandtbucher
added
performance
3 tasks
markshannon
reviewed
Jul 25, 2024
| @@ -607,9 +613,11 @@ dummy_func( | |||
| *target_local = PyStackRef_FromPyObjectSteal(temp); | |||
| _Py_DECREF_SPECIALIZED(right_o, _PyUnicode_ExactDealloc); | |||
| ERROR_IF(PyStackRef_IsNull(*target_local), error); | |||
| #if TIER_ONE | |||
There was a problem hiding this comment.
Can you add a comment explaining how this is handled in tier 2.
Python/optimizer.c
Outdated
| @@ -888,6 +894,10 @@ translate_bytecode_to_trace( | |||
| // Add cache size for opcode | |||
| instr += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]]; | |||
|
|
|||
| if (opcode == BINARY_OP_INPLACE_ADD_UNICODE) { | |||
There was a problem hiding this comment.
Can you move this up to the if (uop == _BINARY_OP_INPLACE_ADD_UNICODE) clause above?
I'd like to keep the special casing code in one place.
You'll probably want to add an assert this uop is the last in the expansion, as well. Like we do in if (uop == _PUSH_FRAME) above.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This one's a bit weird, since it needs the oparg of the following instruction. This is readily available in tier one, but needs to be smuggled in using an operand in tier two.
Technically, it would be cleaner to just add an additional cache entry to all
BINARY_OPinstructions and use that here. However, that feels very wasteful for an instruction that already requires quite a bit of special-casing anyways. So instead, just toss the needed value in the operand during projection.This is mostly for completeness. No impact on perf or stats, although if you squint hard enough you can see very slight increases in trace length and decreases in number of traces and tier one instructions.