Various cleanups around pre-TyCtxt queries and functions #106810

oli-obk · 2023-01-13T14:27:37Z

based on #106776 (everything starting at 0e2b39f is new in this PR)

I think this should be most of the uncontroversial part of #105462.

rustbot · 2023-01-13T14:27:46Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

Please see the contribution instructions for more information.

rustbot · 2023-01-13T14:27:50Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

The Miri subtree was changed

cc @rust-lang/miri

oli-obk · 2023-01-13T14:29:53Z

@bors try @rust-timer queue

bors · 2023-01-13T14:30:04Z

⌛ Trying commit 16f07aee4acdca6063d0a6a0e32e96e1ccffe427 with merge dc88ba6552d55a6b2fa3a3ea6fbad64e10e134e5...

oli-obk · 2023-01-13T17:00:13Z

@rust-timer build dc88ba6552d55a6b2fa3a3ea6fbad64e10e134e5

rust-timer · 2023-01-13T18:18:29Z

Finished benchmarking commit (dc88ba6552d55a6b2fa3a3ea6fbad64e10e134e5): comparison URL.

Overall result: ❌✅ regressions and improvements - no 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.

@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
Regressions ❌ (secondary)	0.3%	[0.3%, 0.4%]	2
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.2%, -0.2%]	2

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)	3.3%	[2.4%, 4.3%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-3.1%, -1.6%]	4
All ❌✅ (primary)	-	-	0

Cycles

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

petrochenkov · 2023-01-13T18:58:43Z

Perf is ok, rebase is needed.
@rustbot author

oli-obk · 2023-01-16T08:04:51Z

@rustbot review

compiler/rustc_driver/src/lib.rs

compiler/rustc_session/src/config.rs

compiler/rustc_driver/src/pretty.rs

compiler/rustc_session/src/session.rs

compiler/rustc_driver/src/lib.rs

SmiteWindows · 2023-01-18T14:57:03Z

@petrochenkov bors ?

oli-obk · 2023-01-18T15:40:35Z

@bors retry

compiler-errors · 2023-01-18T16:42:29Z

Bors keeps getting stuck on this PR. Opened a topic on zulip: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Bors.20gets.20stuck.20on.20.23106810

@bors r-

Mark-Simulacrum · 2023-01-18T17:27:14Z

@bors r=petrochenkov

Let's see if this helps. Previously PR CI wasn't running either so I wonder if some internal GitHub state was confused.

bors · 2023-01-18T17:27:16Z

📌 Commit 1355559 has been approved by petrochenkov

It is now in the queue for this repository.

bors · 2023-01-19T05:23:44Z

⌛ Testing commit 1355559 with merge 65d2f2a...

bors · 2023-01-19T08:04:17Z

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

rust-timer · 2023-01-19T09:23:03Z

Finished benchmarking commit (65d2f2a): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.4%	[-1.4%, -1.4%]	1
All ❌✅ (primary)	-	-	0

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)	2.8%	[2.8%, 2.8%]	1
Regressions ❌ (secondary)	3.6%	[2.7%, 4.1%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.1%, -3.0%]	2
All ❌✅ (primary)	2.8%	[2.8%, 2.8%]	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)	1.8%	[1.7%, 1.8%]	2
Regressions ❌ (secondary)	1.7%	[1.5%, 2.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.8%	[1.7%, 1.8%]	2

Until rust-lang/rust#106810 can be dealt with.

Also, revert the following commits: - cc8b57a - 7e9057f

…=petrochenkov Various cleanups around pre-TyCtxt queries and functions part of rust-lang#105462 based on rust-lang#106776 (everything starting at [0e2b39f](rust-lang@0e2b39f) is new in this PR) r? `@petrochenkov` I think this should be most of the uncontroversial part of rust-lang#105462.

…rochenkov give the resolver access to TyCtxt The resolver is now created after TyCtxt is created. Then macro expansion and name resolution are run and the results fed into queries just like before this PR. Since the resolver had (before this PR) mutable access to the `CStore` and the source span table, these two datastructures are now behind a `RwLock`. To ensure that these are not mutated anymore after the resolver is done, a read lock to them is leaked right after the resolver finishes. ### PRs split out of this one and leading up to it: * rust-lang#105423 * rust-lang#105357 * rust-lang#105603 * rust-lang#106776 * rust-lang#106810 * rust-lang#106812 * rust-lang#108032

give the resolver access to TyCtxt The resolver is now created after TyCtxt is created. Then macro expansion and name resolution are run and the results fed into queries just like before this PR. Since the resolver had (before this PR) mutable access to the `CStore` and the source span table, these two datastructures are now behind a `RwLock`. To ensure that these are not mutated anymore after the resolver is done, a read lock to them is leaked right after the resolver finishes. ### PRs split out of this one and leading up to it: * rust-lang/rust#105423 * rust-lang/rust#105357 * rust-lang/rust#105603 * rust-lang/rust#106776 * rust-lang/rust#106810 * rust-lang/rust#106812 * rust-lang/rust#108032

rustbot assigned petrochenkov Jan 13, 2023

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 13, 2023

oli-obk mentioned this pull request Jan 13, 2023

give the resolver access to TyCtxt #105462

Merged

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 13, 2023

petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2023

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 13, 2023

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 13, 2023

This comment was marked as resolved.

Sign in to view

oli-obk added 3 commits January 16, 2023 08:03

Remove prepare_outputs

9e9c871

remove some arguments that can also be fed at the caller side

6b1a789

Remove redundant input_path field from Config

f5c6014

oli-obk force-pushed the resolver_reverse_plumbing branch from 0a66365 to fd948b0 Compare January 16, 2023 08:04

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 16, 2023

petrochenkov reviewed Jan 16, 2023

View reviewed changes

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 Jan 16, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 18, 2023

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2023

Mark-Simulacrum closed this Jan 18, 2023

Mark-Simulacrum reopened this Jan 18, 2023

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 Jan 18, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 19, 2023

bors merged commit 65d2f2a into rust-lang:master Jan 19, 2023

rustbot added this to the 1.68.0 milestone Jan 19, 2023

bors mentioned this pull request Jan 19, 2023

Add -Z instrument-xray flag #102963

Merged

oli-obk deleted the resolver_reverse_plumbing branch January 19, 2023 09:27

smoelius added a commit to trailofbits/dylint that referenced this pull request Jan 22, 2023

Temporarily pin dylint_linting to nightly-2023-01-19

cc8b57a

Until rust-lang/rust#106810 can be dealt with.

smoelius added a commit to trailofbits/dylint that referenced this pull request Jan 22, 2023

Temporarily pin publish.sh to nightly-2023-01-19

7e9057f

Until rust-lang/rust#106810 can be dealt with.

smoelius added a commit to trailofbits/dylint that referenced this pull request Jan 23, 2023

Address rust-lang/rust#106810

1299cd5

Also, revert the following commits: - cc8b57a - 7e9057f

smoelius added a commit to trailofbits/dylint that referenced this pull request Jan 24, 2023

Address rust-lang/rust#106810

8b293ec

Also, revert the following commits: - cc8b57a - 7e9057f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various cleanups around pre-TyCtxt queries and functions #106810

Various cleanups around pre-TyCtxt queries and functions #106810

oli-obk commented Jan 13, 2023 •

edited

Loading

rustbot commented Jan 13, 2023

rustbot commented Jan 13, 2023

oli-obk commented Jan 13, 2023

This comment has been minimized.

bors commented Jan 13, 2023

oli-obk commented Jan 13, 2023

This comment has been minimized.

rust-timer commented Jan 13, 2023

petrochenkov commented Jan 13, 2023

This comment was marked as resolved.

oli-obk commented Jan 16, 2023

SmiteWindows commented Jan 18, 2023

oli-obk commented Jan 18, 2023

compiler-errors commented Jan 18, 2023

Mark-Simulacrum commented Jan 18, 2023

bors commented Jan 18, 2023

bors commented Jan 19, 2023

bors commented Jan 19, 2023

rust-timer commented Jan 19, 2023

Various cleanups around pre-TyCtxt queries and functions #106810

Various cleanups around pre-TyCtxt queries and functions #106810

Conversation

oli-obk commented Jan 13, 2023 • edited Loading

rustbot commented Jan 13, 2023

rustbot commented Jan 13, 2023

oli-obk commented Jan 13, 2023

This comment has been minimized.

bors commented Jan 13, 2023

oli-obk commented Jan 13, 2023

This comment has been minimized.

rust-timer commented Jan 13, 2023

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

petrochenkov commented Jan 13, 2023

This comment was marked as resolved.

oli-obk commented Jan 16, 2023

SmiteWindows commented Jan 18, 2023

oli-obk commented Jan 18, 2023

compiler-errors commented Jan 18, 2023

Mark-Simulacrum commented Jan 18, 2023

bors commented Jan 18, 2023

bors commented Jan 19, 2023

bors commented Jan 19, 2023

rust-timer commented Jan 19, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

oli-obk commented Jan 13, 2023 •

edited

Loading