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 #123041

Merged
merged 25 commits into from
Mar 25, 2024
Merged

Miri subtree update #123041

merged 25 commits into from
Mar 25, 2024

Conversation

RalfJung
Copy link
Member

r? @ghost

RalfJung and others added 25 commits March 23, 2024 18:59
@RalfJung
when a test fails, repeat the target after the failure report
3d6fcea
@RalfJung
disable RUST_BACKTRACE in CI, set it inside the test harness instead
bb4ef1a
@bors
Auto merge of rust-lang#3399 - RalfJung:ci, r=RalfJung
8e978c3 
make CI failures easier to interpret

RUST_BACKTRACE=1 means we show 2 backtraces that are almost always irrelevant: from ui_test and from the miri script. Instead let's set the env var inside the test harness so we see backtraces of Miri ICEing but nothing else.
@RalfJung
Preparing for merge from rustc
2e464c2
@RalfJung
Merge from rustc
070e8ce
@RalfJung
miri script: build with stable toolchain
1dd13ca
@bors
Auto merge of rust-lang#3403 - RalfJung:rustup, r=RalfJung
c7b86fc 
Rustup
@RalfJung
CI tweaks and show which stable Rust we are using
04b523f
@RalfJung
many-seeds: propagate failure properly
fdb5613
@RalfJung
miri-script/toolchain: make new_commit logic easier to follow
acf3f52
@tiif
Add libc test for rename and ftruncate
04a69e4
@bors
Auto merge of rust-lang#3398 - tiif:add_libc_fs_test, r=RalfJung
624af51 
Add libc direct test for shims and update CONTRIBUTING.md

Add more ``libc`` direct test for shims as mentioned in rust-lang#3179.

Changes:
- Added ``libc`` direct tests for ``rename`` and ``ftruncate64``
- Added the command for running ``pass-dep`` test in ``CONTRIBUTING.md``
@RalfJung
try to fix many-seeds tests on Windows
805f6ee
@RalfJung
desperate hack: hard-code bash path on Windows
a12decc
@bors
Auto merge of rust-lang#3406 - RalfJung:many-seeds, r=RalfJung
f97f448 
many-seeds: propagate failure properly

This may help explain rust-lang/miri#3405.
@bors
Auto merge of rust-lang#3402 - RalfJung:miri-script, r=RalfJung
dcddf24 
miri script: build with stable toolchain

`./miri toolchain` sets up a `rustup override miri`. But then if something goes wrong and the `miri` toolchain doesn't work, one can't even run `./miri toolchain` again as building miri-script needs a toolchain...

So let's always use stable to build miri-script, making it override-independent. I assume everyone will have that installed.
@RalfJung
CONTRIBUTING: vsocde settings: add --all-targets
89a32d7
@bors
Auto merge of rust-lang#3410 - RalfJung:all-targets, r=RalfJung
cf172a8 
CONTRIBUTING: vsocde settings: add --all-targets

Seems like when setting a custom command, one needs to pass this flag manually, it's no longer automatically added by RA.
@RalfJung
test-cargo-miri: test anyhow
8afc486
@RalfJung
phase_rustdoc: add a heuristic to make us more certain that this is r…
98e1cbb 
…eally rustdoc
@bors
Auto merge of rust-lang#3413 - RalfJung:cargo-miri-misc, r=RalfJung
c461170 
phase_rustdoc: add a heuristic to make us more certain that this is really rustdoc

Also add anyhow to test-cargo-miri; it has a custom build probe and is widely used so let's make sure the build script does not fail.
@RalfJung
Preparing for merge from rustc
5b1319c
@RalfJung
Merge from rustc
d8be714
@RalfJung
support '--sysroot=' form of setting the sysroot as well
0d4ef69
@bors
Auto merge of rust-lang#3414 - RalfJung:rustup, r=RalfJung
cf1eb93 
Rustup

Fixes rust-lang/miri#3404
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 25, 2024

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Mar 25, 2024

📌 Commit cf1eb93 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 Mar 25, 2024
@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 Mar 25, 2024
@RalfJung
Copy link
Member Author

In fact since this fixes a regression people are hitting in the wild...
@bors p=2

@bors
Copy link
Contributor

bors commented Mar 25, 2024

⌛ Testing commit cf1eb93 with merge 35936c4...

@bors
Copy link
Contributor

bors commented Mar 25, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 35936c4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 25, 2024
@bors bors merged commit 35936c4 into rust-lang:master Mar 25, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 25, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (35936c4): 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.6% [0.4%, 0.8%] 3
Regressions ❌
(secondary)		 3.4% [3.4%, 3.4%] 1
Improvements ✅
(primary)		 -0.8% [-0.8%, -0.8%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.2% [-0.8%, 0.8%] 4

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.6% [0.5%, 0.8%] 2
Regressions ❌
(secondary)		 3.3% [3.1%, 3.5%] 3
Improvements ✅
(primary)		 -0.4% [-0.5%, -0.4%] 3
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.0% [-0.5%, 0.8%] 5

Binary size

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

Bootstrap: 671.366s -> 672.58s (0.18%)
Artifact size: 315.07 MiB -> 315.08 MiB (0.01%)

@RalfJung RalfJung deleted the miri branch March 26, 2024 06:51
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.79.0
Development

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