X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitcount.h;h=aa27c049415bcc3ce98750d48a9194152f8d8486;hp=9a3b481169b667943dedbb28cf538f977e02ca5e;hb=942c18ef6620967921049ba24f25e08d710c947e;hpb=08f3aac97c9ee9d9a4cf0a3232ac0bfa4c320896 diff --git a/src/bitcount.h b/src/bitcount.h index 9a3b4811..aa27c049 100644 --- a/src/bitcount.h +++ b/src/bitcount.h @@ -22,20 +22,14 @@ #if !defined(BITCOUNT_H_INCLUDED) #define BITCOUNT_H_INCLUDED -// To disable POPCNT support uncomment NO_POPCNT define. 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 NO_POPCNT - - #include "types.h" -// Select type of intrinsic bit count instruction to use +// Select type of intrinsic bit count instruction to use, see +// README.txt on how to pgo compile with POPCNT support. -#if defined(_MSC_VER) && defined(IS_64BIT) && !defined(NO_POPCNT) // Microsoft compiler +#if defined(__INTEL_COMPILER) && defined(USE_POPCNT) // Intel compiler -#include +#include inline bool cpu_has_popcnt() { @@ -44,19 +38,11 @@ inline bool cpu_has_popcnt() { return (CPUInfo[2] >> 23) & 1; } -// Define a dummy template to workaround a compile error if __popcnt64() is not defined. -// -// If __popcnt64() is defined in 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 unsigned __popcnt64(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(NO_POPCNT) // Intel compiler +#elif defined(_MSC_VER) && defined(USE_POPCNT) // Microsoft compiler -#include +#include inline bool cpu_has_popcnt() { @@ -65,12 +51,9 @@ inline bool cpu_has_popcnt() { return (CPUInfo[2] >> 23) & 1; } -// See comment of __popcnt64<>() few lines above for an explanation. -template unsigned _mm_popcnt_u64(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 NO_POPCNT is defined +#else // Safe fallback for unsupported compilers or when USE_POPCNT is disabled inline bool cpu_has_popcnt() { return false; } @@ -145,12 +128,8 @@ inline int count_1s_max_15(Bitboard b) { // Global constant initialized at startup that is set to true if // CPU on which application runs supports POPCNT intrinsic. Unless -// NO_POPCNT is defined. -#if defined(NO_POPCNT) -const bool CpuHasPOPCNT = false; -#else +// USE_POPCNT is not defined. const bool CpuHasPOPCNT = cpu_has_popcnt(); -#endif // Global constant used to print info about the use of 64 optimized