Rollup merge of #131258 - taiki-e:s390x-stabilize-asm, r=Amanieu
Stabilize s390x inline assembly This stabilizes inline assembly for s390x (SystemZ). Corresponding reference PR: https://github.com/rust-lang/reference/pull/1643 --- From the requirements of stabilization mentioned in https://github.com/rust-lang/rust/issues/93335 > Each architecture needs to be reviewed before stabilization: > - It must have clobber_abi. Done in https://github.com/rust-lang/rust/pull/130630. > - It must be possible to clobber every register that is normally clobbered by a function call. Done in the PR that added support for clobber_abi. > - Generally review that the exposed register classes make sense. The followings can be used as input/output: - `reg` (`r[0-10]`, `r[12-14]`): General-purpose register - `reg_addr` (`r[1-10]`, `r[12-14]`): General-purpose register except `r0` which is evaluated as zero in an address context This class is needed because `r0`, which may be allocated when using the `reg` class, cannot be used as a register in certain contexts. This is identical to the `a` constraint in LLVM and GCC. See https://github.com/rust-lang/rust/pull/119431 for details. - `freg` (`f[0-15]`): Floating-point register The followings are clobber-only: - `vreg` (`v[0-31]`): Vector register Technically `vreg` should be able to accept `#[repr(simd)]` types as input/output if the unstable `vector` target feature added is enabled, but `core::arch` has no s390x vector type and both `#[repr(simd)]` and `core::simd` are unstable. Everything related is unstable, so the fact that this is currently a clobber-only should not be considered a stabilization blocker. (https://github.com/rust-lang/rust/issues/130869 tracks unstable stuff here) - `areg` (`a[2-15]`): Access register All of the above register classes except `reg_addr` are needed for `clobber_abi`. The followings cannot be used as operands for inline asm (see also [getReservedRegs](https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp#L258-L282) and [SystemZELFRegisters](https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h#L107-L128) in LLVM): - `r11`: frame pointer - `r15`: stack pointer - `a0`, `a1`: Reserved for system use - `c[0-15]` (control register) Reserved by the kernel Although not listed in the above requirements, `preserves_flags` is implemented in https://github.com/rust-lang/rust/pull/111331. --- cc ``@uweigand`` r? ``@Amanieu`` ``@rustbot`` label +O-SystemZ +A-inline-assembly
This commit is contained in:
commit
2f98dcf9ba
@ -48,6 +48,7 @@ pub(crate) fn lower_inline_asm(
|
|||||||
| asm::InlineAsmArch::RiscV32
|
| asm::InlineAsmArch::RiscV32
|
||||||
| asm::InlineAsmArch::RiscV64
|
| asm::InlineAsmArch::RiscV64
|
||||||
| asm::InlineAsmArch::LoongArch64
|
| asm::InlineAsmArch::LoongArch64
|
||||||
|
| asm::InlineAsmArch::S390x
|
||||||
);
|
);
|
||||||
if !is_stable && !self.tcx.features().asm_experimental_arch() {
|
if !is_stable && !self.tcx.features().asm_experimental_arch() {
|
||||||
feature_err(
|
feature_err(
|
||||||
|
@ -18,7 +18,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
- MSP430
|
- MSP430
|
||||||
- M68k
|
- M68k
|
||||||
- CSKY
|
- CSKY
|
||||||
- s390x
|
|
||||||
- Arm64EC
|
- Arm64EC
|
||||||
- SPARC
|
- SPARC
|
||||||
|
|
||||||
@ -52,11 +51,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
| M68k | `reg_addr` | `a[0-3]` | `a` |
|
| M68k | `reg_addr` | `a[0-3]` | `a` |
|
||||||
| CSKY | `reg` | `r[0-31]` | `r` |
|
| CSKY | `reg` | `r[0-31]` | `r` |
|
||||||
| CSKY | `freg` | `f[0-31]` | `f` |
|
| CSKY | `freg` | `f[0-31]` | `f` |
|
||||||
| s390x | `reg` | `r[0-10]`, `r[12-14]` | `r` |
|
|
||||||
| s390x | `reg_addr` | `r[1-10]`, `r[12-14]` | `a` |
|
|
||||||
| s390x | `freg` | `f[0-15]` | `f` |
|
|
||||||
| s390x | `vreg` | `v[0-31]` | Only clobbers |
|
|
||||||
| s390x | `areg` | `a[2-15]` | Only clobbers |
|
|
||||||
| SPARC | `reg` | `r[2-29]` | `r` |
|
| SPARC | `reg` | `r[2-29]` | `r` |
|
||||||
| SPARC | `yreg` | `y` | Only clobbers |
|
| SPARC | `yreg` | `y` | Only clobbers |
|
||||||
| Arm64EC | `reg` | `x[0-12]`, `x[15-22]`, `x[25-27]`, `x30` | `r` |
|
| Arm64EC | `reg` | `x[0-12]`, `x[15-22]`, `x[25-27]`, `x30` | `r` |
|
||||||
@ -96,10 +90,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
| M68k | `reg_data` | None | `i8`, `i16`, `i32` |
|
| M68k | `reg_data` | None | `i8`, `i16`, `i32` |
|
||||||
| CSKY | `reg` | None | `i8`, `i16`, `i32` |
|
| CSKY | `reg` | None | `i8`, `i16`, `i32` |
|
||||||
| CSKY | `freg` | None | `f32`, |
|
| CSKY | `freg` | None | `f32`, |
|
||||||
| s390x | `reg`, `reg_addr` | None | `i8`, `i16`, `i32`, `i64` |
|
|
||||||
| s390x | `freg` | None | `f32`, `f64` |
|
|
||||||
| s390x | `vreg` | N/A | Only clobbers |
|
|
||||||
| s390x | `areg` | N/A | Only clobbers |
|
|
||||||
| SPARC | `reg` | None | `i8`, `i16`, `i32`, `i64` (SPARC64 only) |
|
| SPARC | `reg` | None | `i8`, `i16`, `i32`, `i64` (SPARC64 only) |
|
||||||
| SPARC | `yreg` | N/A | Only clobbers |
|
| SPARC | `yreg` | N/A | Only clobbers |
|
||||||
| Arm64EC | `reg` | None | `i8`, `i16`, `i32`, `f32`, `i64`, `f64` |
|
| Arm64EC | `reg` | None | `i8`, `i16`, `i32`, `f32`, `i64`, `f64` |
|
||||||
@ -159,8 +149,8 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
|
|
||||||
| Architecture | Unsupported register | Reason |
|
| Architecture | Unsupported register | Reason |
|
||||||
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| All | `sp`, `r15` (s390x), `r14`/`o6` (SPARC) | The stack pointer must be restored to its original value at the end of an asm code block. |
|
| All | `sp`, `r14`/`o6` (SPARC) | The stack pointer must be restored to its original value at the end of an asm code block. |
|
||||||
| All | `fr` (Hexagon), `fp` (PowerPC), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r11` (s390x), `r30`/`i6` (SPARC), `x29` (Arm64EC) | The frame pointer cannot be used as an input or output. |
|
| All | `fr` (Hexagon), `fp` (PowerPC), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r30`/`i6` (SPARC), `x29` (Arm64EC) | The frame pointer cannot be used as an input or output. |
|
||||||
| All | `r19` (Hexagon), `r29` (PowerPC), `r30` (PowerPC), `x19` (Arm64EC) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
|
| All | `r19` (Hexagon), `r29` (PowerPC), `r30` (PowerPC), `x19` (Arm64EC) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
|
||||||
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
|
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
|
||||||
| MIPS | `$1` or `$at` | Reserved for assembler. |
|
| MIPS | `$1` or `$at` | Reserved for assembler. |
|
||||||
@ -181,8 +171,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
| CSKY | `r15` | This is the link register. |
|
| CSKY | `r15` | This is the link register. |
|
||||||
| CSKY | `r[26-30]` | Reserved by its ABI. |
|
| CSKY | `r[26-30]` | Reserved by its ABI. |
|
||||||
| CSKY | `r31` | This is the TLS register. |
|
| CSKY | `r31` | This is the TLS register. |
|
||||||
| s390x | `c[0-15]` | Reserved by the kernel. |
|
|
||||||
| s390x | `a[0-1]` | Reserved for system use. |
|
|
||||||
| SPARC | `r0`/`g0` | This is always zero and cannot be used as inputs or outputs. |
|
| SPARC | `r0`/`g0` | This is always zero and cannot be used as inputs or outputs. |
|
||||||
| SPARC | `r1`/`g1` | Used internally by LLVM. |
|
| SPARC | `r1`/`g1` | Used internally by LLVM. |
|
||||||
| SPARC | `r5`/`g5` | Reserved for system. (SPARC32 only) |
|
| SPARC | `r5`/`g5` | Reserved for system. (SPARC32 only) |
|
||||||
@ -206,9 +194,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
|
|||||||
| PowerPC | `reg` | None | `0` | None |
|
| PowerPC | `reg` | None | `0` | None |
|
||||||
| PowerPC | `reg_nonzero` | None | `3` | None |
|
| PowerPC | `reg_nonzero` | None | `3` | None |
|
||||||
| PowerPC | `freg` | None | `0` | None |
|
| PowerPC | `freg` | None | `0` | None |
|
||||||
| s390x | `reg` | None | `%r0` | None |
|
|
||||||
| s390x | `reg_addr` | None | `%r1` | None |
|
|
||||||
| s390x | `freg` | None | `%f0` | None |
|
|
||||||
| SPARC | `reg` | None | `%o0` | None |
|
| SPARC | `reg` | None | `%o0` | None |
|
||||||
| CSKY | `reg` | None | `r0` | None |
|
| CSKY | `reg` | None | `r0` | None |
|
||||||
| CSKY | `freg` | None | `f0` | None |
|
| CSKY | `freg` | None | `f0` | None |
|
||||||
@ -232,8 +217,6 @@ These flags registers must be restored upon exiting the asm block if the `preser
|
|||||||
- The status register `r2`.
|
- The status register `r2`.
|
||||||
- M68k
|
- M68k
|
||||||
- The condition code register `ccr`.
|
- The condition code register `ccr`.
|
||||||
- s390x
|
|
||||||
- The condition code register `cc`.
|
|
||||||
- SPARC
|
- SPARC
|
||||||
- Integer condition codes (`icc` and `xcc`)
|
- Integer condition codes (`icc` and `xcc`)
|
||||||
- Floating-point condition codes (`fcc[0-3]`)
|
- Floating-point condition codes (`fcc[0-3]`)
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
//@[s390x] needs-llvm-components: systemz
|
//@[s390x] needs-llvm-components: systemz
|
||||||
//@ compile-flags: -Zmerge-functions=disabled
|
//@ compile-flags: -Zmerge-functions=disabled
|
||||||
|
|
||||||
#![feature(no_core, lang_items, rustc_attrs, repr_simd, asm_experimental_arch)]
|
#![feature(no_core, lang_items, rustc_attrs, repr_simd)]
|
||||||
#![crate_type = "rlib"]
|
#![crate_type = "rlib"]
|
||||||
#![no_core]
|
#![no_core]
|
||||||
#![allow(asm_sub_register, non_camel_case_types)]
|
#![allow(asm_sub_register, non_camel_case_types)]
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
//@[s390x] needs-llvm-components: systemz
|
//@[s390x] needs-llvm-components: systemz
|
||||||
|
|
||||||
#![crate_type = "rlib"]
|
#![crate_type = "rlib"]
|
||||||
#![feature(no_core, rustc_attrs, lang_items, asm_experimental_arch)]
|
#![feature(no_core, rustc_attrs, lang_items)]
|
||||||
#![no_core]
|
#![no_core]
|
||||||
|
|
||||||
#[lang = "sized"]
|
#[lang = "sized"]
|
||||||
|
Loading…
Reference in New Issue
Block a user