rustdoc: Reduce clean::Type size by GuillaumeGomez · Pull Request #93963 · rust-lang/rust

GuillaumeGomez · 2022-02-13T13:56:06Z

There is no need to keep the DefId around since it's allow used to compute if we should show a cast or not. As such, we can simply directly store the boolean.

I think it's not what you had in mind @camelid but I guess it's still an improvement? 😉

It was discussed in #93941.

r? @camelid

rust-highfive · 2022-02-13T13:56:08Z

Some changes occurred in clean/types.rs.

cc @camelid

GuillaumeGomez · 2022-02-13T13:56:42Z

Let's check perf results:

@bors try @rust-timer queue

rust-timer · 2022-02-13T13:56:44Z

Awaiting bors try build completion.

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

bors · 2022-02-13T13:56:50Z

⌛ Trying commit 39bfc5aa215b429e93a6427fe9181b405a984c4c with merge f411aa6adf39ffb096ce20832581c5b35b0da171...

bors · 2022-02-13T15:26:26Z

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

rust-timer · 2022-02-13T15:26:27Z

Queued f411aa6adf39ffb096ce20832581c5b35b0da171 with parent c26fbf8, future comparison URL.

rust-timer · 2022-02-13T19:06:02Z

Finished benchmarking commit (f411aa6adf39ffb096ce20832581c5b35b0da171): comparison url.

Summary: This benchmark run did not return any relevant results.

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 led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

GuillaumeGomez · 2022-02-13T19:28:37Z

Almost no changes on perf and small improvement on max rss. I'm a bit disappointed... :'(

camelid · 2022-02-15T01:02:43Z

Even if there's not an immediate perf effect, getting rid of that field altogether is a good cleanup.

GuillaumeGomez · 2022-04-12T13:07:08Z

Updated!

GuillaumeGomez · 2022-04-26T14:42:08Z

@camelid I was able to do it by passing down the current (aka "real") DefId directly to where it's computed. It has two changes but the diff is huge because of the indent change. Does it look better to you?

GuillaumeGomez · 2022-04-26T15:04:23Z

And of course I forgot to run fmt...

bors · 2022-05-02T16:47:17Z

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

GuillaumeGomez · 2022-05-03T14:56:46Z

Fixed merge conflict.

bors · 2022-05-15T02:39:04Z

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

…display) with a boolean

GuillaumeGomez · 2022-05-15T11:58:33Z

Fixed the conflict.

camelid · 2022-05-20T04:54:51Z

Sorry, I don't think I understand this code well enough to do a proper review.

r? rust-lang/rustdoc

notriddle · 2022-05-21T05:06:33Z

This looks fine to me. It's moving a computation to happen earlier, so it stores a boolean instead of a DefId.

GitHub Tip: This change isn't actually very big. Use https://github.com/rust-lang/rust/pull/93963/files?w=1 to ignore most of the indentation changes.

@bors r+

bors · 2022-05-21T05:06:35Z

📌 Commit 2e1369c has been approved by notriddle

bors · 2022-05-21T09:04:08Z

⌛ Testing commit 2e1369c with merge 5f33adc...

bors · 2022-05-21T11:28:42Z

☀️ Test successful - checks-actions
Approved by: notriddle
Pushing 5f33adc to master...

rust-timer · 2022-05-21T14:37:37Z

Finished benchmarking commit (5f33adc): comparison url.

Instruction count

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

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

Max RSS (memory usage)

Results

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

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	1	13	17	13
mean²	N/A	1.1%	-1.5%	-1.5%	-1.5%
max	N/A	1.1%	-3.1%	-2.9%	-3.1%

Cycles

Results

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	1	3	1	1	2
mean²	2.6%	2.1%	-2.0%	-4.8%	0.3%
max	2.6%	2.4%	-2.0%	-4.8%	2.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 ↩ ↩² ↩³

rust-highfive assigned camelid Feb 13, 2022

rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Feb 13, 2022

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

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

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

camelid reviewed Feb 15, 2022

View reviewed changes

Comment thread src/librustdoc/clean/types.rs Outdated

camelid 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 15, 2022

JohnCSimon 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 20, 2022

GuillaumeGomez force-pushed the reduce-clean-type-size branch from 39bfc5a to e4c4ffa Compare April 12, 2022 13:06

GuillaumeGomez 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 Apr 12, 2022

camelid requested changes Apr 25, 2022

View reviewed changes

Comment thread src/librustdoc/clean/mod.rs Outdated

camelid 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 Apr 25, 2022

GuillaumeGomez force-pushed the reduce-clean-type-size branch from e4c4ffa to a2e35fa Compare April 26, 2022 14:41

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the reduce-clean-type-size branch from a2e35fa to e38d16a Compare April 26, 2022 15:04

GuillaumeGomez force-pushed the reduce-clean-type-size branch from e38d16a to aab986b Compare May 3, 2022 14:56

GuillaumeGomez added 2 commits May 15, 2022 13:38

Reduce clean::Type size by replacing a DefId (only used to check for …

4054c0f

…display) with a boolean

Prevent to recompute should_show_cast by passing down self_def_id

2e1369c

GuillaumeGomez force-pushed the reduce-clean-type-size branch from aab986b to 2e1369c Compare May 15, 2022 11:58

rust-highfive assigned notriddle and unassigned camelid May 20, 2022

camelid 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 May 20, 2022

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

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

bors merged commit 5f33adc into rust-lang:master May 21, 2022

rustbot added this to the 1.63.0 milestone May 21, 2022

GuillaumeGomez deleted the reduce-clean-type-size branch May 21, 2022 11:33

bors mentioned this pull request May 21, 2022

Use niche-filling optimization even when multiple variants have data. #94075

Merged

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Feb 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Feb 13, 2022

Uh oh!

GuillaumeGomez commented Feb 13, 2022

Uh oh!

rust-timer commented Feb 13, 2022

Uh oh!

bors commented Feb 13, 2022

Uh oh!

bors commented Feb 13, 2022

Uh oh!

rust-timer commented Feb 13, 2022

Uh oh!

rust-timer commented Feb 13, 2022

Uh oh!

GuillaumeGomez commented Feb 13, 2022

Uh oh!

Uh oh!

camelid commented Feb 15, 2022

Uh oh!

GuillaumeGomez commented Apr 12, 2022

Uh oh!

Uh oh!

GuillaumeGomez commented Apr 26, 2022

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Apr 26, 2022

Uh oh!

bors commented May 2, 2022

Uh oh!

GuillaumeGomez commented May 3, 2022

Uh oh!

bors commented May 15, 2022

Uh oh!

GuillaumeGomez commented May 15, 2022

Uh oh!

camelid commented May 20, 2022

Uh oh!

notriddle commented May 21, 2022

Uh oh!

bors commented May 21, 2022

Uh oh!

bors commented May 21, 2022

Uh oh!

bors commented May 21, 2022

Uh oh!

rust-timer commented May 21, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

GuillaumeGomez commented Feb 13, 2022 •

edited

Loading