Remove allow(rustc::potential_query_instability) in rustc_trait_selection #103723

CastilloDel · 2022-10-29T11:42:45Z

Related to #84447

This PR needs to be benchmarked to check for regressions.

rustbot · 2022-10-29T11:42:52Z

r? @fee1-dead

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

compiler/rustc_trait_selection/src/traits/select/mod.rs

fee1-dead · 2022-10-29T12:14:26Z

@bors try @rust-timer queue

rust-timer · 2022-10-29T12:14:27Z

Awaiting bors try build completion.

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

bors · 2022-10-29T12:14:34Z

⌛ Trying commit c16a32665a417595b1a1fca4121fed423964a27f with merge 752ad3e20a11e4a43bb87b73b85ebb28b2b321c4...

fee1-dead · 2022-10-29T17:02:26Z

@rust-timer build 752ad3e20a11e4a43bb87b73b85ebb28b2b321c4

rust-timer · 2022-10-29T17:02:28Z

Queued 752ad3e20a11e4a43bb87b73b85ebb28b2b321c4 with parent 33b530e, future comparison URL.

rust-timer · 2022-10-29T18:38:55Z

Finished benchmarking commit (752ad3e20a11e4a43bb87b73b85ebb28b2b321c4): 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.7%	[0.6%, 0.7%]	2
Regressions ❌ (secondary)	1.0%	[0.2%, 1.6%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.6%, 0.7%]	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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.2%, -3.2%]	3
All ❌✅ (primary)	-	-	0

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

CastilloDel · 2022-10-29T18:44:33Z

I guess that's not good enough. Not really sure how it can be improved though

fee1-dead · 2022-10-30T05:57:06Z

I am not very good at interpreting perf results so I don't know how to improve this further. Rerolling

r? compiler

CastilloDel · 2022-10-31T11:50:41Z

I think it could be better now

Edit: No, it wasn't. I'm out of ideas. The drain_filter method in indexmap might help, but it will probably take a while if it happens.

bors · 2022-11-05T04:54:44Z

