Replace some instances of FxHashMap/FxHashSet with stable alternatives (mostly in rustc_hir and rustc_ast_lowering) by michaelwoerister · Pull Request #119093 · rust-lang/rust

michaelwoerister · 2023-12-18T20:07:51Z

Part of rust-lang/compiler-team#533. We should be getting close to being able to remove the HashStable impl of HashMap.

…s (mostly in rustc_hir and rustc_ast_lowering) Part of rust-lang/compiler-team#533

rustbot · 2023-12-18T20:07:59Z

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

petrochenkov · 2023-12-18T23:27:26Z

There are some maps here that may be performance critical.
@bors try @rust-timer queue

petrochenkov · 2023-12-18T23:28:05Z

r=me if the perf run doesn't show regressions.

bors · 2023-12-18T23:28:36Z

⌛ Trying commit 115885b with merge 91fa6d2...

Replace some instances of FxHashMap/FxHashSet with stable alternatives (mostly in rustc_hir and rustc_ast_lowering) Part of rust-lang/compiler-team#533. We should be getting close to being able to remove the HashStable impl of HashMap.

bors · 2023-12-19T00:54:19Z

☀️ Try build successful - checks-actions
Build commit: 91fa6d2 (91fa6d2b8ab99cfd2b8a0fa8bad8411b21bbcd62)

rust-timer · 2023-12-19T07:58:32Z

Finished benchmarking commit (91fa6d2): comparison URL.

Overall result: no relevant changes - no action needed

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-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	4.2%	[4.2%, 4.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.8%, -0.5%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.0%	[-0.8%, 4.2%]	3

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.9%, -0.5%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.9%, 0.7%]	4

Binary size

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

Bootstrap: 673.523s -> 671.262s (-0.34%)
Artifact size: 312.51 MiB -> 312.45 MiB (-0.02%)

michaelwoerister · 2023-12-19T08:15:44Z

r=me if the perf run doesn't show regressions.

Perf run looks good. Thanks for the review, @petrochenkov!

@bors r=petrochenkov

bors · 2023-12-19T08:15:46Z

📌 Commit 115885b has been approved by petrochenkov

It is now in the queue for this repository.

bors · 2023-12-19T08:46:05Z

⌛ Testing commit 115885b with merge 32f5db9...

bors · 2023-12-19T10:44:02Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 32f5db9 to master...

rust-timer · 2023-12-19T12:05:03Z

Finished benchmarking commit (32f5db9): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.4%	[2.4%, 2.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.9%	[-0.9%, -0.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[-0.9%, 2.4%]	2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	9.2%	[8.1%, 10.5%]	3
Regressions ❌ (secondary)	1.9%	[1.9%, 1.9%]	1
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	6.8%	[-0.5%, 10.5%]	4

Binary size

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

Bootstrap: 671.446s -> 672.427s (0.15%)
Artifact size: 312.47 MiB -> 312.51 MiB (0.01%)

lqd · 2023-12-19T12:49:42Z

The cycles regressions have got to be noise?!

previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093

…r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang#159677 Discussed on zulip: [#t-compiler/help > rust-lang#159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

Rollup merge of #159718 - jprochazk:doc-link-res-index-map, r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in #119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes #159677 Discussed on zulip: [#t-compiler/help > #159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

…enkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang/rust#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang/rust#159677 Discussed on zulip: [#t-compiler/help > #159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

Replace some instances of FxHashMap/FxHashSet with stable alternative…

115885b

…s (mostly in rustc_hir and rustc_ast_lowering) Part of rust-lang/compiler-team#533

rustbot assigned petrochenkov Dec 18, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 18, 2023

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 18, 2023

petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 18, 2023

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 19, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 19, 2023

bors merged commit 32f5db9 into rust-lang:master Dec 19, 2023

rustbot added this to the 1.76.0 milestone Dec 19, 2023

jprochazk added a commit to jprochazk/rust that referenced this pull request Jul 22, 2026

make DocLinkResMap an FxIndexMap

4ded788

previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093

jprochazk mentioned this pull request Jul 22, 2026

Make DocLinkResMap an FxIndexMap #159718

Merged

Uh oh!

Uh oh!

Conversation

michaelwoerister commented Dec 18, 2023

Uh oh!

rustbot commented Dec 18, 2023

Uh oh!

petrochenkov commented Dec 18, 2023

Uh oh!

This comment has been minimized.

petrochenkov commented Dec 18, 2023

Uh oh!

bors commented Dec 18, 2023

Uh oh!

bors commented Dec 19, 2023

Uh oh!

This comment has been minimized.

rust-timer commented Dec 19, 2023

Overall result: no relevant changes - no action needed

Uh oh!

michaelwoerister commented Dec 19, 2023

Uh oh!

bors commented Dec 19, 2023

Uh oh!

bors commented Dec 19, 2023

Uh oh!

bors commented Dec 19, 2023

Uh oh!

rust-timer commented Dec 19, 2023

Overall result: no relevant changes - no action needed

Uh oh!

lqd commented Dec 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants