diff options
| author | Caleb Zulawski <caleb.zulawski@gmail.com> | 2021-03-12 20:09:31 -0500 |
|---|---|---|
| committer | Caleb Zulawski <caleb.zulawski@gmail.com> | 2021-04-09 16:31:03 -0400 |
| commit | 3fae09bd08b4ffacd3f81cc6ec13772e99d29796 (patch) | |
| tree | 1f8a098201ed96208f5e0565a743be0f771eb8a7 | |
| parent | b51febbd348924a4cee970ef302dcaf5ff0fac18 (diff) | |
| download | rust-3fae09bd08b4ffacd3f81cc6ec13772e99d29796.tar.gz rust-3fae09bd08b4ffacd3f81cc6ec13772e99d29796.zip | |
Revert "Revert i586 fix, fix test instead"
This reverts commit 1ea2f128821339d8050ca936f24b71677352437e.
| -rw-r--r-- | crates/core_simd/src/reduction.rs | 14 | ||||
| -rw-r--r-- | crates/core_simd/tests/ops_macros.rs | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/crates/core_simd/src/reduction.rs b/crates/core_simd/src/reduction.rs index 177669ff444..e59bf93baa3 100644 --- a/crates/core_simd/src/reduction.rs +++ b/crates/core_simd/src/reduction.rs @@ -59,13 +59,23 @@ macro_rules! impl_float_reductions { /// Produces the sum of the lanes of the vector. #[inline] pub fn sum(self) -> $scalar { - unsafe { crate::intrinsics::simd_reduce_add_ordered(self, 0.) } + // f32 SIMD sum is inaccurate on i586 + if cfg!(all(target_arch = "x86", not(target_feature = "sse2"))) && core::mem::size_of::<$scalar>() == 4 { + self.as_slice().iter().sum() + } else { + unsafe { crate::intrinsics::simd_reduce_add_ordered(self, 0.) } + } } /// Produces the sum of the lanes of the vector. #[inline] pub fn product(self) -> $scalar { - unsafe { crate::intrinsics::simd_reduce_mul_ordered(self, 1.) } + // f32 SIMD product is inaccurate on i586 + if cfg!(all(target_arch = "x86", not(target_feature = "sse2"))) && core::mem::size_of::<$scalar>() == 4 { + self.as_slice().iter().product() + } else { + unsafe { crate::intrinsics::simd_reduce_mul_ordered(self, 1.) } + } } /// Returns the maximum lane in the vector. diff --git a/crates/core_simd/tests/ops_macros.rs b/crates/core_simd/tests/ops_macros.rs index 59e923ac5c1..2b65d514623 100644 --- a/crates/core_simd/tests/ops_macros.rs +++ b/crates/core_simd/tests/ops_macros.rs @@ -483,7 +483,7 @@ macro_rules! impl_float_tests { test_helpers::test_1(&|x| { test_helpers::prop_assert_biteq! ( Vector::<LANES>::from_array(x).sum(), - x.iter().sum(), + x.iter().copied().fold(0 as Scalar, <Scalar as core::ops::Add>::add), ); Ok(()) }); @@ -493,7 +493,7 @@ macro_rules! impl_float_tests { test_helpers::test_1(&|x| { test_helpers::prop_assert_biteq! ( Vector::<LANES>::from_array(x).product(), - x.iter().product(), + x.iter().copied().fold(1. as Scalar, <Scalar as core::ops::Mul>::mul), ); Ok(()) }); |