Clean up derived obligation creation #96892

oli-obk · 2022-05-10T09:28:47Z

r? @estebank

working on fixing the perf regression from #91030 (comment)

oli-obk · 2022-05-10T09:28:57Z

@bors try @rust-timer queue

rust-timer · 2022-05-10T09:28:58Z

Awaiting bors try build completion.

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

bors · 2022-05-10T09:29:06Z

⌛ Trying commit 704bbe5 with merge 9701b7f9d6041dd29f744e96144781b84fde126f...

bors · 2022-05-10T11:19:36Z

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

rust-timer · 2022-05-10T11:19:37Z

Queued 9701b7f9d6041dd29f744e96144781b84fde126f with parent 2226f19, future comparison URL.

…c" trick

rust-timer · 2022-05-10T13:31:03Z

Finished benchmarking commit (9701b7f9d6041dd29f744e96144781b84fde126f): comparison url.

Summary:

Primary benchmarks: no relevant changes found
Secondary benchmarks: 🎉 relevant improvement found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	0	1	0
mean²	N/A	N/A	N/A	-0.2%	N/A
max	N/A	N/A	N/A	-0.2%	N/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

number of relevant changes ↩
the arithmetic mean of the percent change ↩

oli-obk · 2022-05-10T13:33:19Z

@bors try @rust-timer queue

rust-timer · 2022-05-10T13:33:20Z

Awaiting bors try build completion.

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

bors · 2022-05-10T13:33:27Z

⌛ Trying commit 824e9e4 with merge e3023fae71eed90e195f9053f28ad1605097ac56...

bors · 2022-05-10T15:03:14Z

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

ehuss · 2022-05-14T00:36:01Z

Sorry for the spam. This PR was causing bors to get stuck, but I think it should be cleared now.

oli-obk · 2022-05-16T13:35:02Z

Without optimizations this is actually a tiny improvement on the regressed benchmark, so any further regressions are due to LLVM randomness

@bors try @rust-timer queue

rust-timer · 2022-05-16T13:35:04Z

Awaiting bors try build completion.

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

bors · 2022-05-16T13:35:11Z

⌛ Trying commit 0cefa5f with merge e07108b10a51c3252d80b9ec8a6a6a1ae6fb54af...

bors · 2022-05-16T15:25:37Z

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

rust-timer · 2022-05-16T15:25:38Z

Queued e07108b10a51c3252d80b9ec8a6a6a1ae6fb54af with parent 56d540e, future comparison URL.

rust-timer · 2022-05-16T19:30:08Z

Finished benchmarking commit (e07108b10a51c3252d80b9ec8a6a6a1ae6fb54af): comparison url.

Summary:

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: 🎉 relevant improvement found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	3	1	3
mean²	N/A	N/A	-0.4%	-0.4%	-0.4%
max	N/A	N/A	-0.5%	-0.4%	-0.5%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

number of relevant changes ↩
the arithmetic mean of the percent change ↩

oli-obk · 2022-05-16T19:58:46Z

Oh yea, I won at inlining golf against LLVM

@rustbot ready

estebank · 2022-05-16T20:41:43Z

compiler/rustc_trait_selection/src/traits/wf.rs

