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

Update smallvec to 1.8.1. #98558

Merged
merged 1 commit into from
Jun 29, 2022
Merged

Update smallvec to 1.8.1. #98558

merged 1 commit into from
Jun 29, 2022

Conversation

nnethercote
Copy link
Contributor

This pulls in servo/rust-smallvec#282, which
gives some small wins for rustc.

r? @lqd

@nnethercote
Update smallvec to 1.8.1.
7c40661 
This pulls in servo/rust-smallvec#282, which
gives some small wins for rustc.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 26, 2022
@rust-highfive
Copy link
Collaborator

Changes rustc_apfloat. rustc_apfloat is currently in limbo and you almost certainly don't want to change it (see #55993).

cc @eddyb

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jun 26, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 26, 2022
@nnethercote
Copy link
Contributor Author

I updated all smallvec occurrences in Cargo.toml files. The resulting Cargo.lock files are as follows:

[gulf:~/dev/rust1] grep -r -s -A1 --include=Cargo.lock "name = .*smallvec"
Cargo.lock:name = "smallvec"
Cargo.lock-version = "1.8.1"
--
compiler/rustc_codegen_cranelift/Cargo.lock:name = "smallvec"
compiler/rustc_codegen_cranelift/Cargo.lock-version = "1.8.1"
--
src/tools/miri/Cargo.lock:name = "smallvec"
src/tools/miri/Cargo.lock-version = "1.7.0"
--
src/tools/rust-analyzer/Cargo.lock:name = "smallvec"
src/tools/rust-analyzer/Cargo.lock-version = "1.8.0"
--
src/tools/rls/Cargo.lock:name = "smallvec"
src/tools/rls/Cargo.lock-version = "1.7.0"

I.e. the main Cargo.lock and the one for cranelift were updated, but the miri, rust-analyzer and rls ones were not. I'm not sure if that's expected. I also don't fully understand how src/tools/rustc-workspace-hack/Cargo.toml interacts with those. I'm happy to hear suggestions on anything I should or should not do relating to those tools.

@nnethercote
Copy link
Contributor Author

@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 Jun 26, 2022
@bors
Copy link
Contributor

bors commented Jun 26, 2022

⌛ Trying commit 7c40661 with merge 43338faa312f7b56a93af08d11283d80898f6b26...

@bors
Copy link
Contributor

bors commented Jun 27, 2022

☀️ Try build successful - checks-actions
Build commit: 43338faa312f7b56a93af08d11283d80898f6b26 (43338faa312f7b56a93af08d11283d80898f6b26)

@rust-timer
Copy link
Collaborator

Queued 43338faa312f7b56a93af08d11283d80898f6b26 with parent c80c4b8, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (43338faa312f7b56a93af08d11283d80898f6b26): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements 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)		 -1.8% -2.4% 8
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 5.1% 5.1% 1
Regressions 😿
(secondary)		 3.9% 4.5% 3
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 5.1% 5.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)		 3.0% 3.0% 1
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -4.2% -4.2% 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 Jun 27, 2022
@nnethercote
Copy link
Contributor Author

Perf results are as expected: a win for tt-muncher and doesn't affect anything else.

@eddyb
Copy link
Member

eddyb commented Jun 27, 2022

I.e. the main Cargo.lock and the one for cranelift were updated, but the miri, rust-analyzer and rls ones were not.

miri and the rest are presumably all git submodules, so their Cargo.lock files are not in this repo.
If you locally change any files in there, then run x.py commands, they will likely get reverted to the last commit in that specific submodule.

eddyb
eddyb reviewed Jun 27, 2022
View reviewed changes
compiler/rustc_apfloat/Cargo.toml
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
Copy link
Member

Choose a reason for hiding this comment

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

Not a source change, checking off on rustc_apfloat ✔️.

@lqd
Copy link
Member

lqd commented Jun 28, 2022

IIUC miri and the rest of the submodules will have their lockfiles updated when they next updated the tracked commit, and then merge the regenerated file before updating the submodules here.

Not sure about cranelift, but it's probably similar.

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jun 28, 2022

📌 Commit 7c40661 has been approved by lqd

@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 Jun 28, 2022
@bors
Copy link
Contributor

bors commented Jun 29, 2022

⌛ Testing commit 7c40661 with merge 66c83ff...

@bors
Copy link
Contributor

bors commented Jun 29, 2022

☀️ Test successful - checks-actions
Approved by: lqd
Pushing 66c83ff to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 29, 2022
@bors bors merged commit 66c83ff into rust-lang:master Jun 29, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 29, 2022
@nnethercote nnethercote deleted the smallvec-1.8.1 branch June 29, 2022 12:02
@bors bors mentioned this pull request Jun 29, 2022
Merged
@bors bors mentioned this pull request Jun 29, 2022
Merged
10 tasks
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (66c83ff): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements 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)		 -1.7% -2.4% 9
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)		 4.1% 4.1% 1
Regressions 😿
(secondary)		 2.7% 2.9% 2
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -2.3% -2.3% 1
All 😿🎉 (primary) 4.1% 4.1% 1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements 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.6% -2.8% 4
All 😿🎉 (primary) N/A N/A 0

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

@rustbot label: -perf-regression

Footnotes

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

  2. number of relevant changes ↩ ↩2 ↩3

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

@eddyb eddyb eddyb left review comments

Assignees

@lqd lqd

Labels
merged-by-bors This PR was explicitly merged by bors. 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.
7 participants
@nnethercote @rust-highfive @rust-timer @bors @eddyb @lqd @rustbot