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

Hash spans when interning types #104282

Merged
merged 4 commits into from
Nov 13, 2022
Merged

Hash spans when interning types #104282

merged 4 commits into from
Nov 13, 2022

Conversation

cjgillot
Copy link
Contributor

Ignoring hash for spans creates an inconsistency between the Hash impl for WithStableHash, which takes them into account, and the HashStable impl which does not.

cc @compiler-errors

Fixes #104271
Fixes #104255
Fixes #104238

@rustbot
Copy link
Collaborator

rustbot commented Nov 11, 2022

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 11, 2022
@cjgillot
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

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

bors commented Nov 11, 2022

⌛ Trying commit 9d86e6a with merge e61cbcb92683ffeda9b60e87f8e73f0c4ac0456c...

@bors
Copy link
Contributor

bors commented Nov 11, 2022

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

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e61cbcb92683ffeda9b60e87f8e73f0c4ac0456c): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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 may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.6% [0.2%, 2.4%] 88
Regressions ❌
(secondary)
1.4% [0.2%, 9.0%] 64
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [0.2%, 2.4%] 88

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.3% [0.9%, 1.9%] 12
Regressions ❌
(secondary)
2.6% [1.3%, 3.6%] 18
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.3% [0.9%, 1.9%] 12

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.0% [0.9%, 3.8%] 11
Regressions ❌
(secondary)
3.6% [1.2%, 9.4%] 27
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [0.9%, 3.8%] 11

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Nov 11, 2022
@cjgillot
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

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

bors commented Nov 11, 2022

⌛ Trying commit ba46b68 with merge 169da0ee88c495f5d40f40a97840a6640d59ed70...

@bors
Copy link
Contributor

bors commented Nov 11, 2022

☀️ Try build successful - checks-actions
Build commit: 169da0ee88c495f5d40f40a97840a6640d59ed70 (169da0ee88c495f5d40f40a97840a6640d59ed70)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (169da0ee88c495f5d40f40a97840a6640d59ed70): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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 may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.5% [0.2%, 0.9%] 39
Regressions ❌
(secondary)
0.6% [0.2%, 1.1%] 26
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.2%, 0.9%] 39

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.8% [1.4%, 2.3%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 12, 2022
@cjgillot
Copy link
Contributor Author

This is an incremental correctness test for information that should have been hashed but was not. 1% regression should be acceptable.

@cjgillot cjgillot added the perf-regression-triaged The performance regression has been triaged. label Nov 12, 2022
@compiler-errors
Copy link
Member

compiler-errors commented Nov 13, 2022

I agree that this regression, while unfortunate, is acceptable for correctness.

r? @compiler-errors @bors r+

@bors
Copy link
Contributor

bors commented Nov 13, 2022

📌 Commit ba46b68 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned davidtwco Nov 13, 2022
@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 Nov 13, 2022
@bors
Copy link
Contributor

bors commented Nov 13, 2022

⌛ Testing commit ba46b68 with merge 3be81dd...

@bors
Copy link
Contributor

bors commented Nov 13, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 3be81dd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 13, 2022
@bors bors merged commit 3be81dd into rust-lang:master Nov 13, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 13, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3be81dd): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.5% [0.2%, 0.9%] 44
Regressions ❌
(secondary)
0.6% [0.2%, 0.9%] 19
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.2%, 0.9%] 44

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
6.6% [4.1%, 9.1%] 2
Improvements ✅
(primary)
-0.9% [-0.9%, -0.9%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.9% [-0.9%, -0.9%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-3.1%, -2.0%] 2
All ❌✅ (primary) - - 0

@cjgillot cjgillot deleted the intern-span branch November 13, 2022 13:58
@nnethercote
Copy link
Contributor

Regressions are all in incremental builds, and are necessary for correctness.

@rustbot label: +perf-regression-triaged

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Hash spans when interning types

Ignoring hash for spans creates an inconsistency between the `Hash` impl for `WithStableHash`, which takes them into account, and the `HashStable` impl which does not.

cc `@compiler-errors`

Fixes rust-lang#104271
Fixes rust-lang#104255
Fixes rust-lang#104238
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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
8 participants