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.

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

update Miri #110168

Merged
merged 38 commits into from
Apr 11, 2023
Merged

update Miri #110168

merged 38 commits into from
Apr 11, 2023

Conversation

saethlin
Copy link
Member

Most importantly, this should ensure that the Miri test suite passes in this repo, when the issue is fixed.

r? @oli-obk

saethlin and others added 30 commits March 17, 2023 18:29
Emit a warning when Miri is used with optimizations

This may address rust-lang/miri#2797, by clarifying to the user what is going on and what the consequences of their choices are.

Fixes rust-lang/miri#2797
Update the virtual clock in isolation mode to step forward with around the same speed as the host system.

Before this, the 1s sleep test took around 4 minutes on my machine.
move reject with isolation logic in fcntl

This PR moves the block of logic inside `fcntl` to reject if isolation is enabled into the branch checking if the command is `F_FULLFSYNC` on apple. This allows `fcntl` to duplicate file descriptors while using isolation.

This means we can now run the tokio tests with isolation.

This PR allows moves the now passing `fcntl` logic from `libc-fs-with-isolation.rs` into two different tests:
- `fcntl(1, libc::F_DUPFD, 0)` succeeds with isolation
- `fcntl(1, libc::F_FULLFSYNC, 0)` fails with isolation on MacOS
Also explain what needs to be done.
Have the miri cronjob link to the failed run.

Also explain what needs to be done to resolve the failing CI.
Correctly quote env vars in single quoted string in bash

single quotes don't allow env vars. So we unquote the single quote, start a double quote for where we use env vars and then unquote the double quote and continue with the single quote.
…li-obk

Add link for tree borrows similar to stacked borrows

`@Vanille-N` does it look ok to you?
oli-obk and others added 8 commits April 4, 2023 08:01
The panic test is now counted as an error test; we encounter a Terminate
terminator, and emit an interpreter error, as opposed to just
terminating due to a panic. So this test should have broken with
rust-lang#102906 but wasn't because the Miri
test suite is currently broken in rust-lang/rust:
 rust-lang#110102
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2023

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member

Does this also fix the miri-test-libstd failures?

@RalfJung
Copy link
Member

Ah looks like that still needs investigation. Anyway let's sync first.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 11, 2023

📌 Commit d50fee9 has been approved by RalfJung

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 Apr 11, 2023
@bors
Copy link
Contributor

bors commented Apr 11, 2023

⌛ Testing commit d50fee9 with merge 8e1162f...

@bors
Copy link
Contributor

bors commented Apr 11, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 11, 2023
@bors bors merged commit 8e1162f into rust-lang:master Apr 11, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8e1162f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

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)
1.8% [1.0%, 2.6%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-6.0%, -0.5%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.7% [-6.0%, 2.6%] 5

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.5% [0.5%, 0.5%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 2

@saethlin saethlin deleted the miri branch April 15, 2023 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

8 participants