Skip to content

Commit 6217d58

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#145656 - folkertdev:stabilize-s390x-vector, r=Amanieu
Stabilize s390x `vector` target feature and `is_s390x_feature_detected!` macro closes rust-lang#145649 closes rust-lang#135413 cc: rust-lang#130869 reference PR: rust-lang/reference#1972 # Stabilization report ## Summary This PR stabilizes the following s390x target features: - `vector` - `vector-enhancements-1` - `vector-enhancements-2` - `vector-enhancements-3` - `vector-packed-decimal` - `vector-packed-decimal-enhancement` - `vector-packed-decimal-enhancement-2` - `vector-packed-decimal-enhancement-3` - `nnp-assist` - `miscellaneous-extensions-2` - `miscellaneous-extensions-3` - `miscellaneous-extensions-4` Additionally, it stabilizes the `std::arch::is_s390x_feature_detected!` macro itself and stably accepts the target features listed above. ## Tests & ABI details Only the `vector` target feature changes the ABI, much like e.g. `avx2` it will, depending on the ABI, pass vector types in vector registers. This behavior is tested extensively: - [tests/assembly-llvm/s390x-vector-abi.rs](https://github.com/rust-lang/rust/blob/22a86f8280becb12c34ee3efd952baf5cf086fa0/tests/assembly-llvm/s390x-vector-abi.rs) - [tests/codegen-llvm/s390x-simd.rs](https://github.com/rust-lang/rust/blob/22a86f8280becb12c34ee3efd952baf5cf086fa0/tests/assembly-llvm/s390x-vector-abi.rs) - [tests/ui/abi/simd-abi-checks-s390x.rs ](https://github.com/rust-lang/rust/blob/22a86f8280becb12c34ee3efd952baf5cf086fa0/tests/ui/abi/simd-abi-checks-s390x.rs ) The remaining features don't influence the ABI, they only influence instruction selection. In stdarch we test that the expected instructions are in fact generated when the target feature is enabled. ## Implementation history For `is_s390x_feature_detected!`: - rust-lang/stdarch#1699 - rust-lang#138275 - rust-lang/stdarch#1720 - rust-lang/stdarch#1832 For `vector` and friends - rust-lang#127506 - rust-lang#135630 - rust-lang#141250 ## Unresolved questions There is a fixme in [tests/ui/abi/simd-abi-checks-s390x.rs](https://github.com/rust-lang/rust/blob/22a86f8280becb12c34ee3efd952baf5cf086fa0/tests/ui/abi/simd-abi-checks-s390x.rs): ``` // FIXME: +soft-float itself doesn't set -vector //`@[z13_soft_float]` compile-flags: --target s390x-unknown-linux-gnu -C target-cpu=z13 -C target-feature=-vector,+soft-float //`@[z13_soft_float]` needs-llvm-components: systemz ``` I'm not sure whether that blocks stabilization? --- The implementation first extracts the listed target features into their own `s390x_target_feature_vector` rust feature, and then stabilizes that. best reviewed commit-by-commit r? `@Amanieu` cc `@uweigand` `@taiki-e`
2 parents 401ae55 + 3c3e62b commit 6217d58

File tree

21 files changed

+245
-301
lines changed

21 files changed

+245
-301
lines changed

