gh-126298: Don't deduplicate slice constants based on equality #126398
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
mdboom
force-pushed
the
slice-constant-fix
branch
from
da12eed to
af304c8
Compare
mdboom
changed the title
brandtbucher
approved these changes
Nov 4, 2024
Lib/test/test_compile.py
Outdated
| @@ -1384,53 +1384,90 @@ def check_op_count(func, op, expected): | |||
| actual += 1 | |||
| self.assertEqual(actual, expected) | |||
|
|
|||
| def check_num_consts(func, typ, expected): | |||
There was a problem hiding this comment.
I think everywhere this is used it's called with 0 expected. Maybe just replace those calls with check_consts(func, typ, set()) since both functions are so similar?
Lib/test/test_compile.py
Outdated
| def store(): | ||
| x[a:b] = y | ||
| x [a:] = y | ||
| x[a:] = y |
There was a problem hiding this comment.
This whitespace might be intentional... load has the exact same whitespace above. We are testing the compiler, after all.
I'm inclined to just leave it.
|
|
||
| def load(): | ||
| return x[a:b] + x [a:] + x[:b] + x[:] | ||
|
|
||
| check_op_count(load, "BINARY_SLICE", 3) | ||
| check_op_count(load, "BUILD_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(load, "BUILD_SLICE", 0) | |
| check_op_count(load, "BUILD_SLICE", 0) | |
| check_op_count(load, "BINARY_SUBSCR", 1) |
| x[:b] = y | ||
| x[:] = y | ||
|
|
||
| check_op_count(store, "STORE_SLICE", 3) | ||
| check_op_count(store, "BUILD_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(store, "BUILD_SLICE", 0) | |
| check_op_count(store, "BUILD_SLICE", 0) | |
| check_op_count(store, "STORE_SUBSCR", 1) |
| def long_slice(): | ||
| return x[a:b:c] | ||
|
|
||
| check_op_count(long_slice, "BUILD_SLICE", 1) | ||
| check_op_count(long_slice, "BINARY_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(long_slice, "BINARY_SLICE", 0) | |
| check_op_count(long_slice, "BINARY_SLICE", 0) | |
| check_op_count(long_slice, "BINARY_SUBSCR", 1) |
Lib/test/test_compile.py
Outdated
| check_op_count(aug, "BINARY_SLICE", 1) | ||
| check_op_count(aug, "STORE_SLICE", 1) | ||
| check_op_count(aug, "BUILD_SLICE", 0) | ||
| check_num_consts(long_slice, slice, 0) |
There was a problem hiding this comment.
Suggested change
| check_num_consts(long_slice, slice, 0) | |
| check_num_consts(aug, slice, 0) |
| def aug(): | ||
| x[a:b] += y | ||
|
|
||
| check_op_count(aug, "BINARY_SLICE", 1) | ||
| check_op_count(aug, "STORE_SLICE", 1) | ||
| check_op_count(aug, "BUILD_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(aug, "BUILD_SLICE", 0) | |
| check_op_count(aug, "BUILD_SLICE", 0) | |
| check_op_count(aug, "BINARY_SUBSCR", 0) | |
| check_op_count(aug, "STORE_SUBSCR", 0) |
| def aug_const(): | ||
| x[1:2] += y | ||
|
|
||
| check_op_count(aug_const, "BINARY_SLICE", 0) | ||
| check_op_count(aug_const, "STORE_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(aug_const, "STORE_SLICE", 0) | |
| check_op_count(aug_const, "STORE_SLICE", 0) | |
| check_op_count(aug_const, "BINARY_SUBSCR", 1) | |
| check_op_count(aug_const, "STORE_SUBSCR", 1) |
| check_op_count(aug, "BUILD_SLICE", 0) | ||
| check_op_count(aug_const, "BINARY_SLICE", 0) | ||
| check_op_count(aug_const, "STORE_SLICE", 0) | ||
| check_consts(aug_const, slice, 1) | ||
| check_op_count(compound_const_slice, "BINARY_SLICE", 0) | ||
| check_op_count(compound_const_slice, "BUILD_SLICE", 0) |
There was a problem hiding this comment.
Suggested change
| check_op_count(compound_const_slice, "BUILD_SLICE", 0) | |
| check_op_count(compound_const_slice, "BUILD_SLICE", 0) | |
| check_op_count(compound_const_slice, "STORE_SLICE", 0) | |
| check_op_count(compound_const_slice, "BINARY_SUBSCR", 1) |
TeamSpen210
reviewed
Nov 4, 2024
| @@ -1385,52 +1385,90 @@ def check_op_count(func, op, expected): | |||
| self.assertEqual(actual, expected) | |||
|
|
|||
| def check_consts(func, typ, expected): | |||
| slice_consts = 0 | |||
| all_consts = set() | |||
There was a problem hiding this comment.
I don't think this is working correctly - slices just defer to their contents for hash/equality, so this will be deduplicating the slices in the same way this is trying to fix.
picnixz
pushed a commit
to picnixz/cpython
that referenced
this pull request
Dec 8, 2024
…ython#126398) * pythongh-126298: Don't deduplicated slice constants based on equality * NULL check for PySlice_New * Fix refcounting * Fix refcounting some more * Fix refcounting * Make tests more complete * Fix tests
ebonnal
pushed a commit
to ebonnal/cpython
that referenced
this pull request
Jan 12, 2025
…ython#126398) * pythongh-126298: Don't deduplicated slice constants based on equality * NULL check for PySlice_New * Fix refcounting * Fix refcounting some more * Fix refcounting * Make tests more complete * Fix tests
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.
Uh oh!
There was an error while loading. Please reload this page.