Skip to content
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

Upgrade indexmap and thorin-dwp to use hashbrown 0.12 #99251

Merged
merged 2 commits into from
Jul 24, 2022
Merged

Upgrade indexmap and thorin-dwp to use hashbrown 0.12 #99251

merged 2 commits into from
Jul 24, 2022

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jul 14, 2022 •
edited
Loading

This removes the last dependencies on hashbrown 0.11.

This also upgrades to hashbrown 0.12.3 to fix a double-free (#99372).

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 14, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jul 14, 2022

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2022
@cuviper cuviper mentioned this pull request Jul 14, 2022
Merged
@lqd
Copy link
Member

lqd commented Jul 15, 2022

just the usual sanity check:

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 15, 2022
@bors
Copy link
Contributor

bors commented Jul 15, 2022

⌛ Trying commit 8dece5c37a154df71fc5ddbe971d975f9b70e610 with merge 1d7eef78297735725da8f0383f19fcb93167f60d...

@bors
Copy link
Contributor

bors commented Jul 15, 2022

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

@rust-timer
Copy link
Collaborator

Queued 1d7eef78297735725da8f0383f19fcb93167f60d with parent b90a0ed, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1d7eef78297735725da8f0383f19fcb93167f60d): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 1.0% 1.0% 2
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -3.2% -4.0% 2
Improvements 🎉
(secondary)		 -3.5% -3.5% 1
All 😿🎉 (primary) -3.2% -4.0% 2

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -2.5% -2.5% 1
All 😿🎉 (primary) N/A N/A 0

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

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

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 15, 2022
@lqd
Copy link
Member

lqd commented Jul 15, 2022

looks like usual ctfe-stress-5 noise.

r=me rollup=never if you agree

@Mark-Simulacrum
Copy link
Member

@bors r+

Yeah, seems like it. Nice improvement in bootstrap times as well!

@bors
Copy link
Contributor

bors commented Jul 15, 2022

📌 Commit 8dece5c37a154df71fc5ddbe971d975f9b70e610 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Jul 15, 2022
@lqd
Copy link
Member

lqd commented Jul 15, 2022

Indeed, the object speedup is great!

@klensy klensy mentioned this pull request Jul 17, 2022
Closed
cuviper and others added 2 commits July 17, 2022 07:05
@cuviper
Upgrade indexmap and thorin-dwp to use hashbrown 0.12
daa7c14 
This removes the last dependencies on hashbrown 0.11.
@Amanieu @cuviper
Upgrade hashbrown to 0.12.3
931a8f8 
This fixes a double-free in the `clone_from` function if dropping an
existing element in the table panics. See
rust-lang/hashbrown#348 for more details.
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@Amanieu Do we have a reference for when the double-drop was introduced into hashbrown? I would've expected to see that in the changelog entry (https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md#v0123---2022-07-17), at least, but it doesn't seem to be there. Has it always been there?

@bors
Copy link
Contributor

bors commented Jul 23, 2022

📌 Commit 931a8f8 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@Mark-Simulacrum Mark-Simulacrum added the relnotes Marks issues that should be documented in the release notes of the next release. label Jul 23, 2022
@Amanieu
Copy link
Member

Amanieu commented Jul 23, 2022

I think it's always been there.

@bors
Copy link
Contributor

bors commented Jul 24, 2022

⌛ Testing commit 931a8f8 with merge 4dbc89d...

@bors
Copy link
Contributor

bors commented Jul 24, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 4dbc89d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 24, 2022
@bors bors merged commit 4dbc89d into rust-lang:master Jul 24, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 24, 2022
@bors bors mentioned this pull request Jul 24, 2022
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4dbc89d): comparison url.

Instruction count

  • Primary benchmarks: mixed results
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 0.2% 0.2% 3
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -0.4% -0.5% 7
Improvements 🎉
(secondary)		 -1.4% -1.4% 2
All 😿🎉 (primary) -0.2% -0.5% 10

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -8.1% -8.1% 1
Improvements 🎉
(secondary)		 -2.6% -2.6% 1
All 😿🎉 (primary) -8.1% -8.1% 1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 4.5% 4.5% 1
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -2.9% -2.9% 1
All 😿🎉 (primary) N/A N/A 0

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

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added the perf-regression Performance regression. label Jul 24, 2022
@Mark-Simulacrum Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 24, 2022
@Mark-Simulacrum
Copy link
Member

beta-nominating this PR; this addresses a soundness problem in hashbrown (double-free in clone_from) which seems good to roll out to stable on a faster schedule.

JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jul 26, 2022
@bors
Auto merge of rust-lang#99251 - cuviper:hashbrown-0.12, r=Mark-Simula…
745193d 
…crum

Upgrade indexmap and thorin-dwp to use hashbrown 0.12

This removes the last dependencies on hashbrown 0.11.

This also upgrades to hashbrown 0.12.3 to fix a double-free (rust-lang#99372).
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@apiraino apiraino added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 28, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Aug 5, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 5, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 5, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2022
@bors
Auto merge of rust-lang#100171 - Mark-Simulacrum:beta-next, r=Mark-Si…
6f955bf 
…mulacrum

[beta] Rollup of beta backports

Includes the following PRs:

*  rustc-docs: Be less specific about the representation of +bundle rust-lang#100074
*  Fix backwards-compatibility check for tests with +whole-archive rust-lang#100068
*  Revert write! and writeln! to late drop temporaries rust-lang#99689
*  Upgrade indexmap and thorin-dwp to use hashbrown 0.12 rust-lang#99251
*  rustdoc: avoid inlining modules with duplicate names rust-lang#99738

r? `@ghost`
@cuviper cuviper deleted the hashbrown-0.12 branch October 15, 2022 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cuviper @rustbot @rust-highfive @lqd @rust-timer @bors @Mark-Simulacrum @Amanieu @apiraino