From b0896382a3d9d7ab31dee8a6c8c8256fd13a14e2 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Wed, 7 Jul 2010 11:10:46 +0200 Subject: [PATCH] s/IsVectorized/Vectorizable --- Eigen/src/Core/Functors.h | 2 +- Eigen/src/Core/GenericPacketMath.h | 2 +- Eigen/src/Core/arch/AltiVec/PacketMath.h | 4 ++-- Eigen/src/Core/arch/NEON/PacketMath.h | 4 ++-- Eigen/src/Core/arch/SSE/Complex.h | 4 ++-- Eigen/src/Core/arch/SSE/PacketMath.h | 6 +++--- Eigen/src/Core/products/GeneralMatrixVector.h | 14 +++++++------- Eigen/src/Core/util/XprHelper.h | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Eigen/src/Core/Functors.h b/Eigen/src/Core/Functors.h index ac5aa67c4..9084905aa 100644 --- a/Eigen/src/Core/Functors.h +++ b/Eigen/src/Core/Functors.h @@ -492,7 +492,7 @@ struct ei_scalar_constant_op { template struct ei_functor_traits > // FIXME replace this packet test by a safe one -{ enum { Cost = 1, PacketAccess = ei_packet_traits::IsVectorized, IsRepeatable = true }; }; +{ enum { Cost = 1, PacketAccess = ei_packet_traits::Vectorizable, IsRepeatable = true }; }; template struct ei_scalar_identity_op { EIGEN_EMPTY_STRUCT_CTOR(ei_scalar_identity_op) diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h index 6fb3eea19..77b1d748e 100644 --- a/Eigen/src/Core/GenericPacketMath.h +++ b/Eigen/src/Core/GenericPacketMath.h @@ -83,7 +83,7 @@ template struct ei_packet_traits : ei_default_packet_traits { typedef T type; enum { - IsVectorized = 0, + Vectorizable = 0, size = 1 }; enum { diff --git a/Eigen/src/Core/arch/AltiVec/PacketMath.h b/Eigen/src/Core/arch/AltiVec/PacketMath.h index 403624167..9e6a375ea 100644 --- a/Eigen/src/Core/arch/AltiVec/PacketMath.h +++ b/Eigen/src/Core/arch/AltiVec/PacketMath.h @@ -87,7 +87,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits { typedef Packet4f type; enum { - IsVectorized = 1, + Vectorizable = 1, size=4, // FIXME check the Has* @@ -103,7 +103,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits typedef Packet4i type; enum { // FIXME check the Has* - IsVectorized = 1, + Vectorizable = 1, size=4 }; }; diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index 2d6a71723..aaa27b56d 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -61,7 +61,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits { typedef Packet4f type; enum { - IsVectorized = 1, + Vectorizable = 1, size = 4, // FIXME check the Has* @@ -76,7 +76,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits { typedef Packet4i type; enum { - IsVectorized = 1, + Vectorizable = 1, size=4 // FIXME check the Has* }; diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h index 54c0ccbec..6833dee0b 100644 --- a/Eigen/src/Core/arch/SSE/Complex.h +++ b/Eigen/src/Core/arch/SSE/Complex.h @@ -37,7 +37,7 @@ template<> struct ei_packet_traits > : ei_default_packet_tr { typedef Packet2cf type; enum { - IsVectorized = 1, + Vectorizable = 1, size = 2, HasAdd = 1, @@ -210,7 +210,7 @@ template<> struct ei_packet_traits > : ei_default_packet_t { typedef Packet1cd type; enum { - IsVectorized = 1, + Vectorizable = 1, size = 1, HasAdd = 1, diff --git a/Eigen/src/Core/arch/SSE/PacketMath.h b/Eigen/src/Core/arch/SSE/PacketMath.h index 43b8ef488..05c101652 100644 --- a/Eigen/src/Core/arch/SSE/PacketMath.h +++ b/Eigen/src/Core/arch/SSE/PacketMath.h @@ -63,7 +63,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits { typedef Packet4f type; enum { - IsVectorized = 1, + Vectorizable = 1, size=4, HasDiv = 1, @@ -78,7 +78,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits { typedef Packet2d type; enum { - IsVectorized = 1, + Vectorizable = 1, size=2, HasDiv = 1 @@ -89,7 +89,7 @@ template<> struct ei_packet_traits : ei_default_packet_traits typedef Packet4i type; enum { // FIXME check the Has* - IsVectorized = 1, + Vectorizable = 1, size=4 }; }; diff --git a/Eigen/src/Core/products/GeneralMatrixVector.h b/Eigen/src/Core/products/GeneralMatrixVector.h index 4df13f3be..cf5c509ba 100644 --- a/Eigen/src/Core/products/GeneralMatrixVector.h +++ b/Eigen/src/Core/products/GeneralMatrixVector.h @@ -57,7 +57,7 @@ void ei_cache_friendly_product_colmajor_times_vector( typedef typename ei_packet_traits::type Packet; enum { PacketSize = sizeof(Packet)/sizeof(Scalar), - IsVectorized = ei_packet_traits::IsVectorized + Vectorizable = ei_packet_traits::Vectorizable }; ei_conj_helper cj; @@ -131,7 +131,7 @@ void ei_cache_friendly_product_colmajor_times_vector( const Scalar *lhs0 = lhs + i*lhsStride, *lhs1 = lhs + (i+offset1)*lhsStride, *lhs2 = lhs + (i+2)*lhsStride, *lhs3 = lhs + (i+offset3)*lhsStride; - if (IsVectorized) + if (Vectorizable) { /* explicit vectorization */ // process initial unaligned coeffs @@ -219,7 +219,7 @@ void ei_cache_friendly_product_colmajor_times_vector( Packet ptmp0 = ei_pset1(alpha*rhs[i]); const Scalar* lhs0 = lhs + i*lhsStride; - if (IsVectorized) + if (Vectorizable) { /* explicit vectorization */ // process first unaligned result's coeffs @@ -247,7 +247,7 @@ void ei_cache_friendly_product_colmajor_times_vector( } else break; - } while(IsVectorized); + } while(Vectorizable); #undef _EIGEN_ACCUMULATE_PACKETS } @@ -274,7 +274,7 @@ static EIGEN_DONT_INLINE void ei_cache_friendly_product_rowmajor_times_vector( typedef typename ei_packet_traits::type Packet; enum { PacketSize = sizeof(Packet)/sizeof(Scalar), - IsVectorized = ei_packet_traits::IsVectorized + Vectorizable = ei_packet_traits::Vectorizable }; ei_conj_helper cj; @@ -347,7 +347,7 @@ static EIGEN_DONT_INLINE void ei_cache_friendly_product_rowmajor_times_vector( const Scalar *lhs0 = lhs + i*lhsStride, *lhs1 = lhs + (i+offset1)*lhsStride, *lhs2 = lhs + (i+2)*lhsStride, *lhs3 = lhs + (i+offset3)*lhsStride; - if (IsVectorized) + if (Vectorizable) { /* explicit vectorization */ Packet ptmp0 = ei_pset1(Scalar(0)), ptmp1 = ei_pset1(Scalar(0)), ptmp2 = ei_pset1(Scalar(0)), ptmp3 = ei_pset1(Scalar(0)); @@ -476,7 +476,7 @@ static EIGEN_DONT_INLINE void ei_cache_friendly_product_rowmajor_times_vector( } else break; - } while(IsVectorized); + } while(Vectorizable); #undef _EIGEN_ACCUMULATE_PACKETS } diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index a5386979c..c93398092 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -151,7 +151,7 @@ class ei_compute_matrix_flags ) ) ? AlignedBit : 0, - packet_access_bit = ei_packet_traits::IsVectorized && aligned_bit ? PacketAccessBit : 0 + packet_access_bit = ei_packet_traits::Vectorizable && aligned_bit ? PacketAccessBit : 0 }; public: