Skip to content

Fix test simd/extract-insert-dyn on s390x - #140456

Merged
bors merged 1 commit into
rust-lang:masterfrom
fneddy:fix_s390x_codegen_simd_ext_ins_dyn
May 4, 2025
Merged

Fix test simd/extract-insert-dyn on s390x#140456
bors merged 1 commit into
rust-lang:masterfrom
fneddy:fix_s390x_codegen_simd_ext_ins_dyn

Conversation

@fneddy

@fneddyfneddy commented Apr 29, 2025

Copy link
Copy Markdown
Contributor

Fix the test for s390x by enabling s390x vector extension via target_feature(enable = "vector")(#127506). As this is is still gated by #![feature(s390x_target_feature)] we need that attribute also.

@rustbot

rustbot commented Apr 29, 2025

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

@rustbotrustbot 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 Apr 29, 2025
wesleywiser
wesleywiser reviewed Apr 29, 2025
View reviewed changes
Comment threadtests/codegen/simd/extract-insert-dyn.rs Outdated
@wesleywiser

wesleywiser commented Apr 29, 2025

Copy link
Copy Markdown
Member

r? wesleywiser

@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from d00b33a to 24af1d9CompareApril 29, 2025 18:32
@wesleywiser

wesleywiser commented Apr 29, 2025

Copy link
Copy Markdown
Member

Thanks @fneddy!

@bors r+ rollup

@bors

bors commented Apr 29, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 24af1d9 has been approved by wesleywiser

It is now in the queue for this repository.

@borsbors 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 29, 2025
@ZalatharZalathar mentioned this pull request Apr 30, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
@bors
Auto merge ofrust-lang#140499- Zalathar:rollup-8qpbuw0, r=Zalathar
c9d3ed8
Rollup of 12 pull requests
Successful merges:
- rust-lang#136160 (Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`)
- rust-lang#138087 (Initial implementation of `core_float_math`)
- rust-lang#139059 (uses_power_alignment: wording tweaks)
- rust-lang#139192 (mention provenance in the pointer::wrapping_offset docs)
- rust-lang#140312 (Improve pretty-printing of braces)
- rust-lang#140404 (rm `TypeVistable` impls for `Canonical`)
- rust-lang#140437 (enable msa feature for mips in codegen tests)
- rust-lang#140438 (Add `rust.debug-assertions-tools` option)
- rust-lang#140439 (miri: algebraic intrinsics: bring back float non-determinism)
- rust-lang#140445 (Treat ManuallyDrop as ~const Destruct)
- rust-lang#140446 (chore: fix some tests)
- rust-lang#140448 (Rename `rustc_query_append!` to `rustc_with_all_queries!`)
Failed merges:
- rust-lang#140456 (Fix test simd/extract-insert-dyn on s390x)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented Apr 30, 2025

Copy link
Copy Markdown
Collaborator

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

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 30, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@wesleywiser

wesleywiser commented May 1, 2025

Copy link
Copy Markdown
Member

Hi @fneddy, looks like rustfmt wants that attribute split across multiple lines now that it's gotten long.

Could you also rebase? We don't allow merge commits in PRs to make the overall repo history simpler. (If you need help, this guide should have what you need in it https://rustc-dev-guide.rust-lang.org/git.html#i-made-a-merge-commit-by-accident)

@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from 1226051 to 3b9ae29CompareMay 2, 2025 06:39
@rustbot

This comment has been minimized.

Sign in to view
@rustbotrustbot added the has-merge-commits PR has merge commits, merge with caution. label May 2, 2025
@fneddy
fneddy marked this pull request as draft May 2, 2025 06:40
@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from 3b9ae29 to 44d8257CompareMay 2, 2025 06:52
@fneddy
fneddy marked this pull request as ready for review May 2, 2025 06:53
@rustbotrustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 2, 2025
@fneddy

fneddy commented May 2, 2025

Copy link
Copy Markdown
ContributorAuthor

thank you :)
hope I've got everything right this time.
sorry for the spam.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from 44d8257 to c48b0e8CompareMay 2, 2025 07:56
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from c48b0e8 to f3f3248CompareMay 3, 2025 07:17
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fneddy
Fix test simd/extract-insert-dyn on s390x
61488e5
Fix the test for s390x by enabling s390x vector extension via
`target_feature(enable = "vector")`(rust-lang#127506). As this is is still
gated by `#![feature(s390x_target_feature)]` we need that attribute
also.
@fneddy
fneddyforce-pushed the fix_s390x_codegen_simd_ext_ins_dyn branch from f3f3248 to 61488e5CompareMay 3, 2025 08:15
@fneddy

fneddy commented May 3, 2025

Copy link
Copy Markdown
ContributorAuthor

everybody is mad at borrow checker while I am fighting with formatting 😭

@tgross35

tgross35 commented May 3, 2025

Copy link
Copy Markdown
Member

everybody is mad at borrow checker while I am fighting with formatting 😭

At the very least this one can be automatically fixed with ./x fmt :)

@bors r=wesleywiser

@bors

bors commented May 3, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 61488e5 has been approved by wesleywiser

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 3, 2025
@ZalatharZalathar mentioned this pull request May 4, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2025
@bors
Auto merge ofrust-lang#140633- Zalathar:rollup-iay94wa, r=Zalathar
622ac04
Rollup of 7 pull requests
Successful merges:
- rust-lang#139675 (Add the AVX10 target features)
- rust-lang#140286 (Check if format argument is identifier to avoid error err-emit)
- rust-lang#140456 (Fix test simd/extract-insert-dyn on s390x)
- rust-lang#140551 (Move some tests out of tests/ui)
- rust-lang#140588 (Adjust some ui tests re. target-dependent errors)
- rust-lang#140617 (Report the `unsafe_attr_outside_unsafe` lint at the closest node)
- rust-lang#140626 (allow `#[rustfmt::skip]` in combination with `#[naked]`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 020d908 into rust-lang:masterMay 4, 2025
@rustbotrustbot added this to the 1.88.0 milestone May 4, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2025
@rust-timer
Unrolled build forrust-lang#140456
38cb96b
Rollup merge of rust-lang#140456 - fneddy:fix_s390x_codegen_simd_ext_ins_dyn, r=wesleywiser
Fix test simd/extract-insert-dyn on s390x
Fix the test for s390x by enabling s390x vector extension via `target_feature(enable = "vector")`(rust-lang#127506). As this is is still gated by `#![feature(s390x_target_feature)]` we need that attribute also.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wesleywiserwesleywiserwesleywiser approved these changes

Assignees

@wesleywiserwesleywiser

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.88.0

Development

Successfully merging this pull request may close these issues.

7 participants

@fneddy@rustbot@wesleywiser@bors@rust-log-analyzer@tgross35@Mark-Simulacrum