Skip to content

Introduce Symbol::with_interner. #144287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Introduce Symbol::with_interner. #144287

wants to merge 1 commit into from
+111 −67

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Jul 22, 2025 •
edited
Loading

It lets you get the contents of multiple symbols with a single TLS lookup and interner lock, instead of one per symbol.

r? @petrochenkov

@nnethercote
Introduce Symbol::with_interner.
8a5bcdd 
It lets you get the contents of multiple symbols with a single TLS
lookup and interner lock, instead of one per symbol.
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jul 22, 2025
tjallingt
tjallingt reviewed Jul 22, 2025
View reviewed changes
@nnethercote
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 22, 2025
bors added a commit that referenced this pull request Jul 22, 2025
@bors
Auto merge of #144287 - nnethercote:Symbol-with_interner, r=<try>
1a8eaa8 
Introduce `Symbol::with_interner`.

It lets you get the contents of multiple symbols with a single TLS lookup and interner lock, instead of one per symbol.

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Jul 22, 2025

⌛ Trying commit 8a5bcdd with merge 1a8eaa8...

@bors
Copy link
Collaborator

bors commented Jul 22, 2025

☀️ Try build successful - checks-actions
Build commit: 1a8eaa8 (1a8eaa852507b134fcd0557547b35308273b4b74)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1a8eaa8): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

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

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.4% [-0.5%, -0.2%] 4
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.4% [-0.5%, -0.2%] 4

Max RSS (memory usage)

Results (secondary -2.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary -2.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.9%, -2.2%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.5% [-2.9%, -2.2%] 2

Binary size

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

Bootstrap: 465.536s -> 463.932s (-0.34%)
Artifact size: 374.60 MiB -> 374.62 MiB (0.01%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 22, 2025
@nnethercote nnethercote marked this pull request as ready for review July 25, 2025 12:46
@rustbot rustbot 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 Jul 25, 2025
petrochenkov
petrochenkov reviewed Jul 25, 2025
View reviewed changes
compiler/rustc_ast/src/ast.rs
s.push_str(sym.as_str());
}
s
Symbol::with_interner(|interner| {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: the interner is locked for slightly longer than necessary.

compiler/rustc_resolve/src/rustdoc.rs
let whitespace =
line.chars().take_while(|c| *c == ' ' || *c == '\t').count();
whitespace
+ (if fragment.kind == DocFragmentKind::SugaredDoc {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: the formatting is bad, could you move the if expression to a local variable or something like that?

src/librustdoc/html/render/print_item.rs
i2: &clean::Item,
interner: &InternerInner,
tcx: TyCtxt<'_>,
) -> Ordering {
Copy link
Contributor

Choose a reason for hiding this comment

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

Again, the interner is locked for very long time.
I'm actually surprised that something like i1.stability(tcx) inside doesn't try to lock the interner again.

@petrochenkov
Copy link
Contributor

This does bring a few small speedups to rustdoc, but I'm not sure it justifies exposing all this private machinery.

@petrochenkov petrochenkov 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 Jul 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tjallingt tjallingt tjallingt left review comments

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @rust-timer @bors @petrochenkov @tjallingt @rustbot