Specialize query execution for incremental and non-incremental #108062

Zoxc · 2023-02-14T20:23:31Z

This specializes query execution for incremental and non-incremental by passing in a separate dyn QueryEngine types, taking advantage of the virtual dispatch to avoid a branch. This ends up duplicating try_execute_query, hopefully the compile time cost of that is relatively low.

This is a performance improvement for the non-incremental path:

Benchmark	Before	After
Benchmark	Time	Time	%
🟣 clap:check	1.8420s	1.8331s	-0.48%
🟣 hyper:check	0.2652s	0.2631s	-0.78%
🟣 regex:check	1.0161s	1.0062s	-0.98%
🟣 syn:check	1.6408s	1.6197s	💚 -1.28%
🟣 syntex_syntax:check	6.3939s	6.3558s	-0.60%
Total	11.1580s	11.0780s	-0.72%
Summary	1.0000s	0.9918s	-0.82%

The incremental path is more neutral:

Benchmark	Before	After
Benchmark	Time	Time	%
🟣 clap:check:initial	2.2210s	2.2227s	0.08%
🟣 hyper:check:initial	0.3441s	0.3443s	0.05%
🟣 regex:check:initial	1.2919s	1.2877s	-0.33%
🟣 syn:check:initial	2.0749s	2.0721s	-0.14%
🟣 syntex_syntax:check:initial	7.9266s	7.9206s	-0.07%
Total	13.8585s	13.8474s	-0.08%
Summary	1.0000s	0.9992s	-0.08%

r? @cjgillot

Nilstrieb · 2023-02-14T21:44:58Z

@bors try @rust-timer queue

bors · 2023-02-14T21:45:08Z

⌛ Trying commit 8f0b5d5d51d2c7b77c5923545af1c80128ddf69a with merge e327b9e2f1370ae8e47c8de12bdba5ec2acee47c...

bors · 2023-02-14T23:59:46Z

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

rust-timer · 2023-02-15T07:01:34Z

