Skip to content

Optimize const value interning for ZST types - #78061

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:opt_zst_const_interning
Oct 20, 2020
Merged

Optimize const value interning for ZST types#78061
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:opt_zst_const_interning

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Oct 17, 2020

Copy link
Copy Markdown
Member

Interning can skip any inhabited ZST type in general.

Fixes#68010

r? @oli-obk

@wesleywiser
Optimize const value interning for ZST types
1d07d69
Interning can skip any inhabited ZST type in general.
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2020
@wesleywiserwesleywiser added the I-compiletime Issue: Problems and improvements with respect to compile times. label Oct 17, 2020
@wesleywiser

wesleywiser commented Oct 17, 2020

Copy link
Copy Markdown
MemberAuthor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Oct 17, 2020

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Oct 17, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 1d07d69 with merge 25cf147f8ee183a6b207e49e0339d8189e8e9280...

@bors

bors commented Oct 17, 2020

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions, checks-azure
Build commit: 25cf147f8ee183a6b207e49e0339d8189e8e9280 (25cf147f8ee183a6b207e49e0339d8189e8e9280)

@rust-timer

rust-timer commented Oct 17, 2020

Copy link
Copy Markdown
Collaborator

Queued 25cf147f8ee183a6b207e49e0339d8189e8e9280 with parent ffeeb20, future comparison URL.

@rust-timer

rust-timer commented Oct 18, 2020

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit (25cf147f8ee183a6b207e49e0339d8189e8e9280): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

@oli-obk

oli-obk commented Oct 20, 2020

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 1d07d69 has been approved by oli-obk

@borsbors 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 Oct 20, 2020
oli-obk
oli-obk reviewed Oct 20, 2020
View reviewed changes
Comment threadsrc/test/ui/issues/issue-68010-large-zst-consts.rs
@oli-obk

oli-obk commented Oct 20, 2020

Copy link
Copy Markdown
Contributor

Can you check whether this also fixes #77062?

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Oct 20, 2020
@GuillaumeGomez
Rollup merge ofrust-lang#78061- wesleywiser:opt_zst_const_interning…
765b00e
…, r=oli-obk
Optimize const value interning for ZST types
Interning can skip any inhabited ZST type in general.
Fixesrust-lang#68010
r? @oli-obk
This was referenced Oct 20, 2020
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
@bors
Auto merge ofrust-lang#78162- GuillaumeGomez:rollup-6a4qiqu, r=Guil…
31530e5
…laumeGomez
Rollup of 9 pull requests
Successful merges:
- rust-lang#78046 (Add codegen test for issue rust-lang#73827)
- rust-lang#78061 (Optimize const value interning for ZST types)
- rust-lang#78070 (we can test std and core panic macros together)
- rust-lang#78076 (Move orphan module-name/mod.rs files into module-name.rs files)
- rust-lang#78129 (Wrapping intrinsics doc links update.)
- rust-lang#78133 (Add some MIR-related regression tests)
- rust-lang#78144 (Don't update `entries` in `TypedArena` if T does not need drop)
- rust-lang#78145 (Drop unneeded `mut`)
- rust-lang#78157 (Remove unused type from librustdoc)
Failed merges:
r? `@ghost`
@bors
bors merged commit 3fea201 into rust-lang:masterOct 20, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 20, 2020
@wesleywiser

wesleywiser commented Oct 21, 2020

Copy link
Copy Markdown
MemberAuthor

Good call! That's fixed too. I'll open another PR with the test case added.

@wesleywiserwesleywiser mentioned this pull request Oct 21, 2020
Closed
RalfJung
RalfJung reviewed Oct 21, 2020
View reviewed changes
Comment threadcompiler/rustc_mir/src/interpret/intern.rs
}
}

// ZSTs do not need validation unless they're uninhabited

@RalfJungRalfJungOct 21, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not validation, this is interning, so I find the comment here rather confusing.

@RalfJungRalfJungOct 21, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think actually we can skip even uninhabited ZST, precisely because this is not validation but just looking for pointers: #78179.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@oli-obkoli-obkoli-obk left review comments

Assignees

@oli-obkoli-obk

Labels

I-compiletimeIssue: Problems and improvements with respect to compile times.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

Large ZST arrays take a looong time to compile

7 participants

@wesleywiser@rust-timer@bors@oli-obk@RalfJung@rust-highfive@rustbot