‎compiler/rustc_feature/src/accepted.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ declare_features! (
387387
(accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611)),
388388
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
389389
(accepted, rvalue_static_promotion, "1.21.0", Some(38865)),
390+
/// Allows use of the `vector` and related s390x target features.
391+
(accepted, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
390392
/// Allows `Self` in type definitions (RFC 2300).
391393
(accepted, self_in_typedefs, "1.32.0", Some(49303)),
392394
/// Allows `Self` struct constructor (RFC 2302).

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,7 @@ symbols! {
20002000
s,
20012001
s390x,
20022002
s390x_target_feature,
2003+
s390x_target_feature_vector,
20032004
safety,
20042005
sanitize,
20052006
sanitizer_cfi_generalize_pointers,

‎compiler/rustc_target/src/target_features.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -844,20 +844,20 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
844844
("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
845845
("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
846846
("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
847-
("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature), &[]),
848-
("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature), &[]),
849-
("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature), &[]),
850-
("nnp-assist", Unstable(sym::s390x_target_feature), &["vector"]),
847+
("miscellaneous-extensions-2", Stable, &[]),
848+
("miscellaneous-extensions-3", Stable, &[]),
849+
("miscellaneous-extensions-4", Stable, &[]),
850+
("nnp-assist", Stable, &["vector"]),
851851
("soft-float", Forbidden { reason: "currently unsupported ABI-configuration feature" }, &[]),
852852
("transactional-execution", Unstable(sym::s390x_target_feature), &[]),
853-
("vector", Unstable(sym::s390x_target_feature), &[]),
854-
("vector-enhancements-1", Unstable(sym::s390x_target_feature), &["vector"]),
855-
("vector-enhancements-2", Unstable(sym::s390x_target_feature), &["vector-enhancements-1"]),
856-
("vector-enhancements-3", Unstable(sym::s390x_target_feature), &["vector-enhancements-2"]),
857-
("vector-packed-decimal", Unstable(sym::s390x_target_feature), &["vector"]),
858-
("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature), &["vector-packed-decimal"]),
859-
("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement"]),
860-
("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement-2"]),
853+
("vector", Stable, &[]),
854+
("vector-enhancements-1", Stable, &["vector"]),
855+
("vector-enhancements-2", Stable, &["vector-enhancements-1"]),
856+
("vector-enhancements-3", Stable, &["vector-enhancements-2"]),
857+
("vector-packed-decimal", Stable, &["vector"]),
858+
("vector-packed-decimal-enhancement", Stable, &["vector-packed-decimal"]),
859+
("vector-packed-decimal-enhancement-2", Stable, &["vector-packed-decimal-enhancement"]),
860+
("vector-packed-decimal-enhancement-3", Stable, &["vector-packed-decimal-enhancement-2"]),
861861
// tidy-alphabetical-end
862862
];
863863

‎library/std/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ pub mod arch {
672672
pub use std_detect::is_loongarch_feature_detected;
673673
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
674674
pub use std_detect::is_riscv_feature_detected;
675-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
675+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
676676
pub use std_detect::is_s390x_feature_detected;
677677
#[stable(feature = "simd_x86", since = "1.27.0")]
678678
pub use std_detect::is_x86_feature_detected;

‎library/std/tests/run-time-detect.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")),
99
feature(stdarch_aarch64_feature_detection)
1010
)]
11-
#![cfg_attr(
12-
all(target_arch = "s390x", target_os = "linux"),
13-
feature(stdarch_s390x_feature_detection)
14-
)]
1511
#![cfg_attr(
1612
all(target_arch = "powerpc", target_os = "linux"),
1713
feature(stdarch_powerpc_feature_detection)

‎library/std_detect/src/detect/arch/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ cfg_select! {
6060
pub use loongarch::*;
6161
}
6262
target_arch = "s390x" => {
63-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
63+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
6464
pub use s390x::*;
6565
}
6666
_ => {

‎library/std_detect/src/detect/arch/s390x.rs‎

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,76 +6,53 @@ features! {
66
@MACRO_NAME: is_s390x_feature_detected;
77
@MACRO_ATTRS:
88
/// Checks if `s390x` feature is enabled.
9-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
10-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] concurrent_functions: "concurrent-functions";
9+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
10+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] concurrent_functions: "concurrent-functions";
1111
/// s390x concurrent-functions facility
12-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
13-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] deflate_conversion: "deflate-conversion";
12+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] deflate_conversion: "deflate-conversion";
1413
/// s390x deflate-conversion facility
15-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
16-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] enhanced_sort: "enhanced-sort";
14+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] enhanced_sort: "enhanced-sort";
1715
/// s390x enhanced-sort facility
18-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
19-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] guarded_storage: "guarded-storage";
16+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] guarded_storage: "guarded-storage";
2017
/// s390x guarded-storage facility
21-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
22-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] high_word: "high-word";
18+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] high_word: "high-word";
2319
/// s390x high-word facility
24-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
25-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension3: "message-security-assist-extension3";
20+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension3: "message-security-assist-extension3";
2621
/// s390x message-security-assist-extension3 facility
27-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
28-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension4: "message-security-assist-extension4";
22+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension4: "message-security-assist-extension4";
2923
/// s390x message-security-assist-extension4 facility
30-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
31-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension5: "message-security-assist-extension5";
24+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension5: "message-security-assist-extension5";
3225
/// s390x message-security-assist-extension5 facility
33-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
34-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension8: "message-security-assist-extension8";
26+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension8: "message-security-assist-extension8";
3527
/// s390x message-security-assist-extension8 facility
36-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
37-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension9: "message-security-assist-extension9";
28+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension9: "message-security-assist-extension9";
3829
/// s390x message-security-assist-extension9 facility
39-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
40-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] message_security_assist_extension12: "message-security-assist-extension12";
30+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension12: "message-security-assist-extension12";
4131
/// s390x message-security-assist-extension12 facility
42-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
43-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] miscellaneous_extensions_2: "miscellaneous-extensions-2";
32+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_2: "miscellaneous-extensions-2";
4433
/// s390x miscellaneous-extensions-2 facility
45-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
46-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] miscellaneous_extensions_3: "miscellaneous-extensions-3";
34+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_3: "miscellaneous-extensions-3";
4735
/// s390x miscellaneous-extensions-3 facility
48-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
49-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] miscellaneous_extensions_4: "miscellaneous-extensions-4";
36+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_4: "miscellaneous-extensions-4";
5037
/// s390x miscellaneous-extensions-4 facility
51-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
52-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] nnp_assist: "nnp-assist";
38+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] nnp_assist: "nnp-assist";
5339
/// s390x nnp-assist facility
54-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
55-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] transactional_execution: "transactional-execution";
40+
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] transactional_execution: "transactional-execution";
5641
/// s390x transactional-execution facility
57-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
58-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector: "vector";
42+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector: "vector";
5943
/// s390x vector facility
60-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
61-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_enhancements_1: "vector-enhancements-1";
44+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_1: "vector-enhancements-1";
6245
/// s390x vector-enhancements-1 facility
63-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
64-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_enhancements_2: "vector-enhancements-2";
46+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_2: "vector-enhancements-2";
6547
/// s390x vector-enhancements-2 facility
66-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
67-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_enhancements_3: "vector-enhancements-3";
48+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_3: "vector-enhancements-3";
6849
/// s390x vector-enhancements-3 facility
69-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
70-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_packed_decimal: "vector-packed-decimal";
50+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal: "vector-packed-decimal";
7151
/// s390x vector-packed-decimal facility
72-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
73-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_packed_decimal_enhancement: "vector-packed-decimal-enhancement";
52+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement: "vector-packed-decimal-enhancement";
7453
/// s390x vector-packed-decimal-enhancement facility
75-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
76-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_packed_decimal_enhancement_2: "vector-packed-decimal-enhancement-2";
54+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement_2: "vector-packed-decimal-enhancement-2";
7755
/// s390x vector-packed-decimal-enhancement-2 facility
78-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
79-
@FEATURE: #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")] vector_packed_decimal_enhancement_3: "vector-packed-decimal-enhancement-3";
56+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement_3: "vector-packed-decimal-enhancement-3";
8057
/// s390x vector-packed-decimal-enhancement-3 facility
8158
}

