diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-08-07 20:05:31 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-08-07 20:05:31 +0200 |
commit | febcce34f1a5cabc3f4d92b52f7520b8a5e681f4 (patch) | |
tree | c4fae0a6f9cc41e95209da9997a0dd5e31b435f6 /test/vectorization_logic.cpp | |
parent | 6245591349bdf013bc421e6887d98164cdd15cd0 (diff) |
Enable vectorization with half-packets
Diffstat (limited to 'test/vectorization_logic.cpp')
-rw-r--r-- | test/vectorization_logic.cpp | 126 |
1 files changed, 121 insertions, 5 deletions
diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp index 18dad6b5d..6ff38ed11 100644 --- a/test/vectorization_logic.cpp +++ b/test/vectorization_logic.cpp @@ -101,11 +101,16 @@ bool test_redux(const Xpr&, int traversal, int unrolling) return res; } -template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectorizable> struct vectorization_logic +template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectorizable> +struct vectorization_logic { typedef internal::packet_traits<Scalar> PacketTraits; + + typedef typename internal::packet_traits<Scalar>::type PacketType; + typedef typename internal::unpacket_traits<PacketType>::half HalfPacketType; enum { - PacketSize = PacketTraits::size + PacketSize = internal::unpacket_traits<PacketType>::size, + HalfPacketSize = internal::unpacket_traits<HalfPacketType>::size }; static void run() { @@ -179,9 +184,9 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori VERIFY(test_assign(Matrix3(),Matrix3().cwiseQuotient(Matrix3()), PacketTraits::HasDiv ? LinearVectorizedTraversal : LinearTraversal,CompleteUnrolling)); - + VERIFY(test_assign(Matrix<Scalar,17,17>(),Matrix<Scalar,17,17>()+Matrix<Scalar,17,17>(), - LinearTraversal,NoUnrolling)); + HalfPacketSize==1 ? InnerVectorizedTraversal : LinearTraversal,NoUnrolling)); VERIFY(test_assign(Matrix11(),Matrix<Scalar,17,17>().template block<PacketSize,PacketSize>(2,3)+Matrix<Scalar,17,17>().template block<PacketSize,PacketSize>(8,4), DefaultTraversal,PacketSize>4?InnerUnrolling:CompleteUnrolling)); @@ -221,12 +226,117 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori VERIFY(test_redux(VectorX(10), LinearVectorizedTraversal,NoUnrolling)); + } +}; + +template<typename Scalar> struct vectorization_logic<Scalar,false> +{ + static void run() {} +}; + +template<typename Scalar, bool Enable = !internal::is_same<typename internal::unpacket_traits<typename internal::packet_traits<Scalar>::type>::half, + typename internal::packet_traits<Scalar>::type>::value > +struct vectorization_logic_half +{ + typedef internal::packet_traits<Scalar> PacketTraits; + typedef typename internal::unpacket_traits<typename internal::packet_traits<Scalar>::type>::half PacketType; + enum { + PacketSize = internal::unpacket_traits<PacketType>::size + }; + static void run() + { + + typedef Matrix<Scalar,PacketSize,1> Vector1; + typedef Matrix<Scalar,PacketSize,PacketSize> Matrix11; + typedef Matrix<Scalar,5*PacketSize,7,ColMajor> Matrix57; + typedef Matrix<Scalar,5*PacketSize,7,DontAlign|ColMajor> Matrix57u; +// 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,4*PacketSize,ColMajor> Matrix44c; +// typedef Matrix<Scalar,4*PacketSize,4*PacketSize,RowMajor> Matrix44r; + + typedef Matrix<Scalar, + (PacketSize==8 ? 4 : PacketSize==4 ? 2 : PacketSize==2 ? 1 : /*PacketSize==1 ?*/ 1), + (PacketSize==8 ? 2 : PacketSize==4 ? 2 : PacketSize==2 ? 2 : /*PacketSize==1 ?*/ 1) + > Matrix1; + + typedef Matrix<Scalar, + (PacketSize==8 ? 4 : PacketSize==4 ? 2 : PacketSize==2 ? 1 : /*PacketSize==1 ?*/ 1), + (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 ? ((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; + #if !EIGEN_GCC_AND_ARCH_DOESNT_WANT_STACK_ALIGNMENT + VERIFY(test_assign(Vector1(),Vector1(), + InnerVectorizedTraversal,CompleteUnrolling)); + VERIFY(test_assign(Vector1(),Vector1()+Vector1(), + InnerVectorizedTraversal,CompleteUnrolling)); + VERIFY(test_assign(Vector1(),Vector1().cwiseProduct(Vector1()), + InnerVectorizedTraversal,CompleteUnrolling)); + VERIFY(test_assign(Vector1(),Vector1().template cast<Scalar>(), + InnerVectorizedTraversal,CompleteUnrolling)); + + + VERIFY(test_assign(Vector1(),Vector1(), + InnerVectorizedTraversal,CompleteUnrolling)); + VERIFY(test_assign(Vector1(),Vector1()+Vector1(), + InnerVectorizedTraversal,CompleteUnrolling)); + VERIFY(test_assign(Vector1(),Vector1().cwiseProduct(Vector1()), + InnerVectorizedTraversal,CompleteUnrolling)); + + VERIFY(test_assign(Matrix57(),Matrix57()+Matrix57(), + InnerVectorizedTraversal,InnerUnrolling)); + + VERIFY(test_assign(Matrix57u(),Matrix57()+Matrix57(), + LinearTraversal,NoUnrolling)); + + VERIFY(test_assign(Matrix1u(),Matrix1()+Matrix1(), + LinearTraversal,CompleteUnrolling)); + + if(PacketSize>1) + { + typedef Matrix<Scalar,3,3,ColMajor> Matrix33c; + VERIFY(test_assign(Matrix33c().row(2),Matrix33c().row(1)+Matrix33c().row(1), + LinearTraversal,CompleteUnrolling)); + VERIFY(test_assign(Matrix33c().col(0),Matrix33c().col(1)+Matrix33c().col(1), + LinearTraversal,CompleteUnrolling)); + + VERIFY(test_assign(Matrix3(),Matrix3().cwiseQuotient(Matrix3()), + PacketTraits::HasDiv ? LinearVectorizedTraversal : LinearTraversal,CompleteUnrolling)); + + VERIFY(test_assign(Matrix<Scalar,17,17>(),Matrix<Scalar,17,17>()+Matrix<Scalar,17,17>(), + LinearTraversal,NoUnrolling)); + + VERIFY(test_assign(Matrix11(),Matrix<Scalar,17,17>().template block<PacketSize,PacketSize>(2,3)+Matrix<Scalar,17,17>().template block<PacketSize,PacketSize>(8,4), + DefaultTraversal,PacketSize>4?InnerUnrolling:CompleteUnrolling)); + } + + VERIFY(test_redux(Matrix3(), + LinearVectorizedTraversal,CompleteUnrolling)); + + VERIFY(test_redux(Matrix57(), + LinearVectorizedTraversal,CompleteUnrolling)); + + VERIFY(test_redux(Matrix57().template block<PacketSize,3>(1,0), + DefaultTraversal,CompleteUnrolling)); + + VERIFY((test_assign< + Map<Matrix<Scalar,EIGEN_PLAIN_ENUM_MAX(2,PacketSize),EIGEN_PLAIN_ENUM_MAX(2,PacketSize)>, AlignedMax, InnerStride<3*PacketSize> >, + Matrix<Scalar,EIGEN_PLAIN_ENUM_MAX(2,PacketSize),EIGEN_PLAIN_ENUM_MAX(2,PacketSize)> + >(DefaultTraversal,CompleteUnrolling))); + + VERIFY((test_assign(Matrix57(), Matrix<Scalar,5*PacketSize,3>()*Matrix<Scalar,3,7>(), + InnerVectorizedTraversal, CompleteUnrolling))); + #endif } }; -template<typename Scalar> struct vectorization_logic<Scalar,false> +template<typename Scalar> struct vectorization_logic_half<Scalar,false> { static void run() {} }; @@ -242,6 +352,12 @@ void test_vectorization_logic() CALL_SUBTEST( vectorization_logic<std::complex<float> >::run() ); CALL_SUBTEST( vectorization_logic<std::complex<double> >::run() ); + CALL_SUBTEST( vectorization_logic_half<int>::run() ); + CALL_SUBTEST( vectorization_logic_half<float>::run() ); + CALL_SUBTEST( vectorization_logic_half<double>::run() ); + CALL_SUBTEST( vectorization_logic_half<std::complex<float> >::run() ); + CALL_SUBTEST( vectorization_logic_half<std::complex<double> >::run() ); + if(internal::packet_traits<float>::Vectorizable) { VERIFY(test_assign(Matrix<float,3,3>(),Matrix<float,3,3>()+Matrix<float,3,3>(), |