diff options
Diffstat (limited to 'Eigen/src')
-rw-r--r-- | Eigen/src/Core/Block.h | 16 | ||||
-rw-r--r-- | Eigen/src/Core/CwiseNullaryOp.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/PacketMath.h | 93 | ||||
-rw-r--r-- | Eigen/src/Core/Product.h | 6 | ||||
-rwxr-xr-x | Eigen/src/Core/Triangular.h | 2 |
5 files changed, 105 insertions, 14 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 3b777a153..6c00e0ba8 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -390,6 +390,8 @@ Block<Derived> MatrixBase<Derived> { switch(type) { + default: + ei_assert(false && "Bad corner type."); case TopLeft: return Block<Derived>(derived(), 0, 0, cRows, cCols); case TopRight: @@ -398,8 +400,6 @@ Block<Derived> MatrixBase<Derived> return Block<Derived>(derived(), rows() - cRows, 0, cRows, cCols); case BottomRight: return Block<Derived>(derived(), rows() - cRows, cols() - cCols, cRows, cCols); - default: - ei_assert(false && "Bad corner type."); } } @@ -410,6 +410,8 @@ const Block<Derived> MatrixBase<Derived> { switch(type) { + default: + ei_assert(false && "Bad corner type."); case TopLeft: return Block<Derived>(derived(), 0, 0, cRows, cCols); case TopRight: @@ -418,8 +420,6 @@ const Block<Derived> MatrixBase<Derived> return Block<Derived>(derived(), rows() - cRows, 0, cRows, cCols); case BottomRight: return Block<Derived>(derived(), rows() - cRows, cols() - cCols, cRows, cCols); - default: - ei_assert(false && "Bad corner type."); } } @@ -442,6 +442,8 @@ Block<Derived, CRows, CCols> MatrixBase<Derived> { switch(type) { + default: + ei_assert(false && "Bad corner type."); case TopLeft: return Block<Derived, CRows, CCols>(derived(), 0, 0); case TopRight: @@ -450,8 +452,6 @@ Block<Derived, CRows, CCols> MatrixBase<Derived> return Block<Derived, CRows, CCols>(derived(), rows() - CRows, 0); case BottomRight: return Block<Derived, CRows, CCols>(derived(), rows() - CRows, cols() - CCols); - default: - ei_assert(false && "Bad corner type."); } } @@ -463,6 +463,8 @@ const Block<Derived, CRows, CCols> MatrixBase<Derived> { switch(type) { + default: + ei_assert(false && "Bad corner type."); case TopLeft: return Block<Derived, CRows, CCols>(derived(), 0, 0); case TopRight: @@ -471,8 +473,6 @@ const Block<Derived, CRows, CCols> MatrixBase<Derived> return Block<Derived, CRows, CCols>(derived(), rows() - CRows, 0); case BottomRight: return Block<Derived, CRows, CCols>(derived(), rows() - CRows, cols() - CCols); - default: - ei_assert(false && "Bad corner type."); } } diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 8123fe104..e603280bf 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -406,7 +406,7 @@ template<typename Derived> bool MatrixBase<Derived>::isOnes (typename NumTraits<Scalar>::Real prec) const { - return isEqualToConstant(Scalar(1)); + return isEqualToConstant(Scalar(1), prec); } /** Sets all coefficients in this expression to one. diff --git a/Eigen/src/Core/PacketMath.h b/Eigen/src/Core/PacketMath.h index 5a5f15dad..140dcdde5 100644 --- a/Eigen/src/Core/PacketMath.h +++ b/Eigen/src/Core/PacketMath.h @@ -25,6 +25,10 @@ #ifndef EIGEN_PACKET_MATH_H #define EIGEN_PACKET_MATH_H +#ifndef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD +#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 16 +#endif + // Default implementation for types not supported by the vectorization. // In practice these functions are provided to make easier the writting // of generic vectorized code. However, at runtime, they should never be @@ -53,6 +57,11 @@ template <typename Scalar> inline Scalar ei_pfirst(const Scalar& a) { return a; #ifdef EIGEN_VECTORIZE_SSE +#ifdef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD +#undef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD +#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 16 +#endif + template<> struct ei_packet_traits<float> { typedef __m128 type; enum {size=4}; }; template<> struct ei_packet_traits<double> { typedef __m128d type; enum {size=2}; }; template<> struct ei_packet_traits<int> { typedef __m128i type; enum {size=4}; }; @@ -116,7 +125,89 @@ inline float ei_pfirst(const __m128& a) { return _mm_cvtss_f32(a); } inline double ei_pfirst(const __m128d& a) { return _mm_cvtsd_f64(a); } inline int ei_pfirst(const __m128i& a) { return _mm_cvtsi128_si32(a); } -#endif // EIGEN_VECTORIZE_SSE +#elif defined(EIGEN_VECTORIZE_ALTIVEC) + +#ifdef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD +#undef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD +#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 4 +#endif + +static const vector int v0i = vec_splat_u32(0); +static const vector int v16i_ = vec_splat_u32(-16); +static const vector float v0f = (vector float) v0i; + +template<> struct ei_packet_traits<float> { typedef vector float type; enum {size=4}; }; +template<> struct ei_packet_traits<int> { typedef vector int type; enum {size=4}; }; + +inline vector float ei_padd(const vector float a, const vector float b) { return vec_add(a,b); } +inline vector int ei_padd(const vector int a, const vector int b) { return vec_add(a,b); } + +inline vector float ei_psub(const vector float a, const vector float b) { return vec_sub(a,b); } +inline vector int ei_psub(const vector int a, const vector int b) { return vec_sub(a,b); } + +inline vector float ei_pmul(const vector float a, const vector float b) { return vec_madd(a,b, v0f); } +inline vector int ei_pmul(const vector int a, const vector int b) +{ + // Taken from http:// + + //Set up constants + vector int bswap, lowProduct, highProduct; + + //Do real work + bswap = vec_rl( (vector unsigned int)b, (vector unsigned int)v16i_ ); + lowProduct = vec_mulo( (vector short)a,(vector short)b ); + highProduct = vec_msum((vector short)a,(vector short)bswap, v0i); + highProduct = vec_sl( (vector unsigned int)highProduct, (vector unsigned int)v16i_ ); + return vec_add( lowProduct, highProduct ); +} + +inline vector float ei_pmadd(const vector float a, const vector float b, const vector float c) { return vec_madd(a, b, c); } + +inline vector float ei_pmin(const vector float a, const vector float b) { return vec_min(a,b); } +inline vector int ei_pmin(const vector int a, const vector int b) { return vec_min(a,b); } + +inline vector float ei_pmax(const vector float a, const vector float b) { return vec_max(a,b); } +inline vector int ei_pmax(const vector int a, const vector int b) { return vec_max(a,b); } + +inline vector float ei_pload(const float* from) { return vec_ld(0, from); } +inline vector int ei_pload(const int* from) { return vec_ld(0, from); } + +inline vector float ei_pset1(const float& from) +{ + static float __attribute__(aligned(16)) af[4]; + af[0] = from; + vector float vc = vec_ld(0, af); + vc = vec_splat(vc, 0); + return vc; +} + +inline vector int ei_pset1(const int& from) +{ + static int __attribute__(aligned(16)) ai[4]; + ai[0] = from; + vector int vc = vec_ld(0, ai); + vc = vec_splat(vc, 0); + return vc; +} + +inline void ei_pstore(float* to, const vector float from) { vec_st(from, 0, to); } +inline void ei_pstore(int* to, const vector int from) { vec_st(from, 0, to); } + +inline float ei_pfirst(const vector float a) +{ + static float __attribute__(aligned(16)) af[4]; + vec_st(a, 0, af); + return af[0]; +} + +inline int ei_pfirst(const vector int a) +{ + static int __attribute__(aligned(16)) ai[4]; + vec_st(a, 0, ai); + return ai[0]; +} + +#endif // EIGEN_VECTORIZE_ALTIVEC & SSE #endif // EIGEN_PACKET_MATH_H diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h index e7ee1dc6a..160d437fa 100644 --- a/Eigen/src/Core/Product.h +++ b/Eigen/src/Core/Product.h @@ -133,9 +133,9 @@ template<typename Product> struct ProductPacketCoeffImpl<Product, false> { */ template<typename Lhs, typename Rhs> struct ei_product_eval_mode { - enum{ value = Lhs::MaxRowsAtCompileTime >= 16 - && Rhs::MaxColsAtCompileTime >= 16 - && (!( (Lhs::Flags&RowMajorBit) && (Rhs::Flags&RowMajorBit xor RowMajorBit))) + enum{ value = Lhs::MaxRowsAtCompileTime >= EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD + && Rhs::MaxColsAtCompileTime >= EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD + && (!( (Lhs::Flags&RowMajorBit) && ((Rhs::Flags&RowMajorBit) ^ RowMajorBit))) ? CacheOptimalProduct : NormalProduct }; }; diff --git a/Eigen/src/Core/Triangular.h b/Eigen/src/Core/Triangular.h index c867b8483..7d5884de3 100755 --- a/Eigen/src/Core/Triangular.h +++ b/Eigen/src/Core/Triangular.h @@ -67,7 +67,7 @@ struct ei_traits<Triangular<Mode, MatrixType> > ColsAtCompileTime = MatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, - Flags = _MatrixTypeNested::Flags & (~(VectorizableBit | Like1DArrayBit)) | Mode, + Flags = (_MatrixTypeNested::Flags & ~(VectorizableBit | Like1DArrayBit)) | Mode, CoeffReadCost = _MatrixTypeNested::CoeffReadCost }; }; |