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

rustc_target: more target string fixes for LLVM 20 #132785

Merged
merged 1 commit into from
Nov 9, 2024
Merged

rustc_target: more target string fixes for LLVM 20 #132785

merged 1 commit into from
Nov 9, 2024
+4 −4

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Nov 8, 2024

LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396.

@rustbot label: +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2024

r? @pnkfelix

rustbot has assigned @pnkfelix.
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 Nov 8, 2024
@workingjubilee workingjubilee added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Nov 8, 2024
@nikic
Copy link
Contributor

nikic commented Nov 8, 2024 •
edited
Loading

This seems to be a mix of #132741 and an aarch64_be change?

@workingjubilee workingjubilee added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-target-specs Area: Compile-target specifications labels Nov 8, 2024
@durin42
rustc_target: more target string fixes for LLVM 20
a10e744 
LLVM continues to clean these up, and we continue to make this
consistent. This is similar to 9caced7
and e985396.

@rustbot label: +llvm-main
@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

@durin42
Copy link
Contributor Author

durin42 commented Nov 8, 2024

Ah, my fault. I didn't know #132741 was in-flight. Fixed to be just the non-MIPS bits.

@nikic
Copy link
Contributor

nikic commented Nov 8, 2024

Can you please also share the relevant LLVM commit for these aarch64 changes?

@durin42
Copy link
Contributor Author

durin42 commented Nov 8, 2024

Truthfully I'm not sure how to figure that out efficiently. I could bisect until the failure shows up (probably take a few hours), but we've had so many breakages in the last 6 days against LLVM 20 the bisect wouldn't run automatically and I don't know what part of LLVM these strings are in (and git log -S p270 wasn't helpful.)

@nikic
Copy link
Contributor

nikic commented Nov 8, 2024

The reason I ask is that the last change in this area I'm aware of is llvm/llvm-project#111879, for which #131760 did the DL adjustments in Rust. Were these targets just missed at the time? But then it should have been broken for longer...

@durin42
Copy link
Contributor Author

durin42 commented Nov 8, 2024

I wish I had an answer. This fixes our LLVM 20 CI, which was last green 6 days ago at llvm/llvm-project@25af8f5, and is now green again with this patch applied today.

@beetrees
Copy link
Contributor

beetrees commented Nov 9, 2024 •
edited
Loading

AFAICT this change occured in LLVM at the same time as the other AArch64 data layout changes - I believe it was missed because the LLVM 20 CI at https://buildkite.com/llvm-project/rust-llvm-integrate-prototype used to delete the failing test (tests/assembly/targets/targets-elf.rs) due to #131074. While that issue was fixed by #132422, the LLVM 20 CI only stopped deleting the test when #131074 was closed a day or so ago.

@nikic
Copy link
Contributor

nikic commented Nov 9, 2024

Thanks, that explains it.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 9, 2024

📌 Commit a10e744 has been approved by nikic

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 Nov 9, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 9, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2024
@bors
Auto merge of rust-lang#132800 - matthiaskrgr:rollup-c1kkj56, r=matth…
8044557 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#132552 (Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file)
 - rust-lang#132745 (pointee_info_at: fix logic for recursing into enums)
 - rust-lang#132777 (try_question_mark_nop: update test for LLVM 20)
 - rust-lang#132785 (rustc_target: more target string fixes for LLVM 20)
 - rust-lang#132794 (Use a separate dir for r-a builds consistently in helix config)

r? `@ghost`
`@rustbot` modify labels: rollup
@klensy
Copy link
Contributor

klensy commented Nov 9, 2024

Linked prs have parts that gated on llvm 20 version, while that pr not. Will this works on 18 and 19 version?

@bors bors merged commit a393566 into rust-lang:master Nov 9, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 9, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2024
@rust-timer
Unrolled build for rust-lang#132785
313f6ef 
Rollup merge of rust-lang#132785 - durin42:llvm-20-more-alignments, r=nikic

rustc_target: more target string fixes for LLVM 20

LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396.

`@rustbot` label: +llvm-main
@beetrees
Copy link
Contributor

beetrees commented Nov 9, 2024

@klensy The existing text replacement from #131760 will also handle these new cases, as it removes "-p270:32:32-p271:32:32-p272:64:64" for all aarch64 targets.

mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@matthiaskrgr @mati865
Rollup merge of rust-lang#132785 - durin42:llvm-20-more-alignments, r…
7be75c8 
…=nikic

rustc_target: more target string fixes for LLVM 20

LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396.

`@rustbot` label: +llvm-main
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@bors @mati865
Auto merge of rust-lang#132800 - matthiaskrgr:rollup-c1kkj56, r=matth…
a201416 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#132552 (Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file)
 - rust-lang#132745 (pointee_info_at: fix logic for recursing into enums)
 - rust-lang#132777 (try_question_mark_nop: update test for LLVM 20)
 - rust-lang#132785 (rustc_target: more target string fixes for LLVM 20)
 - rust-lang#132794 (Use a separate dir for r-a builds consistently in helix config)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-target-specs Area: Compile-target specifications llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) 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.84.0
Development

Successfully merging this pull request may close these issues.
8 participants
@durin42 @rustbot @nikic @beetrees @bors @klensy @pnkfelix @workingjubilee