Fix a warning in HT_enabled()

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 281d8595a7cca6dd227fe6c0f83b1cb7610beb04..c5160301b3a05066812a0862dcda3b65f28fb3e0 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,43 +27,26 @@
 #  include <sys/time.h>
 #  include <sys/types.h>
 #  include <unistd.h>
+#  if defined(__hpux)
+#     include <sys/pstat.h>
+#  endif
 
 #else
-/*
-   (c) Copyright 1992 Eric Backus
-
-   This software may be used freely so long as this copyright notice is
-   left intact. There is no warrantee on this software.
-*/
-#  include <windows.h>
-#  include <time.h>
-#  include "dos.h"
-static int gettimeofday(struct timeval* tp, struct timezone*)
-{
-    SYSTEMTIME systime;
 
-    if (tp)
-    {
-        struct tm tmrec;
-        time_t theTime = time(NULL);
-
-        tmrec = *localtime(&theTime);
-        tp->tv_sec = mktime(&tmrec);
-        GetLocalTime(&systime); /* system time */
-
-        tp->tv_usec = systime.wMilliseconds * 1000;
-    }
-    return 0;
-}
+#define _CRT_SECURE_NO_DEPRECATE
+#include <windows.h>
+#include <sys/timeb.h>
 
 #endif
 
 #include <cassert>
 #include <cstdio>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
+#include "bitcount.h"
 #include "misc.h"
 
 using namespace std;
@@ -80,8 +63,10 @@ static const string AppTag  = "";
 //// Variables
 ////
 
-long dbg_cnt0 = 0;
-long dbg_cnt1 = 0;
+bool Chess960;
+
+uint64_t dbg_cnt0 = 0;
+uint64_t dbg_cnt1 = 0;
 
 bool dbg_show_mean = false;
 bool dbg_show_hit_rate = false;
@@ -159,8 +144,10 @@ void dbg_print_mean(ofstream& logFile) {
 
 const string engine_name() {
 
+  const string cpu64(CpuHas64BitPath ? " 64bit" : "");
+
   if (!EngineVersion.empty())
-      return "Stockfish " + EngineVersion;
+      return AppName+ " " + EngineVersion + cpu64;
 
   string date(__DATE__); // From compiler, format is "Sep 21 2008"
   string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
@@ -173,7 +160,7 @@ const string engine_name() {
   string name = AppName + " " + AppTag + " ";
 
   s << name << date.substr(date.length() - 2) << setfill('0')
-    << setw(2) << mon << setw(2) << day;
+    << setw(2) << mon << setw(2) << day << cpu64;
 
   return s.str();
 }
@@ -183,29 +170,45 @@ const string engine_name() {
 /// milliseconds.
 
 int get_system_time() {
-  struct timeval t;
-  gettimeofday(&t, NULL);
-  return t.tv_sec*1000 + t.tv_usec/1000;
+
+#if defined(_MSC_VER)
+    struct _timeb t;
+    _ftime(&t);
+    return int(t.time*1000 + t.millitm);
+#else
+    struct timeval t;
+    gettimeofday(&t, NULL);
+    return t.tv_sec*1000 + t.tv_usec/1000;
+#endif
 }
 
 
-/// cpu_count() tries to detect the number of CPU cores.
+/// builtin_cpu_count() tries to detect the number of CPU cores, if
+/// hyper-threading is enabled this is the number of logical processors.
 
 #if !defined(_MSC_VER)
 
 #  if defined(_SC_NPROCESSORS_ONLN)
-int cpu_count() {
+static int builtin_cpu_count() {
   return Min(sysconf(_SC_NPROCESSORS_ONLN), 8);
 }
+#  elif defined(__hpux)
+static int builtin_cpu_count() {
+  struct pst_dynamic psd;
+  if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
+      return 1;
+
+  return Min(psd.psd_proc_cnt, 8);
+}
 #  else
-int cpu_count() {
+static int builtin_cpu_count() {
   return 1;
 }
 #  endif
 
 #else
 
-int cpu_count() {
+static int builtin_cpu_count() {
   SYSTEM_INFO s;
   GetSystemInfo(&s);
   return Min(s.dwNumberOfProcessors, 8);
@@ -214,6 +217,45 @@ int cpu_count() {
 #endif
 
 
+/// HT_enabled() returns true if hyper-threading is enabled on current machine
+
+static bool HT_enabled() {
+
+  int CPUInfo[4] = {-1};
+  int nIds, nLogicalCPU, nCores;
+
+  // Detect CPU producer
+  __cpuid(CPUInfo, 0);
+  nIds = CPUInfo[0];
+
+  // Not an Intel CPU or CPUID.4 not supported
+  if (!((CPUInfo[1] == 'uneG') && (CPUInfo[3] == 'Ieni') && (CPUInfo[2] == 'letn')) || nIds < 4)
+      return false;
+
+  // Detect if HT Technology is supported
+  __cpuid(CPUInfo, 1);
+  if (!((CPUInfo[3] >> 28) & 1))
+      return false;
+
+  nLogicalCPU = (CPUInfo[1] >> 16) & 0xFF;
+
+  // Detect number of cores
+  __cpuid(CPUInfo, 4);
+  nCores = 1 + ((CPUInfo[0] >> 26) & 0x3F);
+
+  return nLogicalCPU > nCores;
+}
+
+
+/// cpu_count() tries to detect the number of physical CPU cores taking
+/// in account hyper-threading.
+
+int cpu_count() {
+
+  return HT_enabled() ? builtin_cpu_count() / 2 : builtin_cpu_count();
+}
+
+
 /*
   From Beowulf, from Olithink
 */