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

Miri subtree update #118567

Merged
merged 25 commits into from
Dec 3, 2023
Merged

Miri subtree update #118567

merged 25 commits into from
Dec 3, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Dec 3, 2023

r? @ghost

The Miri Conjob Bot and others added 25 commits November 27, 2023 04:56
Preparing for merge from rustc
1293a6a
Merge from rustc
fa6ecc9
@bors
Auto merge of rust-lang#3193 - rust-lang:rustup-2023-11-27, r=RalfJung
9b8119d 
Automatic Rustup
@saethlin
Remove Stacked Borrows GC heuristics
8344dae
@bors
Auto merge of rust-lang#3194 - saethlin:remove-gc-heuristics, r=RalfJung
eaaf7e7 
Remove Stacked Borrows GC heuristics

Removing these has no impact on our benchmarks. I think I initially added these because they have a significant impact on runtime at shorter GC intervals. But both these heuristics result in undesirable memory growth in real programs, especially `modified_since_last_gc`. I didn't realize at the time that required state becomes garbage as a result of changes to _other_ allocations.

I think this nets even primarily because we get better heap reuse. With this change I see almost all the mmap calls coming from our diagnostics infrastructure go away. Not that there were many to start with, but it's an indicator that our memory locality has improved.

Before:
```
Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/backtraces/Cargo.toml"
  Time (mean ± σ):      4.046 s ±  0.087 s    [User: 3.952 s, System: 0.085 s]
  Range (min … max):    3.952 s …  4.139 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/invalidate/Cargo.toml"
  Time (mean ± σ):      6.271 s ±  0.073 s    [User: 6.206 s, System: 0.054 s]
  Range (min … max):    6.195 s …  6.365 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/mse/Cargo.toml"
  Time (mean ± σ):     570.3 ms ±   6.7 ms    [User: 505.5 ms, System: 61.8 ms]
  Range (min … max):   559.6 ms … 576.0 ms    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/serde1/Cargo.toml"
  Time (mean ± σ):      2.013 s ±  0.012 s    [User: 1.938 s, System: 0.069 s]
  Range (min … max):    1.994 s …  2.024 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/serde2/Cargo.toml"
  Time (mean ± σ):      4.155 s ±  0.082 s    [User: 4.078 s, System: 0.067 s]
  Range (min … max):    4.011 s …  4.211 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/slice-get-unchecked/Cargo.toml"
  Time (mean ± σ):     541.5 ms ±   3.9 ms    [User: 477.3 ms, System: 60.0 ms]
  Range (min … max):   536.1 ms … 545.1 ms    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/unicode/Cargo.toml"
  Time (mean ± σ):      1.496 s ±  0.002 s    [User: 1.442 s, System: 0.050 s]
  Range (min … max):    1.494 s …  1.500 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/zip-equal/Cargo.toml"
  Time (mean ± σ):      2.190 s ±  0.043 s    [User: 2.109 s, System: 0.075 s]
  Range (min … max):    2.114 s …  2.215 s    5 runs

```
After:
```
Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/backtraces/Cargo.toml"
  Time (mean ± σ):      3.954 s ±  0.057 s    [User: 3.871 s, System: 0.075 s]
  Range (min … max):    3.912 s …  4.052 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/invalidate/Cargo.toml"
  Time (mean ± σ):      6.200 s ±  0.108 s    [User: 6.129 s, System: 0.060 s]
  Range (min … max):    6.072 s …  6.295 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/mse/Cargo.toml"
  Time (mean ± σ):     575.3 ms ±   9.3 ms    [User: 511.5 ms, System: 60.2 ms]
  Range (min … max):   558.9 ms … 580.8 ms    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/serde1/Cargo.toml"
  Time (mean ± σ):      1.966 s ±  0.007 s    [User: 1.903 s, System: 0.058 s]
  Range (min … max):    1.959 s …  1.974 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/serde2/Cargo.toml"
  Time (mean ± σ):      4.138 s ±  0.040 s    [User: 4.057 s, System: 0.072 s]
  Range (min … max):    4.110 s …  4.207 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/slice-get-unchecked/Cargo.toml"
  Time (mean ± σ):     541.8 ms ±   5.6 ms    [User: 470.7 ms, System: 66.9 ms]
  Range (min … max):   535.6 ms … 549.1 ms    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/unicode/Cargo.toml"
  Time (mean ± σ):      1.490 s ±  0.021 s    [User: 1.424 s, System: 0.060 s]
  Range (min … max):    1.454 s …  1.505 s    5 runs

Benchmark 1: cargo miri run  --manifest-path "/home/ben/miri/bench-cargo-miri/zip-equal/Cargo.toml"
  Time (mean ± σ):      2.215 s ±  0.048 s    [User: 2.113 s, System: 0.072 s]
  Range (min … max):    2.183 s …  2.299 s    5 runs
```
@RalfJung
explain tests that disable the provenance GC
1620865
@bors
Auto merge of rust-lang#3196 - RalfJung:provenance-gc, r=RalfJung
33e8232 
explain tests that disable the provenance GC
@RalfJung
Preparing for merge from rustc
76ec477
@RalfJung
Merge from rustc
7a661d0
@RalfJung
move 'uninit' tests into common directory
64fb96f
@RalfJung
move some validity-related tests into subdir
a0c8b09
@RalfJung
give macOS some extra time, it needs that
cd12440
@bors
Auto merge of rust-lang#3197 - RalfJung:rustup, r=RalfJung
d368c40 
Rustup

also move some fail tests into suitable subdirectories
@RalfJung
Preparing for merge from rustc
fce04ef
@RalfJung
Merge from rustc
b8a5076
@bors
Auto merge of rust-lang#3201 - RalfJung:rustup, r=RalfJung
33515d7 
Rustup
Preparing for merge from rustc
48176d4
Merge from rustc
3a6753b
@bors
Auto merge of rust-lang#3202 - rust-lang:rustup-2023-12-03, r=saethlin
6318e9d 
Automatic Rustup
@RalfJung
new trophy case entry
323ca94
@bors
Auto merge of rust-lang#3203 - RalfJung:trophy, r=RalfJung
2a316c4 
new trophy case entry

Cc rust-lang#118460
@RalfJung
simd_select_bitmask: support passing the mask as an array
11db9de
@RalfJung
add simd_cttz and simd_ctlz
31ea518
@RalfJung
add simd_bswap and simd_bitreverse
2903f1c
@bors
Auto merge of rust-lang#3204 - RalfJung:simd, r=RalfJung
28f9fe3 
add new SIMD intrinsics
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 3, 2023

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2023

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Dec 3, 2023

📌 Commit 28f9fe3 has been approved by RalfJung

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2023
@bors 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 3, 2023
@bors
Copy link
Contributor

bors commented Dec 3, 2023

⌛ Testing commit 28f9fe3 with merge 8b6a4a9...

@bors
Copy link
Contributor

bors commented Dec 3, 2023

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 8b6a4a9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 3, 2023
@bors bors merged commit 8b6a4a9 into rust-lang:master Dec 3, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 3, 2023
@bors bors mentioned this pull request Dec 3, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8b6a4a9): 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)		 0.1% [0.1%, 0.1%] 1
Regressions ❌
(secondary)		 3.5% [2.6%, 4.4%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.1% [0.1%, 0.1%] 1

Cycles

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

Binary size

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

Bootstrap: 672.558s -> 673.398s (0.12%)
Artifact size: 314.08 MiB -> 314.08 MiB (-0.00%)

@RalfJung RalfJung deleted the miri branch December 4, 2023 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @rustbot @bors @rust-timer @saethlin