Skip to content
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

Optimize pointer::is_aligned_to #100169

Merged
merged 1 commit into from
Aug 7, 2022

Conversation

WaffleLapkin
Copy link
Member

This PR replaces addr % align with addr & align - 1, which is correct due to align being a power of two.

Here is a proof that this makes things better: [godbolt].

This PR also removes assume(align != 0), with the new impl it does not improve anything anymore ([godbolt], [original concern]).

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 5, 2022
@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2022
Copy link
Member

@workingjubilee workingjubilee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sanity checked these are numerically equivalent in the Playground:

use std::iter::successors;

fn main() {
    for addr in successors(Some(1u64), |x| x.checked_mul(2)) {
        let mut i = successors(Some(1u64), |x| x.checked_mul(2));
        while let Some(align) = i.next() && align <= addr {
            for addr in successors(Some(addr), |x| x.checked_add(addr)).take(256) {
                assert!(addr % align == addr & align - 1);
                assert!(addr & align -1 == 0);
            }
        }
    }
}

@workingjubilee
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2022

📌 Commit c195f7c has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 5, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 6, 2022
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#100071 (deps: dedupe `annotate-snippets` crate versions)
 - rust-lang#100127 (Remove Windows function preloading)
 - rust-lang#100130 (Avoid pointing out `return` span if it has nothing to do with type error)
 - rust-lang#100169 (Optimize `pointer::as_aligned_to`)
 - rust-lang#100175 (ascii -> ASCII in code comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f0ff31f into rust-lang:master Aug 7, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 7, 2022
// Cast is needed for `T: !Sized`
self.cast::<u8>().addr() % align == 0
self.cast::<u8>().addr() & align - 1 == 0
Copy link
Contributor

@lygstate lygstate Aug 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self.cast::<u8>().addr() & (align - 1) == 0 are easier to understand

@WaffleLapkin WaffleLapkin deleted the optimize_is_aligned_to branch August 19, 2022 05:29
@WaffleLapkin WaffleLapkin changed the title Optimize pointer::as_aligned_to Optimize pointer::is_aligned_to May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants