Skip to content

Commit cdb76c7

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#131781 - taiki-e:arm64ec-stabilize-asm, r=Amanieu,traviscross
Stabilize Arm64EC inline assembly This stabilizes inline assembly for Arm64EC ("Emulation Compatible"). Corresponding reference PR: rust-lang/reference#1653 --- From the requirements of stabilization mentioned in rust-lang#93335 > Each architecture needs to be reviewed before stabilization: > - It must have clobber_abi. Done in rust-lang#131332. > - It must be possible to clobber every register that is normally clobbered by a function call. This is possible from the time of the initial implementation. > - Generally review that the exposed register classes make sense. The registers available in this target are a subset of those available in the AArch64 inline assembly which is already stable. The following registers cannot be used in Arm64EC compared to AArch64: - `x13`, `x14`, `x23`, `x24`, `x28` (register class: `reg`) - `v[16-31]` (register class: `vreg`) - `p[0-15]`, `ffr` (clobber-only register class `preg`) These are disallowed by the ABI (see also [abi docs](https://learn.microsoft.com/en-us/cpp/build/arm64ec-windows-abi-conventions?view=msvc-170#register-mapping) for `reg`/`vreg` and rust-lang#131332 (comment) for `preg`). Although not listed in the above requirements, preserves_flags is also implemented and the same as AArch64. --- cc `@dpaoliello` r? `@Amanieu` `@rustbot` label O-windows O-AArch64 +A-inline-assembly +T-lang -T-compiler +needs-fcp
2 parents 2128d8d + 965a280 commit cdb76c7

File tree

5 files changed

+6
-33
lines changed

5 files changed

+6
-33
lines changed

‎compiler/rustc_ast_lowering/src/asm.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
4545
| asm::InlineAsmArch::X86_64
4646
| asm::InlineAsmArch::Arm
4747
| asm::InlineAsmArch::AArch64
48+
| asm::InlineAsmArch::Arm64EC
4849
| asm::InlineAsmArch::RiscV32
4950
| asm::InlineAsmArch::RiscV64
5051
| asm::InlineAsmArch::LoongArch64

‎src/doc/unstable-book/src/language-features/asm-experimental-arch.md‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
1818
- MSP430
1919
- M68k
2020
- CSKY
21-
- Arm64EC
2221
- SPARC
2322

2423
## Register classes
@@ -53,9 +52,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
5352
| CSKY | `freg` | `f[0-31]` | `f` |
5453
| SPARC | `reg` | `r[2-29]` | `r` |
5554
| SPARC | `yreg` | `y` | Only clobbers |
56-
| Arm64EC | `reg` | `x[0-12]`, `x[15-22]`, `x[25-27]`, `x30` | `r` |
57-
| Arm64EC | `vreg` | `v[0-15]` | `w` |
58-
| Arm64EC | `vreg_low16` | `v[0-15]` | `x` |
5955

6056
> **Notes**:
6157
> - NVPTX doesn't have a fixed register set, so named registers are not supported.
@@ -92,8 +88,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
9288
| CSKY | `freg` | None | `f32`, |
9389
| SPARC | `reg` | None | `i8`, `i16`, `i32`, `i64` (SPARC64 only) |
9490
| SPARC | `yreg` | N/A | Only clobbers |
95-
| Arm64EC | `reg` | None | `i8`, `i16`, `i32`, `f32`, `i64`, `f64` |
96-
| Arm64EC | `vreg` | None | `i8`, `i16`, `i32`, `f32`, `i64`, `f64`, <br> `i8x8`, `i16x4`, `i32x2`, `i64x1`, `f32x2`, `f64x1`, <br> `i8x16`, `i16x8`, `i32x4`, `i64x2`, `f32x4`, `f64x2` |
9791

9892
## Register aliases
9993

@@ -134,12 +128,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
134128
| SPARC | `r[8-15]` | `o[0-7]` |
135129
| SPARC | `r[16-23]` | `l[0-7]` |
136130
| SPARC | `r[24-31]` | `i[0-7]` |
137-
| Arm64EC | `x[0-30]` | `w[0-30]` |
138-
| Arm64EC | `x29` | `fp` |
139-
| Arm64EC | `x30` | `lr` |
140-
| Arm64EC | `sp` | `wsp` |
141-
| Arm64EC | `xzr` | `wzr` |
142-
| Arm64EC | `v[0-15]` | `b[0-15]`, `h[0-15]`, `s[0-15]`, `d[0-15]`, `q[0-15]` |
143131

