mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-03-07 18:27:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Evaluators: Make inner vectorization more similar to default traversal.

Browse Source
This commit is contained in:
Jitse Niesen 2011-03-28 21:29:47 +01:00
parent 00991b5b64
commit 8175fe43e0
2 changed files with 38 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Eigen/src/Core/AssignEvaluator.h
View File

@ -259,8 +259,11 @@ struct copy_using_evaluator_impl<DstXprType, SrcXprType, InnerVectorizedTraversa
const Index outerSize = dst.outerSize();
const Index packetSize = packet_traits<typename DstXprType::Scalar>::size;
for(Index outer = 0; outer < outerSize; ++outer)
for(Index inner = 0; inner < innerSize; inner+=packetSize)
dstEvaluator.template writePacketByOuterInner<Aligned>(outer, inner, srcEvaluator.template packetByOuterInner<Aligned>(outer, inner));
for(Index inner = 0; inner < innerSize; inner+=packetSize) {
Index row = dst.rowIndexByOuterInner(outer, inner);
Index col = dst.colIndexByOuterInner(outer, inner);
dstEvaluator.template writePacket<Aligned>(row, col, srcEvaluator.template packet<Aligned>(row, col));
}
}
};

103
Eigen/src/Core/CoreEvaluators.h
View File

@ -75,18 +75,23 @@ struct evaluator_impl<Transpose<ExpressionType> >
return m_argImpl.coeffRef(index);
}
// TODO: Difference between PacketScalar and PacketReturnType?
template<int LoadMode>
const typename ExpressionType::PacketScalar packet(Index row, Index col) const
{
return m_argImpl.template packet<LoadMode>(col, row);
}
template<int LoadMode>
const typename ExpressionType::PacketScalar packet(Index index) const
{
return m_argImpl.template packet<LoadMode>(index);
}
// TODO: Difference between PacketScalar and PacketReturnType?
// TODO: Get this function by inheriting from DenseCoeffBase?
template<int LoadMode>
const typename ExpressionType::PacketScalar packetByOuterInner(Index outer, Index inner) const
template<int StoreMode>
void writePacket(Index row, Index col, const typename ExpressionType::PacketScalar& x)
{
return m_argImpl.template packetByOuterInner<LoadMode>(outer, inner);
m_argImpl.template writePacket<StoreMode>(col, row, x);
}
template<int StoreMode>
@ -95,12 +100,6 @@ struct evaluator_impl<Transpose<ExpressionType> >
m_argImpl.template writePacket<StoreMode>(index, x);
}
template<int StoreMode>
void writePacketByOuterInner(Index outer, Index inner, const typename ExpressionType::PacketScalar& x)
{
m_argImpl.template writePacketByOuterInner<StoreMode>(outer, inner, x);
}
protected:
typename evaluator<ExpressionType>::type m_argImpl;
};
@ -116,16 +115,6 @@ struct evaluator_impl<Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
typedef typename MatrixType::Index Index;
Index colIndexByOuterInner(Index outer, Index inner) const
{
return m_matrix.colIndexByOuterInner(outer, inner);
}
Index rowIndexByOuterInner(Index outer, Index inner) const
{
return m_matrix.rowIndexByOuterInner(outer, inner);
}
typename MatrixType::CoeffReturnType coeff(Index i, Index j) const
{
return m_matrix.coeff(i, j);
@ -146,13 +135,6 @@ struct evaluator_impl<Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
return m_matrix.const_cast_derived().coeffRef(index);
}
template<int LoadMode>
typename MatrixType::PacketReturnType packet(Index index) const
{
// eigen_internal_assert(index >= 0 && index < size());
return m_matrix.template packet<LoadMode>(index);
}
template<int LoadMode>
typename MatrixType::PacketReturnType packet(Index row, Index col) const
{
@ -160,9 +142,16 @@ struct evaluator_impl<Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
}
template<int LoadMode>
typename MatrixType::PacketReturnType packetByOuterInner(Index outer, Index inner) const
typename MatrixType::PacketReturnType packet(Index index) const
{
return m_matrix.template packetByOuterInner<LoadMode>(outer, inner);
// eigen_internal_assert(index >= 0 && index < size());
return m_matrix.template packet<LoadMode>(index);
}
template<int StoreMode>
void writePacket(Index row, Index col, const typename MatrixType::PacketScalar& x)
{
m_matrix.const_cast_derived().template writePacket<StoreMode>(row, col, x);
}
template<int StoreMode>
@ -172,12 +161,6 @@ struct evaluator_impl<Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
m_matrix.const_cast_derived().template writePacket<StoreMode>(index, x);
}
template<int StoreMode>
void writePacketByOuterInner(Index outer, Index inner, const typename MatrixType::PacketScalar& x)
{
m_matrix.const_cast_derived().template writePacketByOuterInner<StoreMode>(outer, inner, x);
}
protected:
const MatrixType &m_matrix;
};
@ -195,16 +178,16 @@ struct evaluator_impl<Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
typedef typename ArrayType::Index Index;
Index colIndexByOuterInner(Index outer, Index inner) const
{
return m_array.colIndexByOuterInner(outer, inner);
}
typename ArrayType::CoeffReturnType coeff(Index i, Index j) const
{
return m_array.coeff(i, j);
}
typename ArrayType::CoeffReturnType coeff(Index index) const
{
return m_array.coeff(index);
}
typename ArrayType::Scalar& coeffRef(Index i, Index j)
{
return m_array.const_cast_derived().coeffRef(i, j);
@ -215,13 +198,6 @@ struct evaluator_impl<Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
return m_array.const_cast_derived().coeffRef(index);
}
template<int LoadMode>
typename ArrayType::PacketReturnType packet(Index index) const
{
// eigen_internal_assert(index >= 0 && index < size());
return m_array.template packet<LoadMode>(index);
}
template<int LoadMode>
typename ArrayType::PacketReturnType packet(Index row, Index col) const
{
@ -229,9 +205,16 @@ struct evaluator_impl<Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
}
template<int LoadMode>
typename ArrayType::PacketReturnType packetByOuterInner(Index outer, Index inner) const
typename ArrayType::PacketReturnType packet(Index index) const
{
return m_array.template packetByOuterInner<LoadMode>(outer, inner);
// eigen_internal_assert(index >= 0 && index < size());
return m_array.template packet<LoadMode>(index);
}
template<int StoreMode>
void writePacket(Index row, Index col, const typename ArrayType::PacketScalar& x)
{
m_array.const_cast_derived().template writePacket<StoreMode>(row, col, x);
}
template<int StoreMode>
@ -241,12 +224,6 @@ struct evaluator_impl<Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> >
m_array.const_cast_derived().template writePacket<StoreMode>(index, x);
}
template<int StoreMode>
void writePacketByOuterInner(Index outer, Index inner, const typename ArrayType::PacketScalar& x)
{
m_array.const_cast_derived().template writePacketByOuterInner<StoreMode>(outer, inner, x);
}
protected:
const ArrayType &m_array;
};
@ -315,13 +292,6 @@ struct evaluator_impl<CwiseUnaryOp<UnaryOp, ArgType> >
return m_unaryOp.functor().packetOp(m_argImpl.template packet<LoadMode>(row, col));
}
template<int LoadMode>
typename UnaryOpType::PacketScalar packetByOuterInner(Index outer, Index inner) const
{
return packet<LoadMode>(m_argImpl.rowIndexByOuterInner(outer, inner),
m_argImpl.colIndexByOuterInner(outer, inner));
}
protected:
const UnaryOpType& m_unaryOp;
typename evaluator<ArgType>::type m_argImpl;
@ -362,13 +332,6 @@ struct evaluator_impl<CwiseBinaryOp<BinaryOp, Lhs, Rhs> >
m_rhsImpl.template packet<LoadMode>(row, col));
}
template<int LoadMode>
typename BinaryOpType::PacketScalar packetByOuterInner(Index outer, Index inner) const
{
return packet<LoadMode>(m_lhsImpl.rowIndexByOuterInner(outer, inner),
m_lhsImpl.colIndexByOuterInner(outer, inner));
}
protected:
const BinaryOpType& m_binaryOp;
typename evaluator<Lhs>::type m_lhsImpl;