s390x: f16 vectors in assembly

Author: folkertdev

compiler/rustc_codegen_llvm/src/asm.rs

@@ -1043,6 +1043,12 @@ fn llvm_fixup_input<'ll, 'tcx>(
         ) if element.primitive() == Primitive::Float(Float::F16) => {
             bx.bitcast(value, bx.type_vector(bx.type_i16(), count))
         }
+        (S390x(S390xInlineAsmRegClass::vreg), BackendRepr::SimdVector { element, count: 8 })
+            if element.primitive() == Primitive::Float(Float::F16)
+                && !any_target_feature_enabled(bx, instance, &[sym::nnp_assist]) =>
+        {
+            bx.bitcast(value, bx.type_vector(bx.type_i16(), 8))
+        }
         (LoongArch(LoongArchInlineAsmRegClass::freg), BackendRepr::Scalar(s))
             if s.primitive() == Primitive::Float(Float::F16) =>
         {

compiler/rustc_span/src/symbol.rs

@@ -1556,6 +1556,7 @@ symbols! {
         next,
         niko,
         nll,
+        nnp_assist: "nnp-assist",
         no,
         no_builtins,
         no_core,

compiler/rustc_target/src/asm/s390x.rs

@@ -48,7 +48,7 @@ impl S390xInlineAsmRegClass {
                     // non-clobber-only vector register support is unstable.
                     types! {
                         vector: I32, F32, I64, F64, I128, F128,
-                            VecI8(16), VecI16(8), VecI32(4), VecI64(2), VecF32(4), VecF64(2);
+                            VecI8(16), VecI16(8), VecI32(4), VecI64(2), VecF16(8), VecF32(4), VecF64(2);
                     }
                 } else {
                     &[]

tests/assembly-llvm/asm/s390x-types.rs

@@ -1,13 +1,15 @@
 //@ add-minicore
-//@ revisions: s390x s390x_vector
+//@ revisions: s390x s390x_vector s390x_nnp_assist
 //@ assembly-output: emit-asm
 //@[s390x] compile-flags: --target s390x-unknown-linux-gnu
 //@[s390x] needs-llvm-components: systemz
 //@[s390x_vector] compile-flags: --target s390x-unknown-linux-gnu -C target-feature=+vector
 //@[s390x_vector] needs-llvm-components: systemz
+//@[s390x_nnp_assist] compile-flags: --target s390x-unknown-linux-gnu -C target-feature=+nnp-assist --cfg=s390x_vector
+//@[s390x_nnp_assist] needs-llvm-components: systemz
 //@ compile-flags: -Zmerge-functions=disabled
 
-#![feature(no_core, repr_simd, f128)]
+#![feature(no_core, repr_simd, f16, f128)]
 #![cfg_attr(s390x_vector, feature(asm_experimental_reg))]
 #![crate_type = "rlib"]
 #![no_core]
@@ -27,6 +29,8 @@ pub struct i32x4([i32; 4]);
 #[repr(simd)]
 pub struct i64x2([i64; 2]);
 #[repr(simd)]
+pub struct f16x8([f16; 8]);
+#[repr(simd)]
 pub struct f32x4([f32; 4]);
 #[repr(simd)]
 pub struct f64x2([f64; 2]);
@@ -35,6 +39,7 @@ impl Copy for i8x16 {}
 impl Copy for i16x8 {}
 impl Copy for i32x4 {}
 impl Copy for i64x2 {}
+impl Copy for f16x8 {}
 impl Copy for f32x4 {}
 impl Copy for f64x2 {}
 
@@ -173,6 +178,13 @@ check!(vreg_i32x4, i32x4, vreg, "vlr");
 #[cfg(s390x_vector)]
 check!(vreg_i64x2, i64x2, vreg, "vlr");
 
+// s390x_vector-LABEL: vreg_f16x8:
+// s390x_vector: #APP
+// s390x_vector: vlr %v{{[0-9]+}}, %v{{[0-9]+}}
+// s390x_vector: #NO_APP
+#[cfg(s390x_vector)]
+check!(vreg_f16x8, f16x8, vreg, "vlr");
+
 // s390x_vector-LABEL: vreg_f32x4:
 // s390x_vector: #APP
 // s390x_vector: vlr %v{{[0-9]+}}, %v{{[0-9]+}}
@@ -293,6 +305,13 @@ check_reg!(v0_i32x4, i32x4, "v0", "vlr");
 #[cfg(s390x_vector)]
 check_reg!(v0_i64x2, i64x2, "v0", "vlr");
 
+// s390x_vector-LABEL: v0_f16x8:
+// s390x_vector: #APP
+// s390x_vector: vlr %v0, %v0
+// s390x_vector: #NO_APP
+#[cfg(s390x_vector)]
+check_reg!(v0_f16x8, f16x8, "v0", "vlr");
+
 // s390x_vector-LABEL: v0_f32x4:
 // s390x_vector: #APP
 // s390x_vector: vlr %v0, %v0

tests/ui/asm/s390x/bad-reg.s390x_vector.stderr

@@ -282,23 +282,23 @@ error: type `u8` cannot be used with this register class
 LL |         asm!("", in("v0") b);
    |                           ^
    |
-   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f32x4, f64x2
+   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f16x8, f32x4, f64x2
 
 error: type `u8` cannot be used with this register class
   --> $DIR/bad-reg.rs:95:28
    |
 LL |         asm!("", out("v0") b);
    |                            ^
    |
-   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f32x4, f64x2
+   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f16x8, f32x4, f64x2
 
 error: type `u8` cannot be used with this register class
   --> $DIR/bad-reg.rs:108:35
    |
 LL |         asm!("/* {} */", in(vreg) b);
    |                                   ^
    |
-   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f32x4, f64x2
+   = note: register class `vreg` supports these types: i32, f32, i64, f64, i128, f128, i8x16, i16x8, i32x4, i64x2, f16x8, f32x4, f64x2
 
 error: type `i32` cannot be used with this register class
   --> $DIR/bad-reg.rs:120:27