From ef3de20481d4a5f6150255ebdeb4a2d7604b5848 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 23 Aug 2016 14:39:55 +0200 Subject: [PATCH] Cleanup cost of tanh --- Eigen/src/Core/functors/UnaryFunctors.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h index 2a57a5fd9..59b9edf69 100644 --- a/Eigen/src/Core/functors/UnaryFunctors.h +++ b/Eigen/src/Core/functors/UnaryFunctors.h @@ -1,7 +1,7 @@ // This file is part of Eigen, a lightweight C++ template library // for linear algebra. // -// Copyright (C) 2008-2010 Gael Guennebaud +// Copyright (C) 2008-2016 Gael Guennebaud // // 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 @@ -507,21 +507,18 @@ template struct functor_traits > { enum { PacketAccess = packet_traits::HasTanh, - Cost = (PacketAccess && (!is_same >::value) && - (!is_same >::value) + Cost = ( (EIGEN_FAST_MATH && is_same::value) // The following numbers are based on the AVX implementation, #ifdef EIGEN_VECTORIZE_FMA // Haswell can issue 2 add/mul/madd per cycle. // 9 pmadd, 2 pmul, 1 div, 2 other ? (2 * NumTraits::AddCost + 6 * NumTraits::MulCost + - NumTraits::template Div< - packet_traits::HasDiv>::Cost) + NumTraits::template Div::HasDiv>::Cost) #else ? (11 * NumTraits::AddCost + 11 * NumTraits::MulCost + - NumTraits::template Div< - packet_traits::HasDiv>::Cost) + NumTraits::template Div::HasDiv>::Cost) #endif // This number assumes a naive implementation of tanh : (6 * NumTraits::AddCost +