Skip to content

Ignore allocation bytes in some mir-opt tests #126502

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 13, 2024
Merged

Ignore allocation bytes in some mir-opt tests #126502

merged 3 commits into from
Jul 13, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jun 14, 2024

This adds rustc -Zdump-mir-exclude-alloc-bytes to skip writing allocation bytes in MIR dumps, and applies it to tests that were failing on s390x due to its big-endian byte order.

Fixes #126261

@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2024

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 14, 2024
@cuviper
Copy link
Member Author

cuviper commented Jun 14, 2024

There are additional mir-opt tests that currently use ignore-endian-big to avoid these failures, but I have not yet evaluated whether they would also be solved by this option. We might even want to set this for all mir-opt tests by default, like we do with -Zdump-mir-exclude-pass-number already.

If any tests really should care about the bytes, they can also flip this exclusion off and either ignore or deal with endian differences.

@cuviper cuviper mentioned this pull request Jun 14, 2024
Closed
@bors
Copy link
Collaborator

bors commented Jun 21, 2024

☔ The latest upstream changes (presumably #126541) made this pull request unmergeable. Please resolve the merge conflicts.

@cuviper cuviper force-pushed the dump-mir-exclude-alloc-bytes branch from a98a466 to 7c3673f Compare June 26, 2024 22:30
@uweigand
Copy link
Contributor

Thanks @cuviper for looking into this! I've just verified that this PR does indeed resolve all mir-opt test failures on s390x.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 12, 2024

📌 Commit 7c3673f has been approved by estebank

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 Jul 12, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 12, 2024
@matthiaskrgr
Rollup merge of rust-lang#126502 - cuviper:dump-mir-exclude-alloc-byt…
d18af83 
…es, r=estebank

Ignore allocation bytes in some mir-opt tests

This adds `rustc -Zdump-mir-exclude-alloc-bytes` to skip writing allocation bytes in MIR dumps, and applies it to tests that were failing on s390x due to its big-endian byte order.

Fixes rust-lang#126261
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 12, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2024
@bors
Auto merge of rust-lang#127657 - matthiaskrgr:rollup-qtuuo4o, r=matth…
2d31345 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#126502 (Ignore allocation bytes in some mir-opt tests)
 - rust-lang#126606 (Guard against calling `libc::exit` multiple times on Linux.)
 - rust-lang#126922 (add lint for inline asm labels that look like binary)
 - rust-lang#127295 (CFI: Support provided methods on traits)
 - rust-lang#127310 (Fix import suggestion ice)
 - rust-lang#127535 (Fire unsafe_code lint on unsafe extern blocks)
 - rust-lang#127631 (Remove `fully_normalize`)
 - rust-lang#127632 (Implement `precise_capturing` support for rustdoc)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Jul 12, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2024
@bors
Auto merge of rust-lang#127665 - workingjubilee:rollup-g90yr21, r=wor…
336e89b 
…kingjubilee

Rollup of 11 pull requests

Successful merges:

 - rust-lang#126502 (Ignore allocation bytes in some mir-opt tests)
 - rust-lang#126922 (add lint for inline asm labels that look like binary)
 - rust-lang#127209 (Added the `xop` target-feature and the `xop_target_feature` feature gate)
 - rust-lang#127310 (Fix import suggestion ice)
 - rust-lang#127338 (Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake)
 - rust-lang#127381 (Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake)
 - rust-lang#127535 (Fire unsafe_code lint on unsafe extern blocks)
 - rust-lang#127619 (Suggest using precise capturing for hidden type that captures region)
 - rust-lang#127631 (Remove `fully_normalize`)
 - rust-lang#127632 (Implement `precise_capturing` support for rustdoc)
 - rust-lang#127660 (Rename the internal `const_strlen` to just `strlen`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5d56572 into rust-lang:master Jul 13, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 13, 2024
@rust-timer
Unrolled build for rust-lang#126502
88d0c8e 
Rollup merge of rust-lang#126502 - cuviper:dump-mir-exclude-alloc-bytes, r=estebank

Ignore allocation bytes in some mir-opt tests

This adds `rustc -Zdump-mir-exclude-alloc-bytes` to skip writing allocation bytes in MIR dumps, and applies it to tests that were failing on s390x due to its big-endian byte order.

Fixes rust-lang#126261
uweigand added a commit to uweigand/rust that referenced this pull request Jul 15, 2024
@uweigand
Ignore allocation bytes in one more mir-opt test
636ddcb 
Following on PR rust-lang#126502, add `rustc -Zdump-mir-exclude-alloc-bytes`
to tests/mir-opt/dataflow-const-prop/aggregate_copy.rs as well
to skip writing allocation bytes in MIR dumps.

Fixes rust-lang#126261
@uweigand uweigand mentioned this pull request Jul 15, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 20, 2024
@matthiaskrgr
Rollup merge of rust-lang#127752 - uweigand:s390x-miropt-update, r=Ma…
ea9b1af 
…rk-Simulacrum

Ignore allocation bytes in one more mir-opt test

Following on PR rust-lang#126502, add `rustc -Zdump-mir-exclude-alloc-bytes` to tests/mir-opt/dataflow-const-prop/aggregate_copy.rs as well to skip writing allocation bytes in MIR dumps.

Fixes rust-lang#126261
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2024
@rust-timer
Unrolled build for rust-lang#127752
d815560 
Rollup merge of rust-lang#127752 - uweigand:s390x-miropt-update, r=Mark-Simulacrum

Ignore allocation bytes in one more mir-opt test

Following on PR rust-lang#126502, add `rustc -Zdump-mir-exclude-alloc-bytes` to tests/mir-opt/dataflow-const-prop/aggregate_copy.rs as well to skip writing allocation bytes in MIR dumps.

Fixes rust-lang#126261
@cuviper cuviper deleted the dump-mir-exclude-alloc-bytes branch September 4, 2024 23:43
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@estebank estebank

Labels
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.
Projects
None yet
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.

mir-opt tests fail on big endian
5 participants
@cuviper @rustbot @bors @uweigand @estebank