devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

temporary fix of the pèrevious commit

Browse Source
This commit is contained in:
Gael Guennebaud
2008-08-24 15:27:05 +00:00
parent ba100998bf
commit 440664cd5d
3 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Eigen/src/Core/Assign.h
View File

@@ -299,28 +299,58 @@ struct ei_assign_impl<Derived1, Derived2, InnerVectorization, InnerUnrolling>
*** Linear vectorization ***
***************************/
// template<typename Derived1, typename Derived2>
// struct ei_assign_impl<Derived1, Derived2, LinearVectorization, NoUnrolling>
// {
// static void run(Derived1 &dst, const Derived2 &src)
// {
// const int size = dst.size();
// const int packetSize = ei_packet_traits<typename Derived1::Scalar>::size;
// const int alignedStart = ei_assign_traits<Derived1,Derived2>::DstIsAligned ? 0
// : ei_alignmentOffset(&dst.coeffRef(0), size);
// const int alignedEnd = alignedStart + ((size-alignedStart)/packetSize)*packetSize;
//
// for(int index = 0; index < alignedStart; index++)
// dst.copyCoeff(index, src);
//
// for(int index = alignedStart; index < alignedEnd; index += packetSize)
// {
// dst.template copyPacket<Derived2, Aligned, ei_assign_traits<Derived1,Derived2>::SrcAlignment>(index, src);
// }
//
// for(int index = alignedEnd; index < size; index++)
// dst.copyCoeff(index, src);
// }
// };
template<typename Derived1, typename Derived2>
struct ei_assign_impl<Derived1, Derived2, LinearVectorization, NoUnrolling>
{
static void run(Derived1 &dst, const Derived2 &src)
{
const int size = dst.size();
const int packetSize = ei_packet_traits<typename Derived1::Scalar>::size;
const int alignedStart = ei_assign_traits<Derived1,Derived2>::DstIsAligned ? 0
: ei_alignmentOffset(&dst.coeffRef(0), size);
const int alignedEnd = alignedStart + ((size-alignedStart)/packetSize)*packetSize;
static void run(Derived1 &dst, const Derived2 &src)
{
asm("#begin");
const int size = dst.size();
const int packetSize = ei_packet_traits<typename Derived1::Scalar>::size;
const int alignedStart = ei_assign_traits<Derived1,Derived2>::DstIsAligned ? 0
: ei_alignmentOffset(&dst.coeffRef(0), size);
const int alignedEnd = alignedStart + ((size-alignedStart)/packetSize)*packetSize;
for(int index = 0; index < alignedStart; index++)
dst.copyCoeff(index, src);
asm("#unaligned start");
for(int index = alignedStart; index < alignedEnd; index += packetSize)
{
dst.template copyPacket<Derived2, Aligned, ei_assign_traits<Derived1,Derived2>::SrcAlignment>(index, src);
}
for(int index = 0; index < alignedStart; index++)
dst.copyCoeff(index, src);
asm("#aligned middle");
for(int index = alignedEnd; index < size; index++)
dst.copyCoeff(index, src);
}
for(int index = alignedStart; index < alignedEnd; index += packetSize)
{
dst.template copyPacket<Derived2, Aligned, ei_assign_traits<Derived1,Derived2>::SrcAlignment>(index, src);
}
asm("#unaligned end");
for(int index = alignedEnd; index < size; index++)
dst.copyCoeff(index, src);
asm("#end");
}
};
template<typename Derived1, typename Derived2>

2
Eigen/src/Core/util/Meta.h
View File

@@ -54,7 +54,7 @@ template<typename T> struct ei_unpointer<T*const> { typedef T type; };
template<typename T> struct ei_unconst { typedef T type; };
template<typename T> struct ei_unconst<const T> { typedef T type; };
template<typename T> struct ei_unconst<const T&> { typedef T& type; };
// template<typename T> struct ei_unconst<const T&> { typedef T& type; };
template<typename T> struct ei_cleantype { typedef T type; };
template<typename T> struct ei_cleantype<const T> { typedef typename ei_cleantype<T>::type type; };