Cleanup cost of tanh

This commit is contained in:
Gael Guennebaud 2016-08-23 14:39:55 +02:00
parent b3151bca40
commit ef3de20481

View File

@ -1,7 +1,7 @@
// This file is part of Eigen, a lightweight C++ template library // This file is part of Eigen, a lightweight C++ template library
// for linear algebra. // for linear algebra.
// //
// Copyright (C) 2008-2010 Gael Guennebaud <gael.guennebaud@inria.fr> // Copyright (C) 2008-2016 Gael Guennebaud <gael.guennebaud@inria.fr>
// //
// This Source Code Form is subject to the terms of the Mozilla // 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 // Public License v. 2.0. If a copy of the MPL was not distributed
@ -507,21 +507,18 @@ template <typename Scalar>
struct functor_traits<scalar_tanh_op<Scalar> > { struct functor_traits<scalar_tanh_op<Scalar> > {
enum { enum {
PacketAccess = packet_traits<Scalar>::HasTanh, PacketAccess = packet_traits<Scalar>::HasTanh,
Cost = (PacketAccess && (!is_same<Scalar, std::complex<float> >::value) && Cost = ( (EIGEN_FAST_MATH && is_same<Scalar,float>::value)
(!is_same<Scalar, std::complex<double> >::value)
// The following numbers are based on the AVX implementation, // The following numbers are based on the AVX implementation,
#ifdef EIGEN_VECTORIZE_FMA #ifdef EIGEN_VECTORIZE_FMA
// Haswell can issue 2 add/mul/madd per cycle. // Haswell can issue 2 add/mul/madd per cycle.
// 9 pmadd, 2 pmul, 1 div, 2 other // 9 pmadd, 2 pmul, 1 div, 2 other
? (2 * NumTraits<Scalar>::AddCost + ? (2 * NumTraits<Scalar>::AddCost +
6 * NumTraits<Scalar>::MulCost + 6 * NumTraits<Scalar>::MulCost +
NumTraits<Scalar>::template Div< NumTraits<Scalar>::template Div<packet_traits<Scalar>::HasDiv>::Cost)
packet_traits<Scalar>::HasDiv>::Cost)
#else #else
? (11 * NumTraits<Scalar>::AddCost + ? (11 * NumTraits<Scalar>::AddCost +
11 * NumTraits<Scalar>::MulCost + 11 * NumTraits<Scalar>::MulCost +
NumTraits<Scalar>::template Div< NumTraits<Scalar>::template Div<packet_traits<Scalar>::HasDiv>::Cost)
packet_traits<Scalar>::HasDiv>::Cost)
#endif #endif
// This number assumes a naive implementation of tanh // This number assumes a naive implementation of tanh
: (6 * NumTraits<Scalar>::AddCost + : (6 * NumTraits<Scalar>::AddCost +