☔ The latest upstream changes (presumably #103991) made this pull request unmergeable. Please resolve the merge conflicts.

jackh726 · 2022-11-07T02:37:49Z

compiler/rustc_trait_selection/src/traits/select/mod.rs

@@ -2626,11 +2627,13 @@ impl<'tcx> ProvisionalEvaluationCache<'tcx> {
 fn on_completion(&self, dfn: usize) {
 debug!(?dfn, "on_completion");

+ // If IndexMap gets the `drain_filter` method this could be done in one iteration


Can we try a perf run with all the other changes except for this?

Yes! I changed the branch.

jackh726 · 2022-11-07T19:19:35Z

FWIW, I find it easier to just add a commit when doing perf comparisons (so it's easier to see exact changes)

@bors try @rust-timer queue

bors · 2022-11-07T19:19:44Z

⌛ Trying commit 48a76e3fa554064df86f2a2fc039f08d0e2ebc29 with merge df3b01ab5b018aef79cd5650f36b7024e7527092...

bors · 2022-11-07T21:46:38Z

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

rust-timer · 2022-11-07T23:57:38Z

Finished benchmarking commit (df3b01ab5b018aef79cd5650f36b7024e7527092): 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-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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.7%, -0.3%]	4
Improvements ✅ (secondary)	-1.0%	[-1.6%, -0.3%]	15
All ❌✅ (primary)	-0.5%	[-0.7%, -0.3%]	4

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.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	5.8%	[5.8%, 5.8%]	1
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-2.6%	[-2.6%, -2.6%]	1
All ❌✅ (primary)	0.3%	[-0.5%, 1.1%]	2

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

jackh726 · 2022-11-08T15:11:47Z

Okay, so. Maybe we land this set of changes first. And then land a followup for the bit that regresses perf?

CastilloDel · 2022-11-08T15:28:04Z

FWIW, I find it easier to just add a commit when doing perf comparisons (so it's easier to see exact changes)

Yes, that seems easier. I also realized that I initially had a separate commit for those changes. The next time I will probably wait for the approval before squashing.

Okay, so. Maybe we land this set of changes first. And then land a followup for the bit that regresses perf?

Okay. I guess I need to change the commit description. Do I mark the parts that will change with the followup in some special way or do I leave the FIXMEs as they are now?

jackh726 · 2022-11-08T15:43:33Z

I think I move the allow to the top of the file with a single FIXME explaining perf effect and need to drain_filter on IndexMap

CastilloDel · 2022-11-08T16:11:38Z

Okay, I changed that and rebased the branch!

compiler/rustc_trait_selection/src/traits/select/mod.rs

…c_trait_selection Make InferCtxtExt use a FxIndexMap This should be faster, because the map is only being used to iterate, which is supposed to be faster with the IndexMap Make the user_computed_preds use an IndexMap It is being used mostly for iteration, so the change shouldn't result in a perf hit Make the RegionDeps fields use an IndexMap This change could be a perf hit. Both `larger` and `smaller` are used for iteration, but they are also used for insertions. Make types_without_default_bounds use an IndexMap It uses extend, but it also iterates and removes items. Not sure if this will be a perf hit. Make InferTtxt.reported_trait_errors use an IndexMap This change brought a lot of other changes. The map seems to have been mostly used for iteration, so the performance shouldn't suffer. Add FIXME to change ProvisionalEvaluationCache.map to use an IndexMap Right now this results in a perf hit. IndexMap doesn't have the `drain_filter` API, so in `on_completion` we now need to iterate two times over the map.

jackh726 · 2022-11-09T00:01:56Z

Thanks!

@bors r+

bors · 2022-11-09T00:01:58Z

📌 Commit 755ca4b has been approved by jackh726

It is now in the queue for this repository.

bors · 2022-11-09T13:45:30Z

⌛ Testing commit 755ca4b with merge cc9b259...

bors · 2022-11-09T16:53:55Z

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing cc9b259 to master...

rust-timer · 2022-11-09T19:19:49Z

Finished benchmarking commit (cc9b259): 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.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-0.8%	[-1.0%, -0.5%]	7
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	1

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.0%	[3.0%, 3.0%]	1
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-3.0%	[-3.3%, -2.8%]	2
All ❌✅ (primary)	-2.4%	[-2.4%, -2.4%]	1

Cycles

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

rustbot assigned fee1-dead Oct 29, 2022

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. labels Oct 29, 2022

fee1-dead reviewed Oct 29, 2022

View reviewed changes

compiler/rustc_trait_selection/src/traits/select/mod.rs Outdated Show resolved Hide resolved

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 29, 2022

CastilloDel force-pushed the master branch from c16a326 to 65a0b6b Compare October 29, 2022 12:30

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Oct 29, 2022

rustbot assigned jackh726 and unassigned fee1-dead Oct 30, 2022

CastilloDel force-pushed the master branch from 65a0b6b to b66d621 Compare October 31, 2022 11:47

This comment has been minimized.

Sign in to view

CastilloDel force-pushed the master branch from b66d621 to 0e36ce6 Compare October 31, 2022 12:08

CastilloDel force-pushed the master branch from 0e36ce6 to 862b641 Compare November 5, 2022 12:49

jackh726 reviewed Nov 7, 2022

View reviewed changes

CastilloDel force-pushed the master branch from 862b641 to 48a76e3 Compare November 7, 2022 10:24

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 Nov 7, 2022

CastilloDel force-pushed the master branch 2 times, most recently from 94a8179 to a706d93 Compare November 8, 2022 16:11

jackh726 reviewed Nov 8, 2022

View reviewed changes

compiler/rustc_trait_selection/src/traits/select/mod.rs Outdated Show resolved Hide resolved

CastilloDel force-pushed the master branch from a706d93 to c48fe20 Compare November 8, 2022 18:41

CastilloDel force-pushed the master branch from c48fe20 to 755ca4b Compare November 8, 2022 18:42

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 9, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 9, 2022

bors merged commit cc9b259 into rust-lang:master Nov 9, 2022

rustbot added this to the 1.67.0 milestone Nov 9, 2022

This was referenced Nov 9, 2022

use LocalDefId instead of HirId in trait resolution to simplify the obligation clause resolution #103902

Merged

Add initial libstd support for Xous #104101

Merged

CastilloDel mentioned this pull request Nov 9, 2022

Remove allow(rustc::potential_query_instability) in rustc_trait_selection #104212

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove allow(rustc::potential_query_instability) in rustc_trait_selection #103723

Remove allow(rustc::potential_query_instability) in rustc_trait_selection #103723

CastilloDel commented Oct 29, 2022

rustbot commented Oct 29, 2022

fee1-dead commented Oct 29, 2022

rust-timer commented Oct 29, 2022

bors commented Oct 29, 2022

fee1-dead commented Oct 29, 2022

rust-timer commented Oct 29, 2022

rust-timer commented Oct 29, 2022

CastilloDel commented Oct 29, 2022

fee1-dead commented Oct 30, 2022

CastilloDel commented Oct 31, 2022 •

edited

Loading

This comment has been minimized.

bors commented Nov 5, 2022

jackh726 Nov 7, 2022

CastilloDel Nov 7, 2022

jackh726 commented Nov 7, 2022

This comment has been minimized.

bors commented Nov 7, 2022

bors commented Nov 7, 2022

This comment has been minimized.

rust-timer commented Nov 7, 2022

jackh726 commented Nov 8, 2022

CastilloDel commented Nov 8, 2022

jackh726 commented Nov 8, 2022

CastilloDel commented Nov 8, 2022

jackh726 commented Nov 9, 2022

bors commented Nov 9, 2022

bors commented Nov 9, 2022

bors commented Nov 9, 2022

rust-timer commented Nov 9, 2022

Remove allow(rustc::potential_query_instability) in rustc_trait_selection #103723

Remove allow(rustc::potential_query_instability) in rustc_trait_selection #103723

Conversation

CastilloDel commented Oct 29, 2022

rustbot commented Oct 29, 2022

fee1-dead commented Oct 29, 2022

rust-timer commented Oct 29, 2022

bors commented Oct 29, 2022

fee1-dead commented Oct 29, 2022

rust-timer commented Oct 29, 2022

rust-timer commented Oct 29, 2022

Overall result: ❌ regressions - ACTION NEEDED

CastilloDel commented Oct 29, 2022

fee1-dead commented Oct 30, 2022

CastilloDel commented Oct 31, 2022 • edited Loading

This comment has been minimized.

bors commented Nov 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jackh726 commented Nov 7, 2022

This comment has been minimized.

bors commented Nov 7, 2022

bors commented Nov 7, 2022

This comment has been minimized.

rust-timer commented Nov 7, 2022

Overall result: ✅ improvements - no action needed

jackh726 commented Nov 8, 2022

CastilloDel commented Nov 8, 2022

jackh726 commented Nov 8, 2022

CastilloDel commented Nov 8, 2022

jackh726 commented Nov 9, 2022

bors commented Nov 9, 2022

bors commented Nov 9, 2022

bors commented Nov 9, 2022

rust-timer commented Nov 9, 2022

Overall result: ✅ improvements - no action needed

CastilloDel commented Oct 31, 2022 •

edited

Loading