Finished benchmarking commit (e327b9e2f1370ae8e47c8de12bdba5ec2acee47c): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.6%	[0.2%, 3.9%]	54
Regressions ❌ (secondary)	1.1%	[0.2%, 3.5%]	75
Improvements ✅ (primary)	-0.6%	[-1.1%, -0.3%]	14
Improvements ✅ (secondary)	-0.7%	[-1.1%, -0.3%]	27
All ❌✅ (primary)	0.4%	[-1.1%, 3.9%]	68

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.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	2.7%	[1.6%, 4.6%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.6%	[-3.6%, -3.6%]	1
All ❌✅ (primary)	1.2%	[1.2%, 1.2%]	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)	2.0%	[1.6%, 2.4%]	2
Regressions ❌ (secondary)	1.8%	[1.1%, 2.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[1.6%, 2.4%]	2

Zoxc · 2023-02-16T18:19:16Z

This does hurt compile times of rustc_query_impl a bit. Specializing get and ensure modes might be a better tradeoff.

Remove `QueryEngine` trait This removes the `QueryEngine` trait and `Queries` from `rustc_query_impl` and replaced them with function pointers and fields in `QuerySystem`. As a side effect `OnDiskCache` is moved back into `rustc_middle` and the `OnDiskCache` trait is also removed. This has a couple of benefits. - `TyCtxt` is used in the query system instead of the removed `QueryCtxt` which is larger. - Function pointers are more flexible to work with. A variant of rust-lang#107802 is included which avoids the double indirection. For rust-lang#108938 we can name entry point `__rust_end_short_backtrace` to avoid some overhead. For rust-lang#108062 it avoids the duplicate `QueryEngine` structs. - `QueryContext` now implements `DepContext` which avoids many `dep_context()` calls in `rustc_query_system`. - The `rustc_driver` size is reduced by 0.33%, hopefully that means some bootstrap improvements. - This avoids the unsafe code around the `QueryEngine` trait. r? `@cjgillot`

Remove `QueryEngine` trait This removes the `QueryEngine` trait and `Queries` from `rustc_query_impl` and replaced them with function pointers and fields in `QuerySystem`. As a side effect `OnDiskCache` is moved back into `rustc_middle` and the `OnDiskCache` trait is also removed. This has a couple of benefits. - `TyCtxt` is used in the query system instead of the removed `QueryCtxt` which is larger. - Function pointers are more flexible to work with. A variant of rust-lang/rust#107802 is included which avoids the double indirection. For rust-lang/rust#108938 we can name entry point `__rust_end_short_backtrace` to avoid some overhead. For rust-lang/rust#108062 it avoids the duplicate `QueryEngine` structs. - `QueryContext` now implements `DepContext` which avoids many `dep_context()` calls in `rustc_query_system`. - The `rustc_driver` size is reduced by 0.33%, hopefully that means some bootstrap improvements. - This avoids the unsafe code around the `QueryEngine` trait. r? `@cjgillot`

Zoxc · 2023-05-14T21:26:00Z

This could use another perf run now that #108638 has landed to see what the bootstrap timing impact is.

cjgillot · 2023-05-15T06:15:07Z

@bors try @rust-timer queue

bors · 2023-05-15T06:15:16Z

⌛ Trying commit 882a968 with merge 508cb011fb98e4d32bb47430172d91c7d5b08af2...

bors · 2023-05-15T08:27:02Z

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

rust-timer · 2023-05-15T09:40:54Z

Finished benchmarking commit (508cb011fb98e4d32bb47430172d91c7d5b08af2): comparison URL.

Overall result: ✅ 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
Improvements ✅ (primary)	-0.6%	[-1.2%, -0.4%]	18
Improvements ✅ (secondary)	-0.8%	[-1.1%, -0.2%]	30
All ❌✅ (primary)	-0.6%	[-1.2%, -0.4%]	18

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.2%	[2.8%, 3.5%]	2
Improvements ✅ (primary)	-4.4%	[-4.9%, -4.1%]	3
Improvements ✅ (secondary)	-4.7%	[-4.7%, -4.7%]	1
All ❌✅ (primary)	-4.4%	[-4.9%, -4.1%]	3

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%	[-2.5%, -2.4%]	3
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 643.398s -> 644.756s (0.21%)

Zoxc · 2023-05-15T09:48:17Z

Bootstrap timing looks decent enough now. I just need to look into incr-unchanged regressions.

cjgillot · 2023-05-16T13:04:47Z

@bors r+

bors · 2023-05-16T13:04:48Z

📌 Commit 882a968 has been approved by cjgillot

It is now in the queue for this repository.

bors · 2023-05-16T16:02:56Z

⌛ Testing commit 882a968 with merge b652d9a...

bors · 2023-05-16T18:42:57Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing b652d9a to master...

rust-timer · 2023-05-16T19:58:11Z

Finished benchmarking commit (b652d9a): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.2%	[0.2%, 0.3%]	9
Regressions ❌ (secondary)	0.8%	[0.2%, 2.9%]	5
Improvements ✅ (primary)	-0.6%	[-1.1%, -0.3%]	17
Improvements ✅ (secondary)	-0.8%	[-1.2%, -0.2%]	31
All ❌✅ (primary)	-0.3%	[-1.1%, 0.3%]	26

Max RSS (memory usage)

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

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

Binary size

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

Bootstrap: 642.522s -> 644.057s (0.24%)

pnkfelix · 2023-05-23T15:20:02Z

the sea of green improvements to scenario=full outweighs the occasional (and minor) red regressions to incr cases.

@rustbot label: +perf-regression-triaged

Remove `QueryEngine` trait This removes the `QueryEngine` trait and `Queries` from `rustc_query_impl` and replaced them with function pointers and fields in `QuerySystem`. As a side effect `OnDiskCache` is moved back into `rustc_middle` and the `OnDiskCache` trait is also removed. This has a couple of benefits. - `TyCtxt` is used in the query system instead of the removed `QueryCtxt` which is larger. - Function pointers are more flexible to work with. A variant of rust-lang/rust#107802 is included which avoids the double indirection. For rust-lang/rust#108938 we can name entry point `__rust_end_short_backtrace` to avoid some overhead. For rust-lang/rust#108062 it avoids the duplicate `QueryEngine` structs. - `QueryContext` now implements `DepContext` which avoids many `dep_context()` calls in `rustc_query_system`. - The `rustc_driver` size is reduced by 0.33%, hopefully that means some bootstrap improvements. - This avoids the unsafe code around the `QueryEngine` trait. r? `@cjgillot`

rustbot assigned cjgillot Feb 14, 2023

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 Feb 14, 2023

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Feb 15, 2023

cjgillot 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 Feb 19, 2023

Zoxc mentioned this pull request Mar 25, 2023

Remove QueryEngine trait #109611

Merged

Specialize query execution for incremental and non-incremental

882a968

Zoxc force-pushed the spec-incr branch from 8f0b5d5 to 882a968 Compare May 14, 2023 21:15

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 May 15, 2023

This comment has been minimized.

Sign in to view

rustbot removed S-waiting-on-perf Status: Waiting on a perf run to be completed. perf-regression Performance regression. labels May 15, 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 May 16, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 16, 2023

bors merged commit b652d9a into rust-lang:master May 16, 2023
12 checks passed

rustbot added this to the 1.71.0 milestone May 16, 2023

bors mentioned this pull request May 16, 2023

Shorten backtraces for queries in ICEs #108938

Merged

rustbot added the perf-regression Performance regression. label May 16, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label May 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Specialize query execution for incremental and non-incremental #108062

Specialize query execution for incremental and non-incremental #108062

Zoxc commented Feb 14, 2023

Nilstrieb commented Feb 14, 2023

This comment has been minimized.

bors commented Feb 14, 2023

bors commented Feb 14, 2023

This comment has been minimized.

rust-timer commented Feb 15, 2023

Zoxc commented Feb 16, 2023

Zoxc commented May 14, 2023

cjgillot commented May 15, 2023

This comment has been minimized.

bors commented May 15, 2023

bors commented May 15, 2023

This comment has been minimized.

rust-timer commented May 15, 2023

Zoxc commented May 15, 2023

cjgillot commented May 16, 2023

bors commented May 16, 2023

bors commented May 16, 2023

bors commented May 16, 2023

rust-timer commented May 16, 2023

pnkfelix commented May 23, 2023

Specialize query execution for incremental and non-incremental #108062

Specialize query execution for incremental and non-incremental #108062

Conversation

Zoxc commented Feb 14, 2023

Nilstrieb commented Feb 14, 2023

This comment has been minimized.

bors commented Feb 14, 2023

bors commented Feb 14, 2023

This comment has been minimized.

rust-timer commented Feb 15, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Zoxc commented Feb 16, 2023

Zoxc commented May 14, 2023

cjgillot commented May 15, 2023

This comment has been minimized.

bors commented May 15, 2023

bors commented May 15, 2023

This comment has been minimized.

rust-timer commented May 15, 2023

Overall result: ✅ improvements - no action needed

Zoxc commented May 15, 2023

cjgillot commented May 16, 2023

bors commented May 16, 2023

bors commented May 16, 2023

bors commented May 16, 2023

rust-timer commented May 16, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

pnkfelix commented May 23, 2023