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: ppc64 target string fixes for LLVM 20 #134115

Merged
merged 1 commit into from
Dec 11, 2024
Merged

rustc_target: ppc64 target string fixes for LLVM 20 #134115

merged 1 commit into from
Dec 11, 2024

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Dec 10, 2024 •
edited by jieyouxu
Loading

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

LLVM PR: llvm/llvm-project#118004

@rustbot label: +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented Dec 10, 2024

r? @davidtwco

rustbot has assigned @davidtwco.
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 Dec 10, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 10, 2024

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

@durin42
Copy link
Contributor Author

durin42 commented Dec 10, 2024

@rustbot label: +llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Dec 10, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@durin42 durin42 force-pushed the ppc64-target-string branch 2 times, most recently from 074e6a7 to e5d4518 Compare December 10, 2024 10:25
jieyouxu
jieyouxu approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jieyouxu
Copy link
Member

r? jieyouxu @bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 10, 2024

📌 Commit e5d4518 has been approved by jieyouxu

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 Dec 10, 2024
@durin42
rustc_target: ppc64 target string fixes for LLVM 20
0680155 
LLVM continues to clean these up, and we continue to make this
consistent. This is similar to 9caced7,
e985396, and
a10e744.

`@rustbot` label: +llvm-main
@durin42 durin42 force-pushed the ppc64-target-string branch from e5d4518 to 0680155 Compare December 10, 2024 10:54
@jieyouxu
Copy link
Member

Actually let's wait for PR CI. r=me once PR CI is green.
@bors r-

@bors bors 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 Dec 10, 2024
@durin42
Copy link
Contributor Author

durin42 commented Dec 10, 2024

Looks like bors finished? Or am I missing something in the UI?

@jieyouxu
Copy link
Member

It is indeed finished. @bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 10, 2024

📌 Commit 0680155 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 10, 2024
@durin42
Copy link
Contributor Author

durin42 commented Dec 10, 2024

Thanks!

fmease added a commit to fmease/rust that referenced this pull request Dec 10, 2024
@fmease
Rollup merge of rust-lang#134115 - durin42:ppc64-target-string, r=jie…
cf704d1 
…youxu

rustc_target: ppc64 target string fixes for LLVM 20

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

``@rustbot`` label: +llvm-main
@fmease fmease mentioned this pull request Dec 10, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@bors
Auto merge of rust-lang#134133 - fmease:rollup-6pmsnag, r=fmease
acf1ff8 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#134042 (Add the `power8-crypto` target feature)
 - rust-lang#134070 (Some asm! diagnostic adjustments and a papercut fix)
 - rust-lang#134094 (Tweak wording of non-const traits used as const bounds)
 - rust-lang#134100 (Remove rustc_const_stable attribute on const NOOP)
 - rust-lang#134103 (Don't ICE when encountering never in range pattern)
 - rust-lang#134113 (run-make: Fix `assert_stderr_not_contains_regex`)
 - rust-lang#134115 (rustc_target: ppc64 target string fixes for LLVM 20)
 - rust-lang#134116 (stabilize const_nonnull_new)
 - rust-lang#134120 (Remove Felix from ping groups and review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease fmease mentioned this pull request Dec 10, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@bors
Auto merge of rust-lang#134137 - fmease:rollup-u1p7swx, r=fmease
8448734 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#133583 (Fix type (exit → exist))
 - rust-lang#134042 (Add the `power8-crypto` target feature)
 - rust-lang#134094 (Tweak wording of non-const traits used as const bounds)
 - rust-lang#134100 (Remove rustc_const_stable attribute on const NOOP)
 - rust-lang#134103 (Don't ICE when encountering never in range pattern)
 - rust-lang#134113 (run-make: Fix `assert_stderr_not_contains_regex`)
 - rust-lang#134115 (rustc_target: ppc64 target string fixes for LLVM 20)
 - rust-lang#134116 (stabilize const_nonnull_new)
 - rust-lang#134120 (Remove Felix from ping groups and review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@bors
