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

Merged
merged 27 commits into from
Jun 4, 2023
Merged

update Miri #112244

merged 27 commits into from
Jun 4, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 3, 2023

Also adjust Miri's compiletest a little: in pre-subtree days we added -A unused -Astable-features to have the Miri toolstate break less often. But nowadays it just causes confusion when Miri CI works in rustc but fails on the Miri side so let's get rid of this difference.

r? @oli-obk

oli-obk and others added 27 commits May 23, 2023 07:51
Hide full miri command line in `./miri run-dep`

fixes rust-lang#2443
rustup

I don't know what happened here: rust-lang@efb9c30#r115119947 that commit broke our tests I think. I don't know why it didn't break on the rustc side.
impl of is_relevant on transitions makes for much less noise in error messages

Co-authored-by: Ralf Jung <[email protected]>
TB diagnostics: avoid printing irrelevant events

History contains some events that are relevant to the location but not useful to understand the error.
We can make the selection of events more precise, from only "does it affect the location" to also "is it relevant for this kind of error"

This is also the occasion to fix rust-lang/miri#2867 (comment)

[Solved] Draft: find a way for blanks in the history to not be confusing, as with the current version the history can show the creation as `Reserved` then show where it transitioned from `Frozen` to `Disabled`, but it will say nothing of the `Reserved -> Frozen` leading up to it.
python3 snippet used to fill $MIRIDIR variable returns native paths.
Down the line in `bench` subcommand this leads to benchmark setup
failure, preventing contributors from running benchmarks on Windows
hosts.

This commit replaces usage of native os.path module with pathlib, which
explicitly converts paths to Unix flavour.
add unchecked_shl test

rust-lang#112238  made me realize that we have a test for add,sub,mul,shr but not shl. Add the missing test. Also name the existing tests more consistently.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 3, 2023

The Miri subtree was changed

cc @rust-lang/miri

@oli-obk
Copy link
Contributor

oli-obk commented Jun 3, 2023

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jun 3, 2023

📌 Commit ca720fd has been approved by oli-obk

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 Jun 3, 2023
@bors
Copy link
Contributor

bors commented Jun 3, 2023

⌛ Testing commit ca720fd with merge 4e4f041...

@bors
Copy link
Contributor

bors commented Jun 4, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 4e4f041 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 4, 2023
@bors bors merged commit 4e4f041 into rust-lang:master Jun 4, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 4, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4e4f041): 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)

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

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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.1% [-4.2%, -1.3%] 8
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.1% [-4.2%, -1.3%] 8

Binary size

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

Bootstrap: 647.149s -> 647.755s (0.09%)

@RalfJung RalfJung deleted the miri branch June 8, 2023 09:45
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