diff options
| author |  Benoit Jacob <benoitjacob@google.com> | 2016-02-10 11:11:49 -0500 |
|---|---|---|
| committer | Benoit Jacob <benoitjacob@google.com> | 2016-02-10 11:11:49 -0500 |
| commit | e6ee18d6b46229b0028c454db5f389001649bd45 (patch) | |
| tree | 1f473ffb644c0155a564ba170a08969108e30775 /Eigen | |
| parent | 2ac59e5d36452156d842964e675fb82818b5d46c (diff) | |
Make the GCC workaround for sqrt GCC-only; detect Emscripten as non-GCC
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/arch/SSE/MathFunctions.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Eigen/src/Core/arch/SSE/MathFunctions.h b/Eigen/src/Core/arch/SSE/MathFunctions.h index 67cc3b3ba..5236f5b9a 100644 --- a/Eigen/src/Core/arch/SSE/MathFunctions.h +++ b/Eigen/src/Core/arch/SSE/MathFunctions.h @@ -531,7 +531,9 @@ template<> EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE double sqrt(const double &x) { -#if EIGEN_COMP_GNUC && !defined(EMSCRIPTEN) +#if EIGEN_COMP_GNUC_STRICT + // This works around a GCC bug generating poor code for _mm_sqrt_pd + // See https://bitbucket.org/eigen/eigen/commits/14f468dba4d350d7c19c9b93072e19f7b3df563b return internal::pfirst(internal::Packet2d(__builtin_ia32_sqrtsd(_mm_set_sd(x)))); #else return internal::pfirst(internal::Packet2d(_mm_sqrt_pd(_mm_set_sd(x)))); diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index c11251fcb..fc456d407 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -99,9 +99,16 @@ #define EIGEN_COMP_ARM 0 #endif +/// \internal EIGEN_COMP_ARM set to 1 if the compiler is ARM Compiler +#if defined(EMSCRIPTEN) + #define EIGEN_COMP_EMSCRIPTEN 1 +#else + #define EIGEN_COMP_EMSCRIPTEN 0 +#endif + /// \internal EIGEN_GNUC_STRICT set to 1 if the compiler is really GCC and not a compatible compiler (e.g., ICC, clang, mingw, etc.) -#if EIGEN_COMP_GNUC && !(EIGEN_COMP_CLANG || EIGEN_COMP_ICC || EIGEN_COMP_MINGW || EIGEN_COMP_PGI || EIGEN_COMP_IBM || EIGEN_COMP_ARM ) +#if EIGEN_COMP_GNUC && !(EIGEN_COMP_CLANG || EIGEN_COMP_ICC || EIGEN_COMP_MINGW || EIGEN_COMP_PGI || EIGEN_COMP_IBM || EIGEN_COMP_ARM || EIGEN_COMP_EMSCRIPTEN) #define EIGEN_COMP_GNUC_STRICT 1 #else #define EIGEN_COMP_GNUC_STRICT 0 |