Fix POPCNT detection gcc compile error

[stockfish] / src / bitcount.h

diff --git a/src/bitcount.h b/src/bitcount.h
index 4747afc6aa73861e7a34785833352fc905c030e4..ec638d40380ef4f8571b146a6913e7aecab0c1f0 100644 (file)
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -22,49 +22,22 @@
 #if !defined(BITCOUNT_H_INCLUDED)
 #define BITCOUNT_H_INCLUDED
 
-// To disable POPCNT support uncomment following line. You should do it only
-// in PGO compiling to exercise the default fallback path. Don't forget to
-// re-comment the line for the final optimized compile though ;-)
-//#define DISABLE_POPCNT_SUPPORT
-
-
 #include "types.h"
 
-// Select type of intrinsic bit count instruction to use
-
-#if defined(_MSC_VER) && defined(_WIN64) // Microsoft compiler
-
-#include <intrin.h>
-
-inline bool cpu_has_popcnt() {
+// Select type of intrinsic bit count instruction to use, see
+// README.txt on how to pgo compile with POPCNT support.
+#if !defined(USE_POPCNT)
+#define POPCNT_INTRINSIC(x) 0
+#elif defined(_MSC_VER)
+#define POPCNT_INTRINSIC(x) (int)__popcnt64(x)
+#elif defined(__GNUC__)
 
-  int CPUInfo[4] = {-1};
-  __cpuid(CPUInfo, 0x00000001);
-  return (CPUInfo[2] >> 23) & 1;
-}
+#define POPCNT_INTRINSIC(x) ({ \
+   unsigned long __ret; \
+   __asm__("popcnt %1, %0" : "=r" (__ret) : "r" (x)); \
+   __ret; })
 
-#define POPCNT_INTRINSIC(x) __popcnt64(x)
-
-#elif defined(__INTEL_COMPILER) && (defined(__x86_64) || defined(_M_X64)) // Intel compiler
-
-#include <nmmintrin.h>
-
-inline bool cpu_has_popcnt() {
-
-  int CPUInfo[4] = {-1};
-  __cpuid(CPUInfo, 0x00000001);
-  return (CPUInfo[2] >> 23) & 1;
-}
-
-#define POPCNT_INTRINSIC(x) _mm_popcnt_u64(x)
-
-#else // Safe fallback for unsupported compilers
-
-inline bool cpu_has_popcnt() { return false; }
-
-#define POPCNT_INTRINSIC(x) count_1s(x)
-
-#endif // cpu_has_popcnt() selection
+#endif
 
 
 /// Software implementation of bit count functions
@@ -131,18 +104,27 @@ inline int count_1s_max_15(Bitboard b) {
 }
 
 
-// Global variable initialized at startup that is set to true if
+// Detect hardware POPCNT support
+inline bool cpu_has_popcnt() {
+
+  int CPUInfo[4] = {-1};
+  __cpuid(CPUInfo, 0x00000001);
+  return (CPUInfo[2] >> 23) & 1;
+}
+
+
+// Global constant initialized at startup that is set to true if
 // CPU on which application runs supports POPCNT intrinsic. Unless
-// DISABLE_POPCNT_SUPPORT is defined.
-#if defined(DISABLE_POPCNT_SUPPORT)
-const bool CpuHasPOPCNT = false;
-#else
+// USE_POPCNT is not defined.
+#if defined(USE_POPCNT)
 const bool CpuHasPOPCNT = cpu_has_popcnt();
+#else
+const bool CpuHasPOPCNT = false;
 #endif
 
 
-// Global variable used to print info about the use of 64 optimized
-// functions to verify that a 64bit compile has been correctly built.
+// Global constant used to print info about the use of 64 optimized
+// functions to verify that a 64 bit compile has been correctly built.
 #if defined(IS_64BIT)
 const bool CpuHas64BitPath = true;
 #else