Skip to content

Commit

Permalink
refactor run-time detection module
Browse files Browse the repository at this point in the history
  • Loading branch information
gnzlbg committed Mar 9, 2018
1 parent 701f167 commit a7f5eb3
Show file tree
Hide file tree
Showing 28 changed files with 1,032 additions and 948 deletions.
8 changes: 5 additions & 3 deletions coresimd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,17 @@ pub mod arch {
/// Platform-specific intrinsics for the `mips` platform.
///
/// See the [module documentation](../index.html) for more details.
#[cfg(target_arch = "mips")]
#[cfg(any(target_arch = "mips", dox))]
#[doc(cfg(target_arch = "mips"))]
pub mod mips {
pub use coresimd::mips::*;
}

/// Platform-specific intrinsics for the `mips64` platform.
///
/// See the [module documentation](../index.html) for more details.
#[cfg(target_arch = "mips64")]
#[cfg(any(target_arch = "mips64", dox))]
#[doc(cfg(target_arch = "mips64"))]
pub mod mips64 {
pub use coresimd::mips::*;
}
Expand All @@ -117,7 +119,7 @@ mod aarch64;
#[cfg(target_arch = "wasm32")]
mod wasm32;

#[cfg(any(target_arch = "mips", target_arch = "mips64"))]
#[cfg(any(target_arch = "mips", target_arch = "mips64", dox))]
mod mips;

mod nvptx;
7 changes: 7 additions & 0 deletions crates/stdsimd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ extern crate std;
mod stdsimd;

pub use stdsimd::*;

#[allow(unused_imports)]
use _std::prelude;
#[allow(unused_imports)]
use _std::fs;
#[allow(unused_imports)]
use _std::io;
228 changes: 0 additions & 228 deletions stdsimd/arch/detect/aarch64.rs

This file was deleted.

100 changes: 100 additions & 0 deletions stdsimd/arch/detect/arch/aarch64.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
//! Aarch64 run-time features.

#[macro_export]
#[unstable(feature = "stdsimd", issue = "0")]
macro_rules! is_aarch64_feature_detected {
("neon") => {
// FIXME: this should be removed once we rename Aarch64 neon to asimd
cfg!(target_feature = "neon") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::asimd)
};
("asimd") => {
cfg!(target_feature = "neon") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::asimd)
};
("pmull") => {
cfg!(target_feature = "pmull") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::pmull)
};
("fp") => {
cfg!(target_feature = "fp") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::fp)
};
("fp16") => {
cfg!(target_feature = "fp16") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::fp16)
};
("sve") => {
cfg!(target_feature = "sve") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::sve)
};
("crc") => {
cfg!(target_feature = "crc") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::crc)
};
("crypto") => {
cfg!(target_feature = "crypto") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::crypto)
};
("lse") => {
cfg!(target_feature = "lse") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::lse)
};
("rdm") => {
cfg!(target_feature = "rdm") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::rdm)
};
("rcpc") => {
cfg!(target_feature = "rcpc") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::rcpc)
};
("dotprod") => {
cfg!(target_feature = "dotprot") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::dotprod)
};
("ras") => {
compile_error!("\"ras\" feature cannot be detected at run-time")
};
("v8.1a") => {
compile_error!("\"v8.1a\" feature cannot be detected at run-time")
};
("v8.2a") => {
compile_error!("\"v8.2a\" feature cannot be detected at run-time")
};
("v8.3a") => {
compile_error!("\"v8.3a\" feature cannot be detected at run-time")
};
($t:tt) => { compile_error!(concat!("unknown aarch64 target feature: ", $t)) };
}

/// ARM Aarch64 CPU Feature enum. Each variant denotes a position in a bitset
/// for a particular feature.
///
/// PLEASE: do not use this, it is an implementation detail subject to change.
#[doc(hidden)]
#[allow(non_camel_case_types)]
#[repr(u8)]
pub enum Feature {
/// ARM Advanced SIMD (ASIMD)
asimd,
/// Polynomial Multiply
pmull,
/// Floating point support
fp,
/// Half-float support.
fp16,
/// Scalable Vector Extension (SVE)
sve,
/// CRC32 (Cyclic Redundancy Check)
crc,
/// Crypto: AES + PMULL + SHA1 + SHA2
crypto,
/// Atomics (Large System Extension)
lse,
/// Rounding Double Multiply (ASIMDRDM)
rdm,
/// Release consistent Processor consistent (RcPc)
rcpc,
/// Vector Dot-Product (ASIMDDP)
dotprod,
}
29 changes: 29 additions & 0 deletions stdsimd/arch/detect/arch/arm.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//! Run-time feature detection on ARM Aarch32.

#[macro_export]
#[unstable(feature = "stdsimd", issue = "0")]
macro_rules! is_arm_feature_detected {
("neon") => {
cfg!(target_feature = "neon") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::neon)
};
("pmull") => {
cfg!(target_feature = "pmull") ||
$crate::arch::detect::check_for($crate::arch::detect::Feature::pmull)
};
($t:tt) => { compile_error!(concat!("unknown arm target feature: ", $t)) };
}

/// ARM CPU Feature enum. Each variant denotes a position in a bitset for a
/// particular feature.
///
/// PLEASE: do not use this, it is an implementation detail subject to change.
#[doc(hidden)]
#[allow(non_camel_case_types)]
#[repr(u8)]
pub enum Feature {
/// ARM Advanced SIMD (NEON) - Aarch32
neon,
/// Polynomial Multiply
pmull,
}
Loading

0 comments on commit a7f5eb3

Please sign in to comment.