diff options
author | Antonio Sanchez <cantonios@google.com> | 2021-06-16 14:36:42 -0700 |
---|---|---|
committer | Antonio Sanchez <cantonios@google.com> | 2021-06-16 18:41:17 -0700 |
commit | 12e8d57108c50d8a63605c6eb0144c838c128337 (patch) | |
tree | 2b3e2cd885e153d50cd6794f22e9b3f07186e81c /Eigen/src/Geometry/arch/Geometry_SIMD.h | |
parent | ef1fd341a895fda883f655102f371fa8b41f2088 (diff) |
Remove pset, replace with ploadu.
We can't make guarantees on alignment for existing calls to `pset`,
so we should default to loading unaligned. But in that case, we should
just use `ploadu` directly. For loading constants, this load should hopefully
get optimized away.
This is causing segfaults in Google Maps.
Diffstat (limited to 'Eigen/src/Geometry/arch/Geometry_SIMD.h')
-rw-r--r-- | Eigen/src/Geometry/arch/Geometry_SIMD.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Eigen/src/Geometry/arch/Geometry_SIMD.h b/Eigen/src/Geometry/arch/Geometry_SIMD.h index 89ac92062..9af6a9af7 100644 --- a/Eigen/src/Geometry/arch/Geometry_SIMD.h +++ b/Eigen/src/Geometry/arch/Geometry_SIMD.h @@ -28,8 +28,9 @@ struct quat_product<Architecture::Target, Derived, OtherDerived, float> evaluator<typename Derived::Coefficients> ae(_a.coeffs()); evaluator<typename OtherDerived::Coefficients> be(_b.coeffs()); Quaternion<float> res; - float arr[4] = {0.f, 0.f, 0.f, -0.f}; - const Packet4f mask = pset<Packet4f>(arr); + const float neg_zero = numext::bit_cast<float>(0x80000000u); + const float arr[4] = {0.f, 0.f, 0.f, neg_zero}; + const Packet4f mask = ploadu<Packet4f>(arr); Packet4f a = ae.template packet<AAlignment,Packet4f>(0); Packet4f b = be.template packet<BAlignment,Packet4f>(0); Packet4f s1 = pmul(vec4f_swizzle1(a,1,2,0,2),vec4f_swizzle1(b,2,0,1,2)); @@ -55,8 +56,9 @@ struct quat_conj<Architecture::Target, Derived, float> { evaluator<typename Derived::Coefficients> qe(q.coeffs()); Quaternion<float> res; - float arr[4] = {-0.f,-0.f,-0.f,0.f}; - const Packet4f mask = pset<Packet4f>(arr); + const float neg_zero = numext::bit_cast<float>(0x80000000u); + const float arr[4] = {neg_zero, neg_zero, neg_zero,0.f}; + const Packet4f mask = ploadu<Packet4f>(arr); pstoret<float,Packet4f,ResAlignment>(&res.x(), pxor(mask, qe.template packet<traits<Derived>::Alignment,Packet4f>(0))); return res; } @@ -147,10 +149,10 @@ struct quat_conj<Architecture::Target, Derived, double> evaluator<typename Derived::Coefficients> qe(q.coeffs()); Quaternion<double> res; const double neg_zero = numext::bit_cast<double>(0x8000000000000000ull); - double arr1[2] = {neg_zero, neg_zero}; - double arr2[2] = {neg_zero, 0.0}; - const Packet2d mask0 = pset<Packet2d>(arr1); - const Packet2d mask2 = pset<Packet2d>(arr2); + const double arr1[2] = {neg_zero, neg_zero}; + const double arr2[2] = {neg_zero, 0.0}; + const Packet2d mask0 = ploadu<Packet2d>(arr1); + const Packet2d mask2 = ploadu<Packet2d>(arr2); pstoret<double,Packet2d,ResAlignment>(&res.x(), pxor(mask0, qe.template packet<traits<Derived>::Alignment,Packet2d>(0))); pstoret<double,Packet2d,ResAlignment>(&res.z(), pxor(mask2, qe.template packet<traits<Derived>::Alignment,Packet2d>(2))); return res; |