144132
> **Notes**:
145133
> - TI does not mandate a frame pointer for MSP430, but toolchains are allowed
@@ -150,8 +138,8 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
150138
| Architecture | Unsupported register | Reason |
151139
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
152140
| All | `sp`, `r14`/`o6` (SPARC) | The stack pointer must be restored to its original value at the end of an asm code block. |
153-
| 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. |
154-
| All | `r19` (Hexagon), `r29` (PowerPC), `r30` (PowerPC), `x19` (Arm64EC) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
141+
| All | `fr` (Hexagon), `fp` (PowerPC), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r30`/`i6` (SPARC) | The frame pointer cannot be used as an input or output. |
142+
| All | `r19` (Hexagon), `r29` (PowerPC), `r30` (PowerPC) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
155143
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
156144
| MIPS | `$1` or `$at` | Reserved for assembler. |
157145
| MIPS | `$26`/`$k0`, `$27`/`$k1` | OS-reserved registers. |
@@ -176,9 +164,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
176164
| SPARC | `r5`/`g5` | Reserved for system. (SPARC32 only) |
177165
| SPARC | `r6`/`g6`, `r7`/`g7` | Reserved for system. |
178166
| SPARC | `r31`/`i7` | Return address cannot be used as inputs or outputs. |
179-
| Arm64EC | `xzr` | This is a constant zero register which can't be modified. |
180-
| Arm64EC | `x18` | This is an OS-reserved register. |
181-
| Arm64EC | `x13`, `x14`, `x23`, `x24`, `x28`, `v[16-31]` | These are AArch64 registers that are not supported for Arm64EC. |
182167

183168

184169
## Template modifiers
@@ -197,16 +182,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
197182
| SPARC | `reg` | None | `%o0` | None |
198183
| CSKY | `reg` | None | `r0` | None |
199184
| CSKY | `freg` | None | `f0` | None |
200-
| Arm64EC | `reg` | None | `x0` | `x` |
201-
| Arm64EC | `reg` | `w` | `w0` | `w` |
202-
| Arm64EC | `reg` | `x` | `x0` | `x` |
203-
| Arm64EC | `vreg` | None | `v0` | None |
204-
| Arm64EC | `vreg` | `v` | `v0` | None |
205-
| Arm64EC | `vreg` | `b` | `b0` | `b` |
206-
| Arm64EC | `vreg` | `h` | `h0` | `h` |
207-
| Arm64EC | `vreg` | `s` | `s0` | `s` |
208-
| Arm64EC | `vreg` | `d` | `d0` | `d` |
209-
| Arm64EC | `vreg` | `q` | `q0` | `q` |
210185

211186
# Flags covered by `preserves_flags`
212187

@@ -220,6 +195,3 @@ These flags registers must be restored upon exiting the asm block if the `preser
220195
- SPARC
221196
- Integer condition codes (`icc` and `xcc`)
222197
- Floating-point condition codes (`fcc[0-3]`)
223-
- Arm64EC
224-
- Condition flags (`NZCV` register).
225-
- Floating-point status (`FPSR` register).

‎tests/assembly/asm/aarch64-types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//@ [arm64ec] needs-llvm-components: aarch64
77
//@ compile-flags: -Zmerge-functions=disabled
88

9-
#![feature(no_core, lang_items, rustc_attrs, repr_simd, asm_experimental_arch, f16, f128)]
9+
#![feature(no_core, lang_items, rustc_attrs, repr_simd, f16, f128)]
1010
#![crate_type = "rlib"]
1111
#![no_core]
1212
#![allow(asm_sub_register, non_camel_case_types)]

‎tests/codegen/asm/arm64ec-clobbers.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ needs-llvm-components: aarch64
44

55
#![crate_type = "rlib"]
6-
#![feature(no_core, rustc_attrs, lang_items, asm_experimental_arch)]
6+
#![feature(no_core, rustc_attrs, lang_items)]
77
#![no_core]
88

99
#[lang = "sized"]

‎tests/ui/asm/aarch64/arm64ec-sve.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ needs-llvm-components: aarch64
44

55
#![crate_type = "rlib"]
6-
#![feature(no_core, rustc_attrs, lang_items, asm_experimental_arch)]
6+
#![feature(no_core, rustc_attrs, lang_items)]
77
#![no_core]
88

99
// SVE cannot be used for Arm64EC

0 commit comments

Comments
 (0)