feat(data_structures): introduce PointerExt trait#11095
Merged
graphite-app[bot] merged 1 commit intomainfrom May 18, 2025
Merged
feat(data_structures): introduce PointerExt trait#11095graphite-app[bot] merged 1 commit intomainfrom
PointerExt trait#11095graphite-app[bot] merged 1 commit intomainfrom
Conversation
Member
Author
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
CodSpeed Instrumentation Performance ReportMerging #11095 will not alter performanceComparing Summary
|
6439301 to
5f756b9
Compare
Member
Merge activity
|
Rust v1.87.0 introduced new methods for pointers, notably `offset_from_unsigned` which calculates the distance between 2 pointers. https://doc.rust-lang.org/std/primitive.pointer.html#method.offset_from_unsigned `offset_from_unsigned` is the same as `offset_from`, except it require the source pointer to be before the target, and so returns a `usize` rather than an `isize`. In return for this restriction, the compiler is able to generate more efficient code in some cases. We want to use these methods, but our MSRV won't hit 1.87.0 for 3 months. This PR introduces a `PointerExt` trait which provides similar methods `offset_from_usize` and `byte_offset_from_usize`. On versions of Rust >= 1.87.0, these delegate directly to the native Rust methods `offset_from_unsigned` and `byte_offset_from_unsigned`. On earlier versions of Rust, they use a fallback implementation. This PR replaces all use of `offset_from` with `offset_from_usize` in our crates. This will probably make little difference to perf, as we don't use these methods much, and the perf advantage is small anyway. But reason I'm making this PR now is that allocator will make liberal use of them on very hot paths.
5f756b9 to
c79a7d0
Compare
graphite-app bot
pushed a commit
that referenced
this pull request
May 18, 2025
… comparisons (#11116) Lexer use `offset_from` and `offset_from_unsigned` pointer methods rather than comparing pointers as `usize`s. This utilizes the `PointerExt` trait introduced in #11095. This change tells the compiler "both these pointers are into the same object, and origin pointer is before target pointer", which gives it more information for optimization, and alias analysis. This change also allows simplifying `Source` a little - we now almost entirely now deal in `SourcePosition`s, rather than a mix of `SourcePosition`s, raw pointers, and `ptr as usize`. Tiny improvement on lexer benchmarks. Interestingly, it seems to produce a consistent ~1% speed-up in the byte handler for `/`. It seems to particularly have a positive effect on lexing single-line comments, for some reason.
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
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.

Rust v1.87.0 introduced new methods for pointers, notably
offset_from_unsignedwhich calculates the distance between 2 pointers.https://doc.rust-lang.org/std/primitive.pointer.html#method.offset_from_unsigned
offset_from_unsignedis the same asoffset_from, except it require the source pointer to be before the target, and so returns ausizerather than anisize. In return for this restriction, the compiler is able to generate more efficient code in some cases.We want to use these methods, but our MSRV won't hit 1.87.0 for 3 months.
This PR introduces a
PointerExttrait which provides similar methodsoffset_from_usizeandbyte_offset_from_usize.On versions of Rust >= 1.87.0, these delegate directly to the native Rust methods
offset_from_unsignedandbyte_offset_from_unsigned. On earlier versions of Rust, they use a fallback implementation.This PR replaces all use of
offset_fromwithoffset_from_usizein our crates.This will probably make little difference to perf, as we don't use these methods much, and the perf advantage is small anyway. But reason I'm making this PR now is that allocator will make liberal use of them on very hot paths.