X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitcount.h;h=d57b3f407339d9d2c311f9cf1a1ac12f7fbb8a94;hp=12826a9f9a05472c6e48066c202b55e0eea158ea;hb=bafb9f1a25204d06960a44f0637736edce233629;hpb=3376c68f4bb83dc9fd874eb9d710dab09609ae54

diff --git a/src/bitcount.h b/src/bitcount.h
index 12826a9f..d57b3f40 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -22,6 +22,12 @@
 #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 "bitboard.h"
 
 
@@ -48,7 +54,7 @@
 
 // Select type of intrinsic bit count instruction to use
 
-#if defined(_MSC_VER) // Microsoft compiler
+#if defined(_MSC_VER) && defined(_WIN64) // Microsoft compiler
 
 #include <intrin.h>
 
@@ -78,7 +84,7 @@ inline bool cpu_has_popcnt() {
 
 inline bool cpu_has_popcnt() { return false; }
 
-#define POPCNT_INTRINSIC(x) sw_count_1s(x)
+#define POPCNT_INTRINSIC(x) count_1s(x)
 
 #endif
 
@@ -87,19 +93,19 @@ inline bool cpu_has_popcnt() { return false; }
 
 #if defined(BITCOUNT_LOOP)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   int r;
   for(r = 0; b; r++, b &= b - 1);
   return r;
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   return count_1s(b);
 }
 
 #elif defined(BITCOUNT_SWAR_32)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
   w -= (w >> 1) & 0x55555555;
@@ -111,7 +117,7 @@ inline int sw_count_1s(Bitboard b) {
   return int(v >> 24);
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
   w -= (w >> 1) & 0x55555555;
@@ -124,7 +130,7 @@ inline int sw_count_1s_max_15(Bitboard b) {
 
 #elif defined(BITCOUNT_SWAR_64)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   b -= ((b>>1) & 0x5555555555555555ULL);
   b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
   b = ((b>>4) + b) & 0x0F0F0F0F0F0F0F0FULL;
@@ -132,7 +138,7 @@ inline int sw_count_1s(Bitboard b) {
   return int(b >> 56);
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   b -= (b>>1) & 0x5555555555555555ULL;
   b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
   b *= 0x1111111111111111ULL;
@@ -149,14 +155,32 @@ inline int sw_count_1s_max_15(Bitboard b) {
 template<bool UseIntrinsic>
 inline int count_1s(Bitboard b) {
 
-  return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s(b);
+  return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s(b);
 }
 
 template<bool UseIntrinsic>
 inline int count_1s_max_15(Bitboard b) {
 
-  return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s_max_15(b);
+  return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s_max_15(b);
 }
 
 
+// Global variable 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
+const bool CpuHasPOPCNT = cpu_has_popcnt();
+#endif
+
+
+// Global variable used to print info about the use of 64 optimized
+// functions to verify that a 64bit compile has been correctly built.
+#if defined(BITCOUNT_SWAR_64)
+const bool CpuHas64BitPath = true;
+#else
+const bool CpuHas64BitPath = false;
+#endif
+
 #endif // !defined(BITCOUNT_H_INCLUDED)