Fix POPCNT support for Intel compiler under Windows

[stockfish] / src / types.h

diff --git a/src/types.h b/src/types.h
index 45afb3a76ef1fd9148e2e976da26c2c1ff032c57..a379d5444956ef63537e4035eb27f1847faf70ca 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -17,7 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
@@ -27,6 +26,10 @@
 
 #else
 
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#pragma warning(disable: 4127) // Conditional expression is constant
+
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16;
@@ -47,31 +50,46 @@ typedef uint64_t Key;
 // Bitboard type
 typedef uint64_t Bitboard;
 
+#include <cstdlib>
 
 ////
 //// Configuration
 ////
 
-//// For Linux configuration is done using Makefile. To get started type "make help".
+//// For Linux and OSX configuration is done automatically using Makefile.
+//// To get started type "make help".
 ////
-//// For windows you need to set the right compiler switches manually:
+//// For windows part of the configuration is detected automatically, but
+//// some switches need to be set manually:
 ////
 //// -DNDEBUG       | Disable debugging mode. Use always.
 ////
-//// -DIS_64BIT     | Compile in 64-bit mode. Use on 64-bit systems.
-////
-//// -DBIGENDIAN    | Should not be used on Windows
-////
 //// -DNO_PREFETCH  | Disable use of prefetch asm-instruction. A must if you want the
 ////                | executable to run on some very old machines.
 ////
-//// -DUSE_BSFQ     | Use bsfq asm-instruction. Works only in 64-bit mode.
-////                | Works with ICC and GCC, not with MSVC. Gives a small speed up.
-////
 //// -DUSE_POPCNT   | Add runtime support for use of popcnt asm-instruction.
 ////                | Works only in 64-bit mode. For compiling requires hardware
 ////                | with popcnt support. Around 4% speed-up.
+////
+//// -DOLD_LOCKS    | By default under Windows are used the fast Slim Reader/Writer (SRW)
+////                | Locks and Condition Variables: these are not supported by Windows XP
+////                | and older, to compile for those platforms you should enable OLD_LOCKS.
 
+// Automatic detection for 64-bit under Windows
+#if defined(_WIN64)
+#define IS_64BIT
+#endif
+
+// Automatic detection for use of bsfq asm-instruction under Windows.
+// Works only in 64-bit mode. Does not work with MSVC.
+#if defined(_WIN64) && defined(__INTEL_COMPILER)
+#define USE_BSFQ
+#endif
+
+// Intel header for _mm_popcnt_u64() intrinsic
+#if defined(USE_POPCNT) && defined(_MSC_VER) && defined(__INTEL_COMPILER)
+#include <nmmintrin.h>
+#endif
 
 // Cache line alignment specification
 #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
@@ -104,4 +122,20 @@ inline void __cpuid(int CPUInfo[4], int)
 }
 #endif
 
+// Operators used by enum types like Depth, Piece, Square and so on.
+
+#define ENABLE_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)); } \
+inline T operator* (int i, const T d) {  return T(i * int(d)); } \
+inline T operator* (const T d, int i) {  return T(int(d) * i); } \
+inline T operator/ (const T d, int i) { return T(int(d) / i); } \
+inline T operator- (const T d) { return T(-int(d)); } \
+inline T operator++ (T& d, int) {d = T(int(d) + 1); return d; } \
+inline T operator-- (T& d, int) { d = T(int(d) - 1); return d; } \
+inline void operator+= (T& d1, const T d2) { d1 = d1 + d2; } \
+inline void operator-= (T& d1, const T d2) { d1 = d1 - d2; } \
+inline void operator*= (T& d, int i) { d = T(int(d) * i); } \
+inline void operator/= (T& d, int i) { d = T(int(d) / i); }
+
 #endif // !defined(TYPES_H_INCLUDED)