From 5da3049b80dc8bb2de796d151e3d83844fe21a5e Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Tue, 9 Feb 2010 20:32:48 +0100 Subject: Regression tests for number of nested temporaries. Moved EIGEN_DEBUG_MATRIX_CTOR to ei_matrix_storage to capture resize related allocations. --- test/product_notemporary.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'test/product_notemporary.cpp') diff --git a/test/product_notemporary.cpp b/test/product_notemporary.cpp index cddf7eb39..c637039e7 100644 --- a/test/product_notemporary.cpp +++ b/test/product_notemporary.cpp @@ -24,10 +24,7 @@ static int nb_temporaries; -#define EIGEN_DEBUG_MATRIX_CTOR { \ - if(SizeAtCompileTime==Dynamic && this->data()!=0) \ - nb_temporaries++; \ - } +#define EIGEN_DEBUG_MATRIX_CTOR { if(size!=0) nb_temporaries++; } #include "main.h" @@ -40,10 +37,11 @@ static int nb_temporaries; template void product_notemporary(const MatrixType& m) { - /* This test checks the number of tempories created + /* This test checks the number of temporaries created * during the evaluation of a complex expression */ typedef typename MatrixType::Scalar Scalar; + typedef typename MatrixType::RealScalar RealScalar; typedef Matrix RowVectorType; typedef Matrix ColVectorType; typedef Matrix RowMajorMatrixType; @@ -105,10 +103,21 @@ template void product_notemporary(const MatrixType& m) VERIFY_EVALUATION_COUNT( m3.template selfadjointView().rankUpdate(m2.adjoint()), 0); + // Here we will get 1 temporary for each resize operation of the lhs operator; resize(r1,c1) would lead to zero temporaries m3.resize(1,1); - VERIFY_EVALUATION_COUNT( m3.noalias() = m1.block(r0,r0,r1,r1).template selfadjointView() * m2.block(r0,c0,r1,c1), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() = m1.block(r0,r0,r1,r1).template selfadjointView() * m2.block(r0,c0,r1,c1), 1); m3.resize(1,1); - VERIFY_EVALUATION_COUNT( m3.noalias() = m1.block(r0,r0,r1,r1).template triangularView() * m2.block(r0,c0,r1,c1), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() = m1.block(r0,r0,r1,r1).template triangularView() * m2.block(r0,c0,r1,c1), 1); + + // Zero temporaries for lazy products ... + VERIFY_EVALUATION_COUNT( Scalar tmp = Scalar(RealScalar(1)) / (m3.transpose().lazyProduct(m3)).diagonal().sum(), 0 ); + + // ... and one temporary for even deeply (>=2) nested products + VERIFY_EVALUATION_COUNT( Scalar tmp = Scalar(RealScalar(1)) / (m3.transpose() * m3).diagonal().sum(), 1 ); + VERIFY_EVALUATION_COUNT( Scalar tmp = Scalar(RealScalar(1)) / (m3.transpose() * m3).diagonal().array().abs().sum(), 1 ); + + // Zero temporaries for ... CoeffBasedProductMode + VERIFY_EVALUATION_COUNT( m3.col(0).head<5>() * m3.col(0).transpose() + m3.col(0).head<5>() * m3.col(0).transpose(), 0 ); } void test_product_notemporary() -- cgit v1.2.3