mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-18 14:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

cache outer size in Block => x1.5 speed up for a.block() = b.block()

Browse Source
This commit is contained in:
Gael Guennebaud 2010-05-17 16:54:17 +02:00
parent 0f3bcf853f
commit cf6d3162cc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Eigen/src/Core/Block.h
View File

@ -253,6 +253,7 @@ class Block<XprType,BlockRows,BlockCols,true>
ei_assert( (i>=0) && ( ei_assert( (i>=0) && (
((BlockRows==1) && (BlockCols==XprType::ColsAtCompileTime) && i<xpr.rows()) ((BlockRows==1) && (BlockCols==XprType::ColsAtCompileTime) && i<xpr.rows())
||((BlockRows==XprType::RowsAtCompileTime) && (BlockCols==1) && i<xpr.cols()))); ||((BlockRows==XprType::RowsAtCompileTime) && (BlockCols==1) && i<xpr.cols())));
init();
} }
/** Fixed-size constructor /** Fixed-size constructor
@ -262,6 +263,7 @@ class Block<XprType,BlockRows,BlockCols,true>
{ {
ei_assert(startRow >= 0 && BlockRows >= 1 && startRow + BlockRows <= xpr.rows() ei_assert(startRow >= 0 && BlockRows >= 1 && startRow + BlockRows <= xpr.rows()
&& startCol >= 0 && BlockCols >= 1 && startCol + BlockCols <= xpr.cols()); && startCol >= 0 && BlockCols >= 1 && startCol + BlockCols <= xpr.cols());
init();
} }
/** Dynamic-size constructor /** Dynamic-size constructor
@ -276,6 +278,7 @@ class Block<XprType,BlockRows,BlockCols,true>
&& (ColsAtCompileTime==Dynamic || ColsAtCompileTime==blockCols)); && (ColsAtCompileTime==Dynamic || ColsAtCompileTime==blockCols));
ei_assert(startRow >= 0 && blockRows >= 0 && startRow + blockRows <= xpr.rows() ei_assert(startRow >= 0 && blockRows >= 0 && startRow + blockRows <= xpr.rows()
&& startCol >= 0 && blockCols >= 0 && startCol + blockCols <= xpr.cols()); && startCol >= 0 && blockCols >= 0 && startCol + blockCols <= xpr.cols());
init();
} }
/** \sa MapBase::innerStride() */ /** \sa MapBase::innerStride() */
@ -289,9 +292,7 @@ class Block<XprType,BlockRows,BlockCols,true>
/** \sa MapBase::outerStride() */ /** \sa MapBase::outerStride() */
inline int outerStride() const inline int outerStride() const
{ {
return ei_traits<Block>::HasSameStorageOrderAsXprType return m_outerStride;
? m_xpr.outerStride()
: m_xpr.innerStride();
} }
#ifndef __SUNPRO_CC #ifndef __SUNPRO_CC
@ -304,11 +305,21 @@ class Block<XprType,BlockRows,BlockCols,true>
/** \internal used by allowAligned() */ /** \internal used by allowAligned() */
inline Block(const XprType& xpr, const Scalar* data, int blockRows, int blockCols) inline Block(const XprType& xpr, const Scalar* data, int blockRows, int blockCols)
: Base(data, blockRows, blockCols), m_xpr(xpr) : Base(data, blockRows, blockCols), m_xpr(xpr)
{} {
init();
}
#endif #endif
protected: protected:
void init()
{
m_outerStride = ei_traits<Block>::HasSameStorageOrderAsXprType
? m_xpr.outerStride()
: m_xpr.innerStride();
}
const typename XprType::Nested m_xpr; const typename XprType::Nested m_xpr;
int m_outerStride;
}; };
/** \returns a dynamic-size expression of a block in *this. /** \returns a dynamic-size expression of a block in *this.