未验证 提交 10d60b73 编写于 作者: T tianshuo78520a 提交者: GitHub

Fix eigen build (#56774)

* Fix eigen build

* Fix

* Fix
上级 67c84c45
diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h diff --git a/old/Complex.h b/new/Complex.h
index f6f1b8c..2f4e7d1 100644 index f6f1b8c..7558e8c 100644
--- a/Eigen/src/Core/arch/SSE/Complex.h --- a/old/Complex.h
+++ b/Eigen/src/Core/arch/SSE/Complex.h +++ b/new/Complex.h
@@ -17,7 +17,7 @@ namespace internal { @@ -17,7 +17,7 @@ namespace internal {
//---------- float ---------- //---------- float ----------
struct Packet2cf struct Packet2cf
...@@ -11,3 +11,28 @@ index f6f1b8c..2f4e7d1 100644 ...@@ -11,3 +11,28 @@ index f6f1b8c..2f4e7d1 100644
EIGEN_STRONG_INLINE explicit Packet2cf(const __m128& a) : v(a) {} EIGEN_STRONG_INLINE explicit Packet2cf(const __m128& a) : v(a) {}
__m128 v; __m128 v;
}; };
@@ -113,19 +113,13 @@ template<> EIGEN_STRONG_INLINE Packet2cf ploadu<Packet2cf>(const std::complex<fl
template<> EIGEN_STRONG_INLINE Packet2cf pset1<Packet2cf>(const std::complex<float>& from)
{
Packet2cf res;
-#if EIGEN_GNUC_AT_MOST(4,2)
- // Workaround annoying "may be used uninitialized in this function" warning with gcc 4.2
- res.v = _mm_loadl_pi(_mm_set1_ps(0.0f), reinterpret_cast<const __m64*>(&from));
-#elif EIGEN_GNUC_AT_LEAST(4,6)
- // Suppress annoying "may be used uninitialized in this function" warning with gcc >= 4.6
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
- res.v = _mm_loadl_pi(res.v, (const __m64*)&from);
- #pragma GCC diagnostic pop
+#ifdef EIGEN_VECTORIZE_SSE3
+ res.v = _mm_castpd_ps(_mm_loaddup_pd(reinterpret_cast<double const*>(&from)));
#else
- res.v = _mm_loadl_pi(res.v, (const __m64*)&from);
+ res.v = _mm_castpd_ps(_mm_load_sd(reinterpret_cast<double const*>(&from)));
+ res.v = _mm_movelh_ps(res.v, res.v);
#endif
- return Packet2cf(_mm_movelh_ps(res.v,res.v));
+ return res;
}
template<> EIGEN_STRONG_INLINE Packet2cf ploaddup<Packet2cf>(const std::complex<float>* from) { return pset1<Packet2cf>(*from); }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册