Skip to content

Replace some CrateStore trait methods with hooks. #123099

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
Merged
merged 3 commits into from
Apr 9, 2024
Merged

Replace some CrateStore trait methods with hooks. #123099

merged 3 commits into from
Apr 9, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 26, 2024 •
edited
Loading

Just like with the CrateStore trait, this avoids the cyclic definition issues with CStore being
defined after TyCtxt, but needing to be used in TyCtxt.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 26, 2024

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Mar 26, 2024

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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. S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Mar 26, 2024
@bors
Copy link
Collaborator

bors commented Mar 26, 2024

⌛ Trying commit 7ac3e6c with merge e28ed25...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2024
@bors
Auto merge of rust-lang#123099 - oli-obk:span_tcx, r=<try>
e28ed25 
Replace some `CrateStore` trait methods with hooks.

Just like with the `CrateStore` trait, this avoids the cyclic definition issues with `CStore` being
defined after TyCtxt, but needing to be used in TyCtxt.

This is work towards unblocking rust-lang#122993 (the next step is giving `Span` deserialization access to the `TyCtxt`)
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2024
@bors
Copy link
Collaborator

bors commented Mar 26, 2024

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e28ed25): 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-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.9% [0.2%, 1.4%] 109
Regressions ❌
(secondary)		 0.9% [0.3%, 1.6%] 47
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.9% [0.2%, 1.4%] 109

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)		 - - 0
Improvements ✅
(primary)		 -1.5% [-2.4%, -1.2%] 12
Improvements ✅
(secondary)		 -2.6% [-2.7%, -2.5%] 2
All ❌✅ (primary) -1.5% [-2.4%, -1.2%] 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)		 0.6% [0.5%, 0.6%] 3
Regressions ❌
(secondary)		 1.7% [1.7%, 1.7%] 1
Improvements ✅
(primary)		 -1.2% [-2.7%, -0.4%] 3
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.3% [-2.7%, 0.6%] 6

Binary size

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

Bootstrap: 671.741s -> 671.809s (0.01%)
Artifact size: 315.68 MiB -> 315.71 MiB (0.01%)

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Mar 26, 2024
oli-obk added 3 commits March 27, 2024 08:20
@oli-obk
Start replacing CStore trait methods with hooks.
32bd3c3 
This also avoids the cyclic definition issues with CrateStore being
defined after TyCtxt, but needing to be used in TyCtxt.
@oli-obk
Move CrateStore::expn_hash_to_expn_id to a hook
0f5911c
@oli-obk
Make def_path_hash_to_def_id a hook
24fc6e9
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 27, 2024

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2024
@bors
Copy link
Collaborator

bors commented Mar 27, 2024

⌛ Trying commit 24fc6e9 with merge bdf96c1...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2024
@bors
Auto merge of rust-lang#123099 - oli-obk:span_tcx, r=<try>
bdf96c1 
Replace some `CrateStore` trait methods with hooks.

Just like with the `CrateStore` trait, this avoids the cyclic definition issues with `CStore` being
defined after TyCtxt, but needing to be used in TyCtxt.

This is work towards unblocking rust-lang#122993 (the next step is giving `Span` deserialization access to the `TyCtxt`)
@bors
Copy link
Collaborator

bors commented Mar 27, 2024

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bdf96c1): 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-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.4% [0.1%, 0.7%] 15
Regressions ❌
(secondary)		 0.4% [0.3%, 0.7%] 20
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.1%, 0.7%] 15

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)		 - - 0
Improvements ✅
(primary)		 -1.9% [-4.0%, -1.2%] 9
Improvements ✅
(secondary)		 -3.1% [-5.5%, -2.1%] 21
All ❌✅ (primary) -1.9% [-4.0%, -1.2%] 9

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.4% [0.4%, 0.4%] 3
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 3

Binary size

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

Bootstrap: 669.488s -> 669.034s (-0.07%)
Artifact size: 315.76 MiB -> 315.72 MiB (-0.01%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2024
@RalfJung
Copy link
Member

This is work towards unblocking #122993 (the next step is giving Span deserialization access to the TyCtxt)

FWIW I have closed that PR as there's an alternative, simpler approach; if this is a lot of work it may not be worth it.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 29, 2024

This is work that I wanted to do anyway. It will eventually allow cleanups like getting rid of the Option<&Session> in deserialization and just using TyCtxt everywhere

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 8, 2024

I ran a bunch of the regressions through cachegrind locally, and it looks very much like inliner noise to me.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Apr 8, 2024

📌 Commit 24fc6e9 has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 8, 2024
@bors
Copy link
Collaborator

bors commented Apr 9, 2024

⌛ Testing commit 24fc6e9 with merge bd12986...

@bors
Copy link
Collaborator

bors commented Apr 9, 2024

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing bd12986 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2024
@bors bors merged commit bd12986 into rust-lang:master Apr 9, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 9, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bd12986): 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.3% [0.2%, 0.4%] 14
Regressions ❌
(secondary)		 0.3% [0.3%, 0.4%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.3% [0.2%, 0.4%] 14

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)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)		 -3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

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

Binary size

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

Bootstrap: 674.144s -> 673.094s (-0.16%)
Artifact size: 318.36 MiB -> 318.26 MiB (-0.03%)

@oli-obk oli-obk deleted the span_tcx branch April 9, 2024 06:36
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 9, 2024

@rustbot label: +perf-regression-triaged

#123099 (comment)

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 9, 2024
@LFS6502 LFS6502 mentioned this pull request Feb 13, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov approved these changes

Assignees

@petrochenkov petrochenkov

Labels
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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @rust-timer @rustbot @bors @RalfJung @petrochenkov