Auto merge of rust-lang#134137 - fmease:rollup-u1p7swx, r=fmease
5726725 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#133583 (Fix type (exit → exist))
 - rust-lang#134042 (Add the `power8-crypto` target feature)
 - rust-lang#134094 (Tweak wording of non-const traits used as const bounds)
 - rust-lang#134100 (Remove rustc_const_stable attribute on const NOOP)
 - rust-lang#134103 (Don't ICE when encountering never in range pattern)
 - rust-lang#134113 (run-make: Fix `assert_stderr_not_contains_regex`)
 - rust-lang#134115 (rustc_target: ppc64 target string fixes for LLVM 20)
 - rust-lang#134116 (stabilize const_nonnull_new)
 - rust-lang#134120 (Remove Felix from ping groups and review rotation)

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

Corresponding LLVM change for reference llvm/llvm-project#118004

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@bors
Auto merge of rust-lang#134137 - fmease:rollup-u1p7swx, r=fmease
5a6036a 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#133583 (Fix type (exit → exist))
 - rust-lang#134042 (Add the `power8-crypto` target feature)
 - rust-lang#134094 (Tweak wording of non-const traits used as const bounds)
 - rust-lang#134100 (Remove rustc_const_stable attribute on const NOOP)
 - rust-lang#134103 (Don't ICE when encountering never in range pattern)
 - rust-lang#134113 (run-make: Fix `assert_stderr_not_contains_regex`)
 - rust-lang#134115 (rustc_target: ppc64 target string fixes for LLVM 20)
 - rust-lang#134116 (stabilize const_nonnull_new)
 - rust-lang#134120 (Remove Felix from ping groups and review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6d17cb8 into rust-lang:master Dec 11, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
@rust-timer
Unrolled build for rust-lang#134115
037cd0a 
Rollup merge of rust-lang#134115 - durin42:ppc64-target-string, r=jieyouxu

rustc_target: ppc64 target string fixes for LLVM 20

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

```@rustbot``` label: +llvm-main
@durin42 durin42 deleted the ppc64-target-string branch December 11, 2024 09:34
@jieyouxu jieyouxu added the O-PowerPC Target: PowerPC processors label Dec 11, 2024
@beetrees beetrees mentioned this pull request Dec 12, 2024
Closed
@cuviper cuviper mentioned this pull request Jan 22, 2025
Merged
tgross35 added a commit to tgross35/rust that referenced this pull request Feb 20, 2025
@tgross35
Remove i128 and u128 from improper_ctypes_definitions
ce734ba 
Rust's 128-bit integers have historically been incompatible with C [1].
However, there have been a number of changes in Rust and LLVM that
mean this is no longer the case:

* Incorrect alignment of `i128` on x86 [1]: adjusting Rust's alignment
  proposed at rust-lang/compiler-team#683,
  implemented at rust-lang#116672.
* LLVM version of the above: resolved in LLVM, including ABI fix.
  Present in LLVM18 (our minimum supported version).
* Incorrect alignment of `i128` on 64-bit PowerPC, SPARC, and MIPS [2]:
  Rust's data layouts adjusted at
  rust-lang#132422,
  rust-lang#132741,
  rust-lang#134115.
* LLVM version of the above: done in LLVM 20
  llvm/llvm-project#102783.
* Incorrect return convention of `i128` on Windows: adjusted to match
  GCC and Clang at rust-lang#134290.

At [3], the lang team considered it acceptable to remove `i128` from
`improper_ctypes_definitions` if the LLVM version is known to be
compatible. Time has elapsed since then and we have dropped support for
LLVM versions that do not have the x86 fixes, meaning a per-llvm-version
lint should no longer be necessary. The PowerPC, SPARC, and MIPS changes
only came in LLVM 20 but since Rust's datalayouts have also been updated
to match, we will be using the correct alignment regardless of LLVM
version.

Closes: rust-lang#134288
Closes: rust-lang#128950

[1]: rust-lang#54341
[2]: rust-lang#128950
[3]: rust-lang/lang-team#255 (comment)
@tgross35 tgross35 mentioned this pull request Feb 20, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) O-PowerPC Target: PowerPC processors 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.85.0
Development

Successfully merging this pull request may close these issues.
7 participants
@durin42 @rustbot @rust-log-analyzer @jieyouxu @bors @tgross35 @davidtwco