From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 4 Jul 2009 17:03:49 +0000 (+0100)
Subject: Check Intel compiler before MSVC in bitcount.h
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=92b625d04f0d240a80defbfb2c95178a835efc6e

Check Intel compiler before MSVC in bitcount.h

Predefined macro __INTEL_COMPILER is defined only for Intel,
while _MSC_VER is defined for both Intel C++ and MSVC.

So rearrange ifdefs to take in account this and test __INTEL_COMPILER
first and only if not defined check _MSC_VER for MSVC.

Patch suggested by Joona.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---

diff --git a/src/bitcount.h b/src/bitcount.h
index ef841f3a..a2e6c5be 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -34,9 +34,9 @@
 
 // Select type of intrinsic bit count instruction to use
 
-#if defined(_MSC_VER) && defined(IS_64BIT) && defined(USE_POPCNT) // Microsoft compiler
+#if defined(__INTEL_COMPILER) && defined(IS_64BIT) && defined(USE_POPCNT) // Intel compiler
 
-#include <intrin.h>
+#include <nmmintrin.h>
 
 inline bool cpu_has_popcnt() {
 
@@ -45,19 +45,19 @@ inline bool cpu_has_popcnt() {
   return (CPUInfo[2] >> 23) & 1;
 }
 
-// Define a dummy template to workaround a compile error if __popcnt64() is not defined.
+// Define a dummy template to workaround a compile error if _mm_popcnt_u64() is not defined.
 //
-// If __popcnt64() is defined in <intrin.h> it will be choosen first due to
+// If _mm_popcnt_u64() is defined in <nmmintrin.h> it will be choosen first due to
 // C++ overload rules that always prefer a function to a template with the same name.
 // If not, we avoid a compile error and because cpu_has_popcnt() should return false,
-// our templetized __popcnt64() is never called anyway.
-template<typename T> unsigned __popcnt64(T) { return 0; } // Is never called
+// our templetized _mm_popcnt_u64() is never called anyway.
+template<typename T> unsigned _mm_popcnt_u64(T) { return 0; } // Is never called
 
-#define POPCNT_INTRINSIC(x) __popcnt64(x)
+#define POPCNT_INTRINSIC(x) _mm_popcnt_u64(x)
 
-#elif defined(__INTEL_COMPILER) && defined(IS_64BIT) && defined(USE_POPCNT) // Intel compiler
+#elif defined(_MSC_VER) && defined(IS_64BIT) && defined(USE_POPCNT) // Microsoft compiler
 
-#include <nmmintrin.h>
+#include <intrin.h>
 
 inline bool cpu_has_popcnt() {
 
@@ -66,10 +66,10 @@ inline bool cpu_has_popcnt() {
   return (CPUInfo[2] >> 23) & 1;
 }
 
-// See comment of __popcnt64<>() few lines above for an explanation.
-template<typename T> unsigned _mm_popcnt_u64(T) { return 0; } // Is never called
+// See comment of _mm_popcnt_u64<>() few lines above for an explanation.
+template<typename T> unsigned __popcnt64(T) { return 0; } // Is never called
 
-#define POPCNT_INTRINSIC(x) _mm_popcnt_u64(x)
+#define POPCNT_INTRINSIC(x) __popcnt64(x)
 
 #else // Safe fallback for unsupported compilers or when USE_POPCNT is disabled