From 43973f43c660fb5543bd5ab019901df7055d9997 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Thu, 1 May 2014 23:08:07 +0200 Subject: [PATCH] Use only standard conforming eg_value() Remove the optimization for Intel, is not standard and can break at any time, moreover our release build is not done with Intel C++ anymore so we don't need to sqeeze the extra speed out from this compiler. No functional change. --- src/types.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/types.h b/src/types.h index f74ba8d5..9bfe9a4c 100644 --- a/src/types.h +++ b/src/types.h @@ -272,23 +272,14 @@ inline Score make_score(int mg, int eg) { return Score((mg << 16) + eg); } /// Extracting the signed lower and upper 16 bits is not so trivial because /// according to the standard a simple cast to short is implementation defined /// and so is a right shift of a signed integer. -inline Value mg_value(Score s) { return Value(((s + 0x8000) & ~0xffff) / 0x10000); } - -/// On Intel 64 bit we have a small speed regression with the standard conforming -/// version. Therefore, in this case we use faster code that, although not 100% -/// standard compliant, seems to work for Intel and MSVC. -#if defined(IS_64BIT) && (!defined(__GNUC__) || defined(__INTEL_COMPILER)) - -inline Value eg_value(Score s) { return Value(int16_t(s & 0xFFFF)); } - -#else +inline Value mg_value(Score s) { + return Value(((s + 0x8000) & ~0xffff) / 0x10000); +} inline Value eg_value(Score s) { return Value((int)(unsigned(s) & 0x7FFFU) - (int)(unsigned(s) & 0x8000U)); } -#endif - #define ENABLE_BASE_OPERATORS_ON(T) \ inline T operator+(const T d1, const T d2) { return T(int(d1) + int(d2)); } \ inline T operator-(const T d1, const T d2) { return T(int(d1) - int(d2)); } \ -- 2.39.2