Fix #1911: add benchmark for move semantics with fixed-size matrix

$ clang++ -O3 bench/bench_move_semantics.cpp -I. -std=c++11 \
        -o bench_move_semantics

$ ./bench_move_semantics
float copy semantics: 1755.97 ms
float move semantics: 55.063 ms
double copy semantics: 2457.65 ms
double move semantics: 55.034 ms
This commit is contained in:
Sebastien Boisvert
2020-06-11 23:43:25 +00:00
committed by Rasmus Munk Larsen
parent a7d2552af8
commit 39cbd6578f
4 changed files with 143 additions and 0 deletions

35
test/MovableScalar.h Normal file
View File

@@ -0,0 +1,35 @@
// This file is part of Eigen, a lightweight C++ template library
// for linear algebra.
//
// Copyright (C) 2020 Sebastien Boisvert <seb@boisvert.info>
//
// This Source Code Form is subject to the terms of the Mozilla
// Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#ifndef EIGEN_MISC_MOVABLE_SCALAR_H
#define EIGEN_MISC_MOVABLE_SCALAR_H
#include <vector>
namespace Eigen
{
template <typename Scalar, typename Base = std::vector<Scalar>>
struct MovableScalar : public Base
{
MovableScalar() = default;
~MovableScalar() = default;
MovableScalar(const MovableScalar&) = default;
MovableScalar(MovableScalar&& other) = default;
MovableScalar& operator=(const MovableScalar&) = default;
MovableScalar& operator=(MovableScalar&& other) = default;
MovableScalar(Scalar scalar) : Base(100, scalar) {}
operator Scalar() const { return this->size() > 0 ? this->back() : Scalar(); }
};
template<> struct NumTraits<MovableScalar<float>> : GenericNumTraits<float> {};
}
#endif

View File

@@ -10,6 +10,9 @@
#define EIGEN_RUNTIME_NO_MALLOC
#include "main.h"
#if EIGEN_HAS_CXX11
#include "MovableScalar.h"
#endif
#include <Eigen/Core>
@@ -75,11 +78,43 @@ void rvalue_transpositions(Index rows)
Eigen::internal::set_is_malloc_allowed(true);
}
template <typename MatrixType>
void rvalue_move(const MatrixType& m)
{
// lvalue reference is copied
MatrixType b(m);
VERIFY_IS_EQUAL(b, m);
// lvalue reference is copied
MatrixType c{m};
VERIFY_IS_EQUAL(c, m);
// lvalue reference is copied
MatrixType d = m;
VERIFY_IS_EQUAL(d, m);
// rvalue reference is moved
MatrixType e_src(m);
VERIFY_IS_EQUAL(e_src, m);
MatrixType e_dst(std::move(e_src));
VERIFY_IS_EQUAL(e_src, MatrixType());
VERIFY_IS_EQUAL(e_dst, m);
// rvalue reference is moved
MatrixType f_src(m);
VERIFY_IS_EQUAL(f_src, m);
MatrixType f_dst = std::move(f_src);
VERIFY_IS_EQUAL(f_src, MatrixType());
VERIFY_IS_EQUAL(f_dst, m);
}
#else
template <typename MatrixType>
void rvalue_copyassign(const MatrixType&) {}
template<typename TranspositionsType>
void rvalue_transpositions(Index) {}
template <typename MatrixType>
void rvalue_move(const MatrixType&) {}
#endif
EIGEN_DECLARE_TEST(rvalue_types)
@@ -106,5 +141,9 @@ EIGEN_DECLARE_TEST(rvalue_types)
CALL_SUBTEST_3((rvalue_transpositions<PermutationMatrix<Dynamic, Dynamic, Index> >(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))));
CALL_SUBTEST_4((rvalue_transpositions<Transpositions<Dynamic, Dynamic, int> >(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))));
CALL_SUBTEST_4((rvalue_transpositions<Transpositions<Dynamic, Dynamic, Index> >(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))));
#if EIGEN_HAS_CXX11
CALL_SUBTEST_5(rvalue_move(Eigen::Matrix<MovableScalar<float>,1,3>::Random().eval()));
#endif
}
}