X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=89a2f5ee2e21e183d8c2ff7a715b7e0208574465;hp=4f85f2a0742c4ba79fb00a40f998d3d62d41aa28;hb=10c1ae8da0b981206a543cff6a2778a277f862df;hpb=7d34e7bf84abd4ba28037eb5d15986c5ba34d88d

diff --git a/src/misc.cpp b/src/misc.cpp
index 4f85f2a0..89a2f5ee 100644
--- 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-2009 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,6 +27,9 @@
 #  include <sys/time.h>
 #  include <sys/types.h>
 #  include <unistd.h>
+#  if defined(__hpux)
+#     include <sys/pstat.h>
+#  endif
 
 #else
 
@@ -38,6 +41,7 @@
 
 #include <cassert>
 #include <cstdio>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -50,7 +54,7 @@ using namespace std;
 /// Version number. If this is left empty, the current date (in the format
 /// YYMMDD) is used as a version number.
 
-static const string EngineVersion = "1.6";
+static const string EngineVersion = "";
 static const string AppName = "Stockfish";
 static const string AppTag  = "";
 
@@ -179,23 +183,32 @@ int get_system_time() {
 }
 
 
-/// 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);
@@ -204,6 +217,51 @@ int cpu_count() {
 #endif
 
 
+/// HT_enabled() returns true if hyper-threading is enabled on current machine
+
+static bool HT_enabled() {
+
+  char CPUString[0x20];
+  int CPUInfo[4] = {-1};
+  int nIds, nLogicalCPU, nCores;
+
+  // Detect CPU producer
+  __cpuid(CPUInfo, 0);
+  nIds = CPUInfo[0];
+
+  memset(CPUString, 0, sizeof(CPUString));
+  memcpy(&CPUString[0], &CPUInfo[1], sizeof(int));
+  memcpy(&CPUString[4], &CPUInfo[3], sizeof(int));
+  memcpy(&CPUString[8], &CPUInfo[2], sizeof(int));
+
+  // Not an Intel CPU or CPUID.4 not supported
+  if (strcmp(CPUString, "GenuineIntel") || 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
 */