‎library/std_detect/tests/cpu-detection.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
)]
1212
#![cfg_attr(target_arch = "powerpc", feature(stdarch_powerpc_feature_detection))]
1313
#![cfg_attr(target_arch = "powerpc64", feature(stdarch_powerpc_feature_detection))]
14-
#![cfg_attr(target_arch = "s390x", feature(stdarch_s390x_feature_detection))]
1514
#![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
1615

1716
#[cfg_attr(

‎library/std_detect/tests/macro_trailing_commas.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
any(target_arch = "powerpc", target_arch = "powerpc64"),
2626
feature(stdarch_powerpc_feature_detection)
2727
)]
28-
#![cfg_attr(target_arch = "s390x", feature(stdarch_s390x_feature_detection))]
2928
#![cfg_attr(
3029
any(target_arch = "riscv32", target_arch = "riscv64"),
3130
feature(stdarch_riscv_feature_detection)

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
arm_target_feature,
2323
mips_target_feature,
2424
powerpc_target_feature,
25-
s390x_target_feature,
2625
loongarch_target_feature,
2726
wasm_target_feature,
2827
abi_unadjusted,
@@ -64,11 +63,7 @@
6463
)]
6564
#![cfg_attr(
6665
test,
67-
feature(
68-
stdarch_arm_feature_detection,
69-
stdarch_powerpc_feature_detection,
70-
stdarch_s390x_feature_detection
71-
)
66+
feature(stdarch_arm_feature_detection, stdarch_powerpc_feature_detection,)
7267
)]
7368

7469
#[cfg(test)]

0 commit comments

Comments
 (0)