diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-01-04 14:18:07 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-01-04 14:18:07 +0100 |
| commit | 64356a622d5b36b06ec1901ec13eb962e0cbf503 (patch) | |
| tree | 192b8f56d1bb24d8b797ecdd1f783ce2d163ec83 /test/vectorization_logic.cpp | |
| parent | 004488a31df15cb3450e0c05e87414f5fcdb745d (diff) | |
fix vectorization_logic unit test when defaulting to row major
Diffstat (limited to 'test/vectorization_logic.cpp')
| -rw-r--r-- | test/vectorization_logic.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp index 911b79d0d..b029652cf 100644 --- a/test/vectorization_logic.cpp +++ b/test/vectorization_logic.cpp @@ -103,8 +103,8 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori typedef Matrix<Scalar,Dynamic,Dynamic> MatrixXX; typedef Matrix<Scalar,PacketSize,PacketSize> Matrix11; typedef Matrix<Scalar,2*PacketSize,2*PacketSize> Matrix22; - typedef Matrix<Scalar,4*PacketSize,16> Matrix44; - typedef Matrix<Scalar,4*PacketSize,16,DontAlign|EIGEN_DEFAULT_MATRIX_STORAGE_ORDER_OPTION> Matrix44u; + typedef Matrix<Scalar,(Matrix11::Flags&RowMajorBit)?16:4*PacketSize,(Matrix11::Flags&RowMajorBit)?4*PacketSize:16> Matrix44; + typedef Matrix<Scalar,(Matrix11::Flags&RowMajorBit)?16:4*PacketSize,(Matrix11::Flags&RowMajorBit)?4*PacketSize:16,DontAlign|EIGEN_DEFAULT_MATRIX_STORAGE_ORDER_OPTION> Matrix44u; typedef Matrix<Scalar,4*PacketSize,16,ColMajor> Matrix44c; typedef Matrix<Scalar,4*PacketSize,16,RowMajor> Matrix44r; @@ -118,9 +118,10 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori (PacketSize==8 ? 2 : PacketSize==4 ? 2 : PacketSize==2 ? 2 : /*PacketSize==1 ?*/ 1), DontAlign|((Matrix1::Flags&RowMajorBit)?RowMajor:ColMajor)> Matrix1u; + // this type is made such that it can only be vectorized when viewed as a linear 1D vector typedef Matrix<Scalar, - (PacketSize==8 ? 4 : PacketSize==4 ? 6 : PacketSize==2 ? 3 : /*PacketSize==1 ?*/ 1), - (PacketSize==8 ? 6 : PacketSize==4 ? 2 : PacketSize==2 ? 2 : /*PacketSize==1 ?*/ 3) + (PacketSize==8 ? 4 : PacketSize==4 ? 6 : PacketSize==2 ? ((Matrix11::Flags&RowMajorBit)?2:3) : /*PacketSize==1 ?*/ 1), + (PacketSize==8 ? 6 : PacketSize==4 ? 2 : PacketSize==2 ? ((Matrix11::Flags&RowMajorBit)?3:2) : /*PacketSize==1 ?*/ 3) > Matrix3; VERIFY(test_assign(Vector1(),Vector1(), @@ -197,7 +198,7 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori VERIFY(test_redux(Matrix44(), LinearVectorizedTraversal,NoUnrolling)); - VERIFY(test_redux(Matrix44().template block<PacketSize,4>(1,2), + VERIFY(test_redux(Matrix44().template block<(Matrix1::Flags&RowMajorBit)?4:PacketSize,(Matrix1::Flags&RowMajorBit)?PacketSize:4>(1,2), DefaultTraversal,CompleteUnrolling)); VERIFY(test_redux(Matrix44c().template block<2*PacketSize,1>(1,2), |