gh-139757: Add BINARY_OP_SUBSCR_USTR_INT #143389
Merged
+1,461
−1,196
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
passes the tests and brings bm_tomli back to normal, i.e. 15 % speedup
Member
|
I verified a 9% speedup on this PR for the Apparently, we regressed earlier in https://github.com/python/cpython/pull/140800/files. This caused the 10% slowdown in tomli loads. Which seemingly uses a lot of unicode strings. I'm going to merge this PR to remove the perf regression. |
Member
Fidget-Spinner
left a comment
Fidget-Spinner
left a comment
There was a problem hiding this comment.
Just need tests and two comments. Thanks!
Python/bytecodes.c
Outdated
| res = PyStackRef_FromPyObjectBorrow(res_o); | ||
| } | ||
|
|
||
| macro(BINARY_OP_SUBSCR_NCSTR_INT) = |
Member
There was a problem hiding this comment.
When you have the time, please change then name to BINARY_OP_SUBSCR_USTR_INT.
Python/bytecodes.c
Outdated
| } | ||
|
|
||
| macro(BINARY_OP_SUBSCR_NCSTR_INT) = | ||
| _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_NCSTR_INT + _POP_TOP_INT + POP_TOP; |
Member
There was a problem hiding this comment.
Is POP_TOP_UNICODE instead of POP_TOP safe here?
chris-eibl
changed the title
chris-eibl
added
performance
chris-eibl
commented
Jan 4, 2026
| self.assertNotIn("_GUARD_TOS_UNICODE", uops) | ||
| self.assertIn("_BINARY_OP_ADD_UNICODE", uops) | ||
|
|
||
| def test_binary_subcsr_ustr_int_narrows_to_str(self): |
Member
Author
There was a problem hiding this comment.
I thought of paramterizing test_binary_subcsr_str_int_narrows_to_str and test_binary_op_subscr_str_int to get rid of duplication, but it resulted in worse readable code, because the input and the expectations have to be varied ...
Member
|
Sorry for leaving 3 separate review comments instead of one review. I only picked up on some of these while looking over them again. |
chris-eibl
commented
Jan 4, 2026
Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Since #140800
BINARY_OP_SUBSCR_STR_INTonly specializes for compact ASCII strings. Let's introduceBINARY_OP_SUBSCR_USTR_INTto specialize again for reading an ASCII character from any string.