Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
restrict cfg to arm and nightly_simd for floats
Browse files Browse the repository at this point in the history
jvdd committed Feb 24, 2024
1 parent 81842be commit 75d619d
Showing 6 changed files with 43 additions and 43 deletions.
24 changes: 12 additions & 12 deletions src/simd/simd_f16_ignore_nan.rs
Original file line number Diff line number Diff line change
@@ -29,14 +29,14 @@
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::config::SIMDInstructionSet;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::generic::{
impl_SIMDArgMinMax, impl_SIMDInit_FloatIgnoreNaN, SIMDArgMinMax, SIMDInit, SIMDOps,
@@ -45,14 +45,14 @@ use super::generic::{
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use crate::SCALAR;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use num_traits::Zero;
#[cfg(target_arch = "aarch64")]
@@ -68,7 +68,7 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use half::f16;

@@ -77,37 +77,37 @@ use half::f16;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::super::dtype_strategy::FloatIgnoreNaN;

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const BIT_SHIFT: i32 = 15;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const MASK_VALUE: i16 = 0x7FFF; // i16::MAX - masks everything but the sign bit
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const NAN_VALUE: i16 = 0x7C00; // absolute values above this are NaN

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
#[inline(always)]
fn _i16ord_to_f16(ord_i16: i16) -> f16 {
@@ -119,7 +119,7 @@ fn _i16ord_to_f16(ord_i16: i16) -> f16 {
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const MAX_INDEX: usize = i16::MAX as usize;

@@ -753,8 +753,8 @@ mod neon_ignore_nan {
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
all(target_arch = "arm", feature = "nightly_simd"),
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd"),
))]
#[cfg(test)]
mod tests {
20 changes: 10 additions & 10 deletions src/simd/simd_f16_return_nan.rs
Original file line number Diff line number Diff line change
@@ -31,21 +31,21 @@
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::config::SIMDInstructionSet;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::generic::{impl_SIMDInit_FloatReturnNaN, SIMDArgMinMax, SIMDInit, SIMDOps};
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use crate::SCALAR;
#[cfg(target_arch = "aarch64")]
@@ -61,7 +61,7 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use half::f16;

@@ -70,30 +70,30 @@ use half::f16;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::super::dtype_strategy::FloatReturnNaN;

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const BIT_SHIFT: i32 = 15;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const MASK_VALUE: i16 = 0x7FFF; // i16::MAX - masks everything but the sign bit

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
#[inline(always)]
fn _i16ord_to_f16(ord_i16: i16) -> f16 {
@@ -105,7 +105,7 @@ fn _i16ord_to_f16(ord_i16: i16) -> f16 {
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const MAX_INDEX: usize = i16::MAX as usize;

@@ -704,8 +704,8 @@ mod neon {
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
all(target_arch = "arm", feature = "nightly_simd"),
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd"),
))]
#[cfg(test)]
mod tests {
12 changes: 6 additions & 6 deletions src/simd/simd_f32_ignore_nan.rs
Original file line number Diff line number Diff line change
@@ -15,14 +15,14 @@
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::config::SIMDInstructionSet;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::generic::{
impl_SIMDArgMinMax, impl_SIMDInit_FloatIgnoreNaN, SIMDArgMinMax, SIMDInit, SIMDOps,
@@ -31,14 +31,14 @@ use super::generic::{
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
use crate::SCALAR;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
use num_traits::Zero;
#[cfg(target_arch = "aarch64")]
@@ -55,7 +55,7 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::super::dtype_strategy::FloatIgnoreNaN;

@@ -64,7 +64,7 @@ use super::super::dtype_strategy::FloatIgnoreNaN;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
const MAX_INDEX: usize = 1 << f32::MANTISSA_DIGITS;

18 changes: 9 additions & 9 deletions src/simd/simd_f32_return_nan.rs
Original file line number Diff line number Diff line change
@@ -32,21 +32,21 @@
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::config::SIMDInstructionSet;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::generic::{impl_SIMDInit_FloatReturnNaN, SIMDArgMinMax, SIMDInit, SIMDOps};
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use crate::SCALAR;
#[cfg(target_arch = "aarch64")]
@@ -63,38 +63,38 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::super::dtype_strategy::FloatReturnNaN;

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
use super::task::{max_index_value, min_index_value};

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
const BIT_SHIFT: i32 = 31;
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
const MASK_VALUE: i32 = 0x7FFFFFFF; // i32::MAX - masks everything but the sign bit

#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd")
))]
#[inline(always)]
fn _i32ord_to_f32(ord_i32: i32) -> f32 {
@@ -106,7 +106,7 @@ fn _i32ord_to_f32(ord_i32: i32) -> f32 {
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
feature = "nightly_simd"
all(target_arch = "arm", feature = "nightly_simd"),
))]
const MAX_INDEX: usize = i32::MAX as usize;

6 changes: 3 additions & 3 deletions src/simd/simd_f64_ignore_nan.rs
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_FloatIgnoreNaN};
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::generic::{SIMDArgMinMax, SIMDInit, SIMDOps};
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use crate::SCALAR;
#[cfg(any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64"))]
@@ -44,7 +44,7 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::super::dtype_strategy::FloatIgnoreNaN;

6 changes: 3 additions & 3 deletions src/simd/simd_f64_return_nan.rs
Original file line number Diff line number Diff line change
@@ -37,14 +37,14 @@ use super::generic::impl_SIMDInit_FloatReturnNaN;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::generic::{SIMDArgMinMax, SIMDInit, SIMDOps};
#[cfg(any(
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use crate::SCALAR;
#[cfg(target_arch = "aarch64")]
@@ -59,7 +59,7 @@ use std::arch::x86_64::*;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "aarch64",
all(target_arch = "arm", feature = "nightly_simd") // TODO: all like this?
all(target_arch = "arm", feature = "nightly_simd"),
))]
use super::super::dtype_strategy::FloatReturnNaN;

0 comments on commit 75d619d

Please sign in to comment.