-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Optimize indexing slices and strs with inclusive ranges #145024
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
r? @ibraheemdev rustbot has assigned @ibraheemdev. Use |
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As you saw from the PR build failure, if you're touching things like slice_index_order_fail
you'll need to look through every mention of those in the repo -- there are a bunch of codegen tests that look for their absence, and you need to make sure that you don't make those tests useless by renaming what they're looking for.
(You probably also need to re-bless some MIR tests that include indexing.)
eab010d
to
61bcd82
Compare
This comment has been minimized.
This comment has been minimized.
61bcd82
to
2546221
Compare
This comment has been minimized.
This comment has been minimized.
2546221
to
a61fde0
Compare
The Miri subtree was changed cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
48b325f
to
87a3889
Compare
This comment has been minimized.
This comment has been minimized.
87a3889
to
bd63d02
Compare
This comment has been minimized.
This comment has been minimized.
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
Optimize indexing slices and strs with inclusive ranges
The check for `self.end() == usize::MAX` can be combined with the `self.end() + 1 > slice.len()` check into `self.en() >= slice.len()`, since `self.end() < slice.len()` implies both `self.end() <= slice.len()` and `self.end() < usize::MAX`. The tradeoff is slightly worse error reporting: previously there would be a special panic message in the `range.end() == usize::MAX` case.
Same reasoning as previous commit.
bd63d02
to
194cfc3
Compare
This comment has been minimized.
This comment has been minimized.
Finished benchmarking commit (4249615): comparison URL. Overall result: ❌✅ regressions and improvements - please read the text belowBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary -4.0%, secondary 2.6%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 2.5%, secondary -1.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (primary -0.0%, secondary -0.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 463.988s -> 464.596s (0.13%) |
Instead of separately checking for
end == usize::MAX
andend + 1 > slice.len()
, we can check forend >= slice.len()
. Also consolidate all the slice indexing related panic functions into a single function which reports the correct error depending on the arguments, as the str indexing code already does.The downside of all this is that the panic message is slightly less specific when trying to index with
[..=usize::MAX]
: instead of saying "attempted to index slice up to maximum usize" it just says "range end index {end} out of range for slice of length {len}". But this is a rare enough case that I think it is acceptable