diff options
| author | bors <bors@rust-lang.org> | 2022-02-11 20:41:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-11 20:41:51 +0000 |
| commit | e789f3a3a3d96ebf99b7bbd95011527e5be32a11 (patch) | |
| tree | e89bdddfc1fbcae40def2de48bf1fb4f4665c1d3 | |
| parent | 6499c5e7fc173a3f55b7a3bd1e6a50e9edef782d (diff) | |
| parent | 93b5bfbc48189c4bd7e2ad7a9681452c7f08d84b (diff) | |
| download | rust-e789f3a3a3d96ebf99b7bbd95011527e5be32a11.tar.gz rust-e789f3a3a3d96ebf99b7bbd95011527e5be32a11.zip | |
Auto merge of #90271 - adamgemmell:dev/feat-detect-stabilise, r=Amanieu
Stabilise `is_aarch64_feature_detected!` under `simd_aarch64` feature Initial implementation, looking for feedback on the approach here. https://github.com/rust-lang/rust/issues/86941 One point I noticed was that I haven't seen different "since" versions for the same feature - does this mean that other features can't be added to to the `simd_aarch64` feature once this is in stable? If so it might need a more specific name. r? `@Amanieu`
| -rw-r--r-- | library/std/src/lib.rs | 7 | ||||
| -rw-r--r-- | library/std/tests/run-time-detect.rs | 6 | ||||
| m--------- | library/stdarch | 0 |
3 files changed, 7 insertions, 6 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 2aae29f2154..82f0291decb 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -546,13 +546,14 @@ pub mod arch { #[doc(no_inline)] // Note (#82861): required for correct documentation pub use core::arch::*; + #[stable(feature = "simd_aarch64", since = "1.60.0")] + pub use std_detect::is_aarch64_feature_detected; #[stable(feature = "simd_x86", since = "1.27.0")] pub use std_detect::is_x86_feature_detected; #[unstable(feature = "stdsimd", issue = "48556")] pub use std_detect::{ - is_aarch64_feature_detected, is_arm_feature_detected, is_mips64_feature_detected, - is_mips_feature_detected, is_powerpc64_feature_detected, is_powerpc_feature_detected, - is_riscv_feature_detected, + is_arm_feature_detected, is_mips64_feature_detected, is_mips_feature_detected, + is_powerpc64_feature_detected, is_powerpc_feature_detected, is_riscv_feature_detected, }; } diff --git a/library/std/tests/run-time-detect.rs b/library/std/tests/run-time-detect.rs index 14a9e3acca4..54873f5549b 100644 --- a/library/std/tests/run-time-detect.rs +++ b/library/std/tests/run-time-detect.rs @@ -3,10 +3,9 @@ #![cfg_attr( any( all(target_arch = "arm", any(target_os = "linux", target_os = "android")), - all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")), + all(bootstrap, target_arch = "aarch64", any(target_os = "linux", target_os = "android")), all(target_arch = "powerpc", target_os = "linux"), all(target_arch = "powerpc64", target_os = "linux"), - any(target_arch = "x86", target_arch = "x86_64"), ), feature(stdsimd) )] @@ -46,7 +45,8 @@ fn aarch64_linux() { println!("flagm: {}", is_aarch64_feature_detected!("flagm")); println!("ssbs: {}", is_aarch64_feature_detected!("ssbs")); println!("sb: {}", is_aarch64_feature_detected!("sb")); - println!("pauth: {}", is_aarch64_feature_detected!("pauth")); + println!("paca: {}", is_aarch64_feature_detected!("paca")); + println!("pacg: {}", is_aarch64_feature_detected!("pacg")); println!("dpb: {}", is_aarch64_feature_detected!("dpb")); println!("dpb2: {}", is_aarch64_feature_detected!("dpb2")); println!("sve2: {}", is_aarch64_feature_detected!("sve2")); diff --git a/library/stdarch b/library/stdarch -Subproject eaee02ffdf5d820729ccdf2f95fa08b08c7d24d +Subproject 863d31b8e1314e15d124384e5eaa9ab21e12bd7 |