extract s390x vector and friends to their own rust feature

Author: folkertdev

compiler/rustc_feature/src/unstable.rs

@@ -333,6 +333,7 @@ declare_features! (
     (unstable, riscv_target_feature, "1.45.0", Some(44839)),
     (unstable, rtm_target_feature, "1.35.0", Some(44839)),
     (unstable, s390x_target_feature, "1.82.0", Some(44839)),
+    (unstable, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
     (unstable, sparc_target_feature, "1.84.0", Some(132783)),
     (unstable, wasm_target_feature, "1.30.0", Some(44839)),
     (unstable, x87_target_feature, "1.85.0", Some(44839)),

compiler/rustc_span/src/symbol.rs

@@ -1956,6 +1956,7 @@ symbols! {
         rwpi,
         s,
         s390x_target_feature,
+        s390x_target_feature_vector,
         safety,
         sanitize,
         sanitizer_cfi_generalize_pointers,

compiler/rustc_target/src/target_features.rs

@@ -845,20 +845,20 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
     ("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
     ("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
     ("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature), &[]),
-    ("nnp-assist", Unstable(sym::s390x_target_feature), &["vector"]),
+    ("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature_vector), &[]),
+    ("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature_vector), &[]),
+    ("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature_vector), &[]),
+    ("nnp-assist", Unstable(sym::s390x_target_feature_vector), &["vector"]),
     ("soft-float", Forbidden { reason: "currently unsupported ABI-configuration feature" }, &[]),
     ("transactional-execution", Unstable(sym::s390x_target_feature), &[]),
-    ("vector", Unstable(sym::s390x_target_feature), &[]),
-    ("vector-enhancements-1", Unstable(sym::s390x_target_feature), &["vector"]),
-    ("vector-enhancements-2", Unstable(sym::s390x_target_feature), &["vector-enhancements-1"]),
-    ("vector-enhancements-3", Unstable(sym::s390x_target_feature), &["vector-enhancements-2"]),
-    ("vector-packed-decimal", Unstable(sym::s390x_target_feature), &["vector"]),
-    ("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature), &["vector-packed-decimal"]),
-    ("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement"]),
-    ("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement-2"]),
+    ("vector", Unstable(sym::s390x_target_feature_vector), &[]),
+    ("vector-enhancements-1", Unstable(sym::s390x_target_feature_vector), &["vector"]),
+    ("vector-enhancements-2", Unstable(sym::s390x_target_feature_vector), &["vector-enhancements-1"]),
+    ("vector-enhancements-3", Unstable(sym::s390x_target_feature_vector), &["vector-enhancements-2"]),
+    ("vector-packed-decimal", Unstable(sym::s390x_target_feature_vector), &["vector"]),
+    ("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal"]),
+    ("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal-enhancement"]),
+    ("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal-enhancement-2"]),
     // tidy-alphabetical-end
 ];
 

library/core/src/lib.rs

@@ -202,6 +202,7 @@
 #![feature(riscv_target_feature)]
 #![feature(rtm_target_feature)]
 #![feature(s390x_target_feature)]
+#![feature(s390x_target_feature_vector)]
 #![feature(wasm_target_feature)]
 #![feature(x86_amx_intrinsics)]
 // tidy-alphabetical-end

library/stdarch/crates/core_arch/src/lib.rs

@@ -22,7 +22,7 @@
     arm_target_feature,
     mips_target_feature,
     powerpc_target_feature,
-    s390x_target_feature,
+    s390x_target_feature_vector,
     loongarch_target_feature,
     wasm_target_feature,
     abi_unadjusted,

tests/assembly-llvm/s390x-vector-abi.rs

@@ -12,7 +12,7 @@
 //@[z13_no_vector] compile-flags: --target s390x-unknown-linux-gnu -C target-cpu=z13 -C target-feature=-vector --cfg no_vector
 //@[z13_no_vector] needs-llvm-components: systemz
 
-#![feature(no_core, lang_items, repr_simd, s390x_target_feature)]
+#![feature(no_core, lang_items, repr_simd, s390x_target_feature_vector)]
 #![no_core]
 #![crate_type = "lib"]
 #![allow(non_camel_case_types)]

tests/codegen-llvm/s390x-simd.rs

@@ -6,7 +6,7 @@
 
 #![crate_type = "rlib"]
 #![feature(no_core, asm_experimental_arch)]
-#![feature(s390x_target_feature, simd_ffi, intrinsics, repr_simd)]
+#![feature(s390x_target_feature_vector, simd_ffi, intrinsics, repr_simd)]
 #![no_core]
 
 extern crate minicore;

tests/codegen-llvm/simd/extract-insert-dyn.rs

@@ -5,7 +5,7 @@
     repr_simd,
     arm_target_feature,
     mips_target_feature,
-    s390x_target_feature,
+    s390x_target_feature_vector,
     riscv_target_feature
 )]
 #![no_std]

tests/ui/abi/simd-abi-checks-s390x.rs

@@ -10,7 +10,7 @@
 //@[z13_soft_float] needs-llvm-components: systemz
 //[z13_soft_float]~? WARN must be disabled to ensure that the ABI of the current target can be implemented correctly
 
-#![feature(no_core, repr_simd, s390x_target_feature)]
+#![feature(no_core, repr_simd, s390x_target_feature_vector)]
 #![no_core]
 #![crate_type = "lib"]
 #![allow(non_camel_case_types, improper_ctypes_definitions)]

tests/ui/target-feature/gate.rs

@@ -17,6 +17,7 @@
 // gate-test-lahfsahf_target_feature
 // gate-test-prfchw_target_feature
 // gate-test-s390x_target_feature
+// gate-test-s390x_target_feature_vector
 // gate-test-sparc_target_feature
 // gate-test-x87_target_feature
 // gate-test-m68k_target_feature