diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h index 7f35b3114..cb8848731 100644 --- a/Eigen/src/Core/GenericPacketMath.h +++ b/Eigen/src/Core/GenericPacketMath.h @@ -96,7 +96,6 @@ struct default_packet_traits HasRint = 0, HasFloor = 0, HasCeil = 0, - HasCast = 0, HasSign = 0 }; }; @@ -325,7 +324,7 @@ pcmp_eq(const Packet& a, const Packet& b) { return a==b ? ptrue(a) : pzero(a); } /** \internal \returns a < b or a==NaN or b==NaN as a bit mask */ template EIGEN_DEVICE_FUNC inline Packet -pcmp_lt_or_nan(const Packet& a, const Packet& b) { return a>=b ? pzero(a) : ptrue(a); } +pcmp_lt_or_nan(const Packet& a, const Packet& b) { return a>=b ? pzero(a) : ptrue(a); } /** \internal \returns \a or \b for each field in packet according to \mask */ template EIGEN_DEVICE_FUNC inline Packet @@ -392,7 +391,7 @@ ploaddup(const typename unpacket_traits::type* from) { return *from; } * For instance, for a packet of 8 elements, 2 scalars will be read from \a *from and * replicated to form: {from[0],from[0],from[0],from[0],from[1],from[1],from[1],from[1]} * Currently, this function is only used in matrix products. - * For packet-size smaller or equal to 4, this function is equivalent to pload1 + * For packet-size smaller or equal to 4, this function is equivalent to pload1 */ template EIGEN_DEVICE_FUNC inline Packet ploadquad(const typename unpacket_traits::type* from) diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index 065c8100f..ddd43c377 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -121,7 +121,6 @@ struct packet_traits : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -162,7 +161,6 @@ struct packet_traits : default_packet_traits size = 16, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -192,7 +190,6 @@ struct packet_traits : default_packet_traits size = 16, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -224,7 +221,6 @@ struct packet_traits : default_packet_traits size = 8, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -254,7 +250,6 @@ struct packet_traits : default_packet_traits size = 8, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -285,7 +280,6 @@ struct packet_traits : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -315,7 +309,6 @@ struct packet_traits : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -347,7 +340,6 @@ struct packet_traits : default_packet_traits size = 2, HasHalfPacket = 1, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, @@ -378,7 +370,6 @@ struct packet_traits : default_packet_traits size = 2, HasHalfPacket = 1, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, @@ -3185,7 +3176,6 @@ template<> struct packet_traits : default_packet_traits size = 2, HasHalfPacket = 0, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, diff --git a/test/packetmath.cpp b/test/packetmath.cpp index 540cf6a86..64ba28741 100644 --- a/test/packetmath.cpp +++ b/test/packetmath.cpp @@ -29,58 +29,113 @@ inline bool REF_SUB(const bool& a, const bool& b) { return a ^ b;} template <> inline bool REF_MUL(const bool& a, const bool& b) { return a && b;} -template -struct test_cast_helper; - -template -struct test_cast_helper { - static void run() {} -}; - -template -struct test_cast_helper { - static void run() { - static const int PacketSize = internal::unpacket_traits::size; - EIGEN_ALIGN_MAX FromScalar data1[PacketSize]; - EIGEN_ALIGN_MAX ToScalar data2[PacketSize]; - EIGEN_ALIGN_MAX ToScalar ref[PacketSize]; - - // Construct a packet of scalars that will not overflow when casting - for (int i=0; i::Random().value(); - const ToScalar to_scalar = Array::Random().value(); - const FromScalar c = sizeof(ToScalar) > sizeof(FromScalar) ? static_cast(to_scalar) : from_scalar; - data1[i] = (NumTraits::IsSigned && !NumTraits::IsSigned) ? numext::abs(c) : c; +// Uses pcast to cast from one array to another. +template +struct pcast_array { + static void cast(const typename internal::unpacket_traits::type* src, size_t size, typename internal::unpacket_traits::type* dst) { + static const int TgtPacketSize = internal::unpacket_traits::size; + for (size_t i=0; i(internal::ploadu(src+i))); } - - for (int i=0; i(data1[i]); - internal::pstore(data2, internal::pcast(internal::pload(data1))); - - VERIFY(test::areApprox(ref, data2, PacketSize) && "internal::pcast<>"); } }; -template +template +struct pcast_array{ + static void cast(const typename internal::unpacket_traits::type* src, size_t size, typename internal::unpacket_traits::type* dst) { + static const int SrcPacketSize = internal::unpacket_traits::size; + static const int TgtPacketSize = internal::unpacket_traits::size; + for (size_t i=0; i(src+i); + SrcPacket b = internal::ploadu(src+i+SrcPacketSize); + internal::pstoreu(dst+i, internal::pcast(a, b)); + } + } +}; + +template +struct pcast_array{ + static void cast(const typename internal::unpacket_traits::type* src, size_t size, typename internal::unpacket_traits::type* dst) { + static const int SrcPacketSize = internal::unpacket_traits::size; + static const int TgtPacketSize = internal::unpacket_traits::size; + for (size_t i=0; i(src+i); + SrcPacket b = internal::ploadu(src+i+SrcPacketSize); + SrcPacket c = internal::ploadu(src+i+2*SrcPacketSize); + SrcPacket d = internal::ploadu(src+i+3*SrcPacketSize); + internal::pstoreu(dst+i, internal::pcast(a, b)); + } + } +}; + +template +struct test_cast_helper; + +template +struct test_cast_helper { + static void run() {} +}; + +template +struct test_cast_helper { + static void run() { + typedef typename internal::unpacket_traits::type SrcScalar; + typedef typename internal::unpacket_traits::type TgtScalar; + static const int SrcPacketSize = internal::unpacket_traits::size; + static const int TgtPacketSize = internal::unpacket_traits::size; + static const int DataSize = SrcPacketSize*SrcCoeffRatio; + VERIFY(DataSize == TgtPacketSize*TgtCoeffRatio && "Packet sizes and cast ratios are mismatched."); + + EIGEN_ALIGN_MAX SrcScalar data1[DataSize]; + EIGEN_ALIGN_MAX TgtScalar data2[DataSize]; + EIGEN_ALIGN_MAX TgtScalar ref[DataSize]; + + // Construct a packet of scalars that will not overflow when casting + for (int i=0; i::Random().value(); + const TgtScalar b = Array::Random().value(); + const SrcScalar c = sizeof(TgtScalar) > sizeof(SrcScalar) ? static_cast(b) : a; + data1[i] = (NumTraits::IsSigned && !NumTraits::IsSigned) ? numext::abs(c) : c; + } + + for (int i=0; i(data1[i]); + + pcast_array::cast(data1, DataSize, data2); + + VERIFY(test::areApprox(ref, data2, DataSize) && "internal::pcast<>"); + } +}; + +template void test_cast() { - typedef typename internal::unpacket_traits::type FromScalar; - typedef typename internal::packet_traits FromPacketTraits; - typedef typename internal::packet_traits::type Full; - typedef typename internal::unpacket_traits::half Half; - typedef typename internal::unpacket_traits::half>::half Quarter; + typedef typename internal::packet_traits SrcPacketTraits; + typedef typename internal::packet_traits TgtPacketTraits; + typedef typename internal::type_casting_traits TypeCastingTraits; + static const int SrcCoeffRatio = TypeCastingTraits::SrcCoeffRatio; + static const int TgtCoeffRatio = TypeCastingTraits::TgtCoeffRatio; - static const int PacketSize = internal::unpacket_traits::size; - static const bool CanCast = - FromPacketTraits::HasCast && - (PacketSize == internal::unpacket_traits::size || - PacketSize == internal::unpacket_traits::size || - PacketSize == internal::unpacket_traits::size); + static const bool HasFullCast = TypeCastingTraits::VectorizedCast; + static const bool HasHalfCast = HasFullCast && internal::packet_traits::HasHalfPacket && internal::packet_traits::HasHalfPacket; - typedef typename internal::conditional::size == PacketSize, Quarter, - typename internal::conditional::size == PacketSize, Half, Full>::type>::type - ToPacket; + test_cast_helper::run(); + test_cast_helper::run(); +} - test_cast_helper::run(); +template void packetmath_pcast_ops() { + const static bool IsFullPacket = internal::is_same::type,Packet>::value; + if (IsFullPacket) { + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + test_cast(); + } } template @@ -341,6 +396,7 @@ template void packetmath() CHECK_CWISE2_IF(true, internal::pand, internal::pand); packetmath_boolean_mask_ops(); + packetmath_pcast_ops(); } @@ -584,19 +640,6 @@ template void packetmath_notcomplex() Array::Map(data1, PacketSize*4).setRandom(); - if (PacketTraits::HasCast) { - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - test_cast(); - } - ref[0] = data1[0]; for (int i=0; i, type2index<3>, type2index<7>> dim; Tensor reshaped = tensor.reshape(static_cast>(dim)); - for (int i = 0; i < 2; ++i) { for (int j = 0; j < 3; ++j) { for (int k = 0; k < 7; ++k) {