@@ -339,17 +331,17 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
                })
                .filter(|(_, arg)| !arg.has_escaping_bound_vars())
                .map(|(i, arg)| {
-                    let mut new_cause = cause.clone();
+                    let mut cause = traits::ObligationCause::misc(self.span, self.body_id);


Out of curiosity, could we keep the original clause as part of a chain? I wonder if this would improve the output.

estebank · 2022-05-16T20:43:12Z

@bors r+

bors · 2022-05-16T20:43:13Z

📌 Commit 0cefa5f has been approved by estebank

bors · 2022-05-17T01:46:28Z

⌛ Testing commit 0cefa5f with merge c1d65ea...

bors · 2022-05-17T04:07:01Z

☀️ Test successful - checks-actions
Approved by: estebank
Pushing c1d65ea to master...

rust-timer · 2022-05-17T05:29:53Z

Finished benchmarking commit (c1d65ea): comparison url.

Summary:

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: 🎉 relevant improvement found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	3	1	3
mean²	N/A	N/A	-0.4%	-0.4%	-0.4%
max	N/A	N/A	-0.6%	-0.4%	-0.6%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

number of relevant changes ↩
the arithmetic mean of the percent change ↩

oli-obk added 4 commits May 10, 2022 07:50

Simplify derived obligation peeling

2ea2ced

Remove some unnecessary clones

312d27d

Don't lose an obligation cause

7e2e3d4

Move an extension trait method onto the type directly and reuse it

704bbe5

rust-highfive assigned estebank May 10, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 10, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 10, 2022

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

oli-obk added 6 commits May 10, 2022 10:26

Remove another use of clone_code

063795c

Remove another use of clone_code

dc21fcb

Remove clone_code method

05a62c5

Add a helper function for a common piece of code

5b5b549

Make the derived obligation cause parent private

9ba6ddb

Don't allocate misc obligation parents of derived obligations

1b51e1a

oli-obk added 2 commits May 10, 2022 11:26

Make FunctionArgumentObligation also use the "no allocation for mis…

213c174

…c" trick

Use InternedObligationCauseCode everywhere

824e9e4

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 10, 2022

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

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 May 14, 2022

Force inline InternedObligationCauseCode creation

0cefa5f

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

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. perf-regression Performance regression. labels May 16, 2022

oli-obk removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 16, 2022

estebank approved these changes May 16, 2022

View reviewed changes

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 May 16, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2022

bors merged commit c1d65ea into rust-lang:master May 17, 2022

rustbot added this to the 1.63.0 milestone May 17, 2022

bors mentioned this pull request May 17, 2022

Add a new linting pass for obligations #96092

Closed

oli-obk deleted the 🐌_obligation_cause_code_🐌 branch May 17, 2022 06:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up derived obligation creation #96892

Clean up derived obligation creation #96892

oli-obk commented May 10, 2022

oli-obk commented May 10, 2022

rust-timer commented May 10, 2022

bors commented May 10, 2022

bors commented May 10, 2022

rust-timer commented May 10, 2022

rust-timer commented May 10, 2022

oli-obk commented May 10, 2022

rust-timer commented May 10, 2022

bors commented May 10, 2022

bors commented May 10, 2022

ehuss commented May 14, 2022

oli-obk commented May 16, 2022

rust-timer commented May 16, 2022

bors commented May 16, 2022

bors commented May 16, 2022

rust-timer commented May 16, 2022

rust-timer commented May 16, 2022

oli-obk commented May 16, 2022

estebank May 16, 2022

estebank commented May 16, 2022

bors commented May 16, 2022

bors commented May 17, 2022

bors commented May 17, 2022

rust-timer commented May 17, 2022

Clean up derived obligation creation #96892

Clean up derived obligation creation #96892

Conversation

oli-obk commented May 10, 2022

oli-obk commented May 10, 2022

rust-timer commented May 10, 2022

bors commented May 10, 2022

bors commented May 10, 2022

rust-timer commented May 10, 2022

rust-timer commented May 10, 2022

Footnotes

oli-obk commented May 10, 2022

rust-timer commented May 10, 2022

bors commented May 10, 2022

bors commented May 10, 2022

ehuss commented May 14, 2022

oli-obk commented May 16, 2022

rust-timer commented May 16, 2022

bors commented May 16, 2022

bors commented May 16, 2022

rust-timer commented May 16, 2022

rust-timer commented May 16, 2022

Footnotes

oli-obk commented May 16, 2022

estebank May 16, 2022

Choose a reason for hiding this comment

estebank commented May 16, 2022

bors commented May 16, 2022

bors commented May 17, 2022

bors commented May 17, 2022

rust-timer commented May 17, 2022

Footnotes