Improve `AdtDef` interning.#94733

nnethercote · 2022-03-08T09:06:55Z

This commit makes AdtDef use Interned. Much of the commit is tedious
changes to introduce getter functions. The interesting changes are in
compiler/rustc_middle/src/ty/adt.rs.

r? @fee1-dead

rust-highfive · 2022-03-08T09:06:58Z

Some changes occured to rustc_codegen_gcc

cc @antoyo

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

fee1-dead · 2022-03-08T10:38:59Z

Since AdtDef already uses its DefId as a hash I don't think there is going to be any performance impact here, but it is nice to be safe.

@bors try @rust-timer queue

rust-timer · 2022-03-08T10:39:01Z

Awaiting bors try build completion.

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

bors · 2022-03-08T10:39:09Z

⌛ Trying commit 535c26fa26876bf6305d840b65b83a780b8d9128 with merge 97e4e12bccb6d65473261eb5813514d27e23a42f...

bors · 2022-03-08T12:08:06Z

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

rust-timer · 2022-03-08T12:08:08Z

Queued 97e4e12bccb6d65473261eb5813514d27e23a42f with parent d2710db, future comparison URL.

camsteffen · 2022-03-08T12:51:34Z

These interning changes are neat.

rust-timer · 2022-03-08T15:24:28Z

Finished benchmarking commit (97e4e12bccb6d65473261eb5813514d27e23a42f): comparison url.

Summary: This benchmark run shows 17 relevant improvements 🎉 to instruction counts.

Arithmetic mean of relevant improvements: -0.5%
Largest improvement in instruction counts: -0.7% on full builds of wg-grammar check

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

nnethercote · 2022-03-11T01:42:58Z

I have fixed the conflicts. I also introduced AdtDef::variant() and rewrote a bunch of def.variants()[n] expressions as def.variant(n).

This commit makes `AdtDef` use `Interned`. Much the commit is tedious changes to introduce getter functions. The interesting changes are in `compiler/rustc_middle/src/ty/adt.rs`.

fee1-dead

LGTM, Thanks!

fee1-dead · 2022-03-11T08:09:02Z

@bors r+

bors · 2022-03-11T08:09:04Z

📌 Commit ca5525d has been approved by fee1-dead

bors · 2022-03-12T00:11:13Z

⌛ Testing commit ca5525d with merge b0b618a6a8003ad7d8f573e7f20bfa790fc079b6...

bors · 2022-03-12T01:15:57Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-03-12T01:16:19Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

fee1-dead · 2022-03-12T02:41:22Z

@bors retry apple builder vanished

bors · 2022-03-12T07:02:14Z

⌛ Testing commit ca5525d with merge 012720f...

bors · 2022-03-12T09:30:00Z

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 012720f to master...

rust-highfive · 2022-03-12T09:30:21Z

📣 Toolstate changed by #94733!

Tested on commit 012720f.
Direct link to PR: #94733

💔 miri on windows: test-fail → build-fail (cc @eddyb @RalfJung @oli-obk).
💔 miri on linux: test-fail → build-fail (cc @eddyb @RalfJung @oli-obk).

@eddyb

Tested on commit rust-lang/rust@012720f. Direct link to PR: <rust-lang/rust#94733> 💔 miri on windows: test-fail → build-fail (cc @eddyb @RalfJung @oli-obk). 💔 miri on linux: test-fail → build-fail (cc @eddyb @RalfJung @oli-obk).

rust-timer · 2022-03-12T10:59:59Z

Finished benchmarking commit (012720f): comparison url.

Summary: This benchmark run shows 30 relevant improvements 🎉 to instruction counts.

Arithmetic mean of relevant improvements: -0.5%
Largest improvement in instruction counts: -1.2% on full builds of match-stress-enum doc

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

@rustbot label: -perf-regression

rust-highfive assigned fee1-dead Mar 8, 2022

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 8, 2022

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

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

petrochenkov reviewed Mar 8, 2022

View reviewed changes

Comment thread compiler/rustc_middle/src/ty/adt.rs Outdated

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

nnethercote force-pushed the fix-AdtDef-interning branch 2 times, most recently from a8bddb7 to c0ca82f Compare March 11, 2022 01:41

This comment has been minimized.

Sign in to view

Improve AdtDef interning.

ca5525d

This commit makes `AdtDef` use `Interned`. Much the commit is tedious changes to introduce getter functions. The interesting changes are in `compiler/rustc_middle/src/ty/adt.rs`.

nnethercote force-pushed the fix-AdtDef-interning branch from c0ca82f to ca5525d Compare March 11, 2022 02:31

fee1-dead approved these changes Mar 11, 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 Mar 11, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 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 Mar 12, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2022

bors merged commit 012720f into rust-lang:master Mar 12, 2022

rustbot added this to the 1.61.0 milestone Mar 12, 2022

This was referenced Mar 12, 2022

rustdoc: Remove fields_stripped fields (and equivalents) #94053

Merged

Fix stack overflows when compiling high-recursion_limit programs #93056

Closed

Resolve documentation links in rustc and store the results in metadata #94857

Merged

nnethercote deleted the fix-AdtDef-interning branch March 12, 2022 21:49

dario23 added a commit to dario23/rust-semverver that referenced this pull request May 4, 2022

Rustup to rust-lang/rust#94733

2fa5f2a

dario23 added a commit to dario23/rust-semverver that referenced this pull request May 6, 2022

Rustup to rust-lang/rust#94733

8ef45e8

trevyn mentioned this pull request Jul 13, 2024

Fix is_diagnostic_item() example rust-lang/rustc-dev-guide#2013

Merged

Uh oh!

Conversation

nnethercote commented Mar 8, 2022

Uh oh!

rust-highfive commented Mar 8, 2022

Uh oh!

fee1-dead commented Mar 8, 2022

Uh oh!

rust-timer commented Mar 8, 2022

Uh oh!

bors commented Mar 8, 2022

Uh oh!

bors commented Mar 8, 2022

Uh oh!

rust-timer commented Mar 8, 2022

Uh oh!

camsteffen commented Mar 8, 2022

Uh oh!

Uh oh!

rust-timer commented Mar 8, 2022

Uh oh!

nnethercote commented Mar 11, 2022

Uh oh!

This comment has been minimized.

fee1-dead left a comment

Choose a reason for hiding this comment

Uh oh!

fee1-dead commented Mar 11, 2022

Uh oh!

bors commented Mar 11, 2022

Uh oh!

bors commented Mar 12, 2022

Uh oh!

bors commented Mar 12, 2022

Uh oh!

rust-log-analyzer commented Mar 12, 2022

Uh oh!

fee1-dead commented Mar 12, 2022

Uh oh!

bors commented Mar 12, 2022

Uh oh!

bors commented Mar 12, 2022

Uh oh!

rust-highfive commented Mar 12, 2022

Uh oh!

rust-timer commented Mar 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants