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.

Sign up for GitHub

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

Jump to bottom

Make Fingerprint::combine_commutative associative #92528

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Make Fingerprint::combine_commutative associative #92528

merged 1 commit into from
Feb 2, 2022

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Jan 3, 2022

The previous implementation swapped lower and upper 64-bits of a result
of modular addition, so the function was non-associative.

r? @Aaron1011

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 3, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2022
@tmiasko tmiasko mentioned this pull request Jan 3, 2022
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tmiasko
Make Fingerprint::combine_commutative associative
1d64b59 
The previous implementation swapped lower and upper 64-bits of a result
of modular addition, so the function was non-associative.
@tmiasko tmiasko force-pushed the combine-commutative branch from f44bdfa to 1d64b59 Compare January 3, 2022 18:07
@Aaron1011
Copy link
Member

r=me unless @michaelwoerister wants anything changed

@joshtriplett
Copy link
Member

@bors try @rust-timer queue

Just to make sure there isn't any subtle perf effect here.

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 6, 2022
@bors
Copy link
Contributor

bors commented Jan 6, 2022

⌛ Trying commit 1d64b59 with merge 8f0ee5d41d8626fffe038c1d011db701b44888a0...

@bors
Copy link
Contributor

bors commented Jan 6, 2022

☀️ Try build successful - checks-actions
Build commit: 8f0ee5d41d8626fffe038c1d011db701b44888a0 (8f0ee5d41d8626fffe038c1d011db701b44888a0)

@rust-timer
Copy link
Collaborator

Queued 8f0ee5d41d8626fffe038c1d011db701b44888a0 with parent f1ce0e6, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8f0ee5d41d8626fffe038c1d011db701b44888a0): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 6, 2022
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 23, 2022
@tmiasko
Copy link
Contributor Author

tmiasko commented Jan 26, 2022

r? @michaelwoerister

@michaelwoerister
Copy link
Member

I'll take a look shortly.

@michaelwoerister
Copy link
Member

Great find, @tmiasko!

It was never the intended behavior to swap the two components.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 2, 2022

📌 Commit 1d64b59 has been approved by michaelwoerister

@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 Feb 2, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2022
@bors
Auto merge of rust-lang#93594 - matthiaskrgr:rollup-lcvhpdv, r=matthi…
27f5d83 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#92528 (Make `Fingerprint::combine_commutative` associative)
 - rust-lang#93221 ([borrowck] Fix help on mutating &self in async fns)
 - rust-lang#93542 (Prevent lifetime elision in type alias)
 - rust-lang#93546 (Validate that values in switch int terminator are unique)
 - rust-lang#93571 (better suggestion for duplicated `where` clause)
 - rust-lang#93574 (don't suggest adding `let` due to bad assignment expressions inside of `while` loop)
 - rust-lang#93590 (More let_else adoptions)
 - rust-lang#93592 (Remove unused dep from rustc_arena)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 21ffe45 into rust-lang:master Feb 2, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 2, 2022
@tmiasko tmiasko deleted the combine-commutative branch February 3, 2022 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelwoerister michaelwoerister

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
10 participants
@tmiasko @rust-log-analyzer @Aaron1011 @joshtriplett @rust-timer @bors @michaelwoerister @JohnCSimon @rust-highfive @rustbot