X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=bb51cf453437e86fa88d3676db62da26f7192880;hp=8bc413f47be9657217ce0151a0604702f3b100c0;hb=ed72a1e9ba37a9fa2674da8f46bb0597a1721c2d;hpb=3b7dbc4f6d68928ad97a5d77561509232dd23f78

diff --git a/src/misc.cpp b/src/misc.cpp
index 8bc413f4..bb51cf45 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 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
@@ -17,25 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_WIN32) || defined(_WIN64)
-
-#define NOMINMAX // disable macros min() and max()
-#include <windows.h>
-
-#else
-
-#  include <unistd.h>
-#  if defined(__hpux)
-#     include <sys/pstat.h>
-#  endif
-
-#endif
-
-#if !defined(NO_PREFETCH)
-#  include <xmmintrin.h>
-#endif
-
-#include <algorithm>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -45,99 +27,44 @@
 
 using namespace std;
 
-/// Version number. If Version is left empty, then Tag plus current
-/// date (in the format YYMMDD) is used as a version number.
-
-static const string Version = "";
-static const string Tag = "";
-
-
-/// engine_info() returns the full name of the current Stockfish version.
-/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
-/// the program was compiled) or "Stockfish <version number>", depending
-/// on whether Version is empty.
-
-const string engine_info(bool to_uci) {
-
-  const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
-  const string cpu64(Is64Bit ? " 64bit" : "");
-  const string popcnt(HasPopCnt ? " SSE4.2" : "");
-
-  string month, day, year;
-  stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
-
-  if (Version.empty())
-  {
-      date >> month >> day >> year;
-
-      s << "Stockfish " << Tag
-        << setfill('0') << " " << year.substr(2)
-        << setw(2) << (1 + months.find(month) / 4)
-        << setw(2) << day;
-  }
-  else
-      s << "Stockfish " << Version;
-
-  s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
-    << "Tord Romstad, Marco Costalba and Joona Kiiski";
-
-  return s.str();
-}
-
-
-/// Debug functions used mainly to collect run-time statistics
-
-static uint64_t hits[2], means[2];
-
-void dbg_hit_on(bool b) { hits[0]++; if (b) hits[1]++; }
-void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); }
-void dbg_mean_of(int v) { means[0]++; means[1] += v; }
-
-void dbg_print() {
-
-  if (hits[0])
-      cerr << "Total " << hits[0] << " Hits " << hits[1]
-           << " hit rate (%) " << 100 * hits[1] / hits[0] << endl;
-
-  if (means[0])
-      cerr << "Total " << means[0] << " Mean "
-           << (float)means[1] / means[0] << endl;
-}
+namespace {
 
+/// Version number. If Version is left empty, then compile date in the format
+/// DD-MM-YY and show in engine_info.
+const string Version = "";
 
 /// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
 /// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We
-/// can toggle the logging of std::cout and std:cin at runtime while preserving
-/// usual i/o functionality and without changing a single line of code!
+/// can toggle the logging of std::cout and std:cin at runtime whilst preserving
+/// usual I/O functionality, all without changing a single line of code!
 /// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
 
-class Logger {
+struct Tie: public streambuf { // MSVC requires split streambuf for cin and cout
 
-  Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {}
-  ~Logger() { start(false); }
+  Tie(streambuf* b, streambuf* l) : buf(b), logBuf(l) {}
 
-  struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
+  int sync() { return logBuf->pubsync(), buf->pubsync(); }
+  int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
+  int underflow() { return buf->sgetc(); }
+  int uflow() { return log(buf->sbumpc(), ">> "); }
 
-    Tie(streambuf* b, ofstream& f) : buf(b), file(f) {}
+  streambuf *buf, *logBuf;
 
-    int sync() { return file.rdbuf()->pubsync(), buf->pubsync(); }
-    int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
-    int underflow() { return buf->sgetc(); }
-    int uflow() { return log(buf->sbumpc(), ">> "); }
+  int log(int c, const char* prefix) {
 
-    int log(int c, const char* prefix) {
+    static int last = '\n'; // Single log file
 
-      static int last = '\n';
+    if (last == '\n')
+        logBuf->sputn(prefix, 3);
 
-      if (last == '\n')
-          file.rdbuf()->sputn(prefix, 3);
+    return last = logBuf->sputc((char)c);
+  }
+};
 
-      return last = file.rdbuf()->sputc((char)c);
-    }
+class Logger {
 
-    streambuf* buf;
-    ofstream& file;
-  };
+  Logger() : in(cin.rdbuf(), file.rdbuf()), out(cout.rdbuf(), file.rdbuf()) {}
+ ~Logger() { start(false); }
 
   ofstream file;
   Tie in, out;
@@ -149,7 +76,7 @@ public:
 
     if (b && !l.file.is_open())
     {
-        l.file.open("io_log.txt", ifstream::out | ifstream::app);
+        l.file.open("io_log.txt", ifstream::out);
         cin.rdbuf(&l.in);
         cout.rdbuf(&l.out);
     }
@@ -162,74 +89,98 @@ public:
   }
 };
 
+} // namespace
 
-/// Trampoline helper to avoid moving Logger to misc.h
-void start_logger(bool b) { Logger::start(b); }
+/// engine_info() returns the full name of the current Stockfish version. This
+/// will be either "Stockfish <Tag> DD-MM-YY" (where DD-MM-YY is the date when
+/// the program was compiled) or "Stockfish <Version>", depending on whether
+/// Version is empty.
 
+const string engine_info(bool to_uci) {
 
-/// cpu_count() tries to detect the number of CPU cores
+  const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
+  string month, day, year;
+  stringstream ss, date(__DATE__); // From compiler, format is "Sep 21 2008"
 
-int cpu_count() {
+  ss << "Stockfish " << Version << setfill('0');
 
-#if defined(_WIN32) || defined(_WIN64)
-  SYSTEM_INFO s;
-  GetSystemInfo(&s);
-  return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
-#else
+  if (Version.empty())
+  {
+      date >> month >> day >> year;
+      ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2);
+  }
 
-#  if defined(_SC_NPROCESSORS_ONLN)
-  return std::min((int)sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
-#  elif defined(__hpux)
-  struct pst_dynamic psd;
-  if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
-      return 1;
-  return std::min((int)psd.psd_proc_cnt, MAX_THREADS);
-#  else
-  return 1;
-#  endif
+  ss << (Is64Bit ? " 64" : "")
+     << (HasPext ? " BMI2" : (HasPopCnt ? " POPCNT" : ""))
+     << (to_uci  ? "\nid author ": " by ")
+     << "T. Romstad, M. Costalba, J. Kiiski, G. Linscott";
 
-#endif
+  return ss.str();
 }
 
 
-/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
-/// conversion from milliseconds to struct timespec, as used by pthreads.
+/// Debug functions used mainly to collect run-time statistics
+static int64_t hits[2], means[2];
 
-void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
+void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; }
+void dbg_hit_on(bool c, bool b) { if (c) dbg_hit_on(b); }
+void dbg_mean_of(int v) { ++means[0]; means[1] += v; }
 
-#if defined(_WIN32) || defined(_WIN64)
-  int tm = msec;
-#else
-  timespec ts, *tm = &ts;
-  uint64_t ms = Time::current_time().msec() + msec;
+void dbg_print() {
 
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000000LL;
-#endif
+  if (hits[0])
+      cerr << "Total " << hits[0] << " Hits " << hits[1]
+           << " hit rate (%) " << 100 * hits[1] / hits[0] << endl;
 
-  cond_timedwait(sleepCond, sleepLock, tm);
+  if (means[0])
+      cerr << "Total " << means[0] << " Mean "
+           << (double)means[1] / means[0] << endl;
 }
 
 
-/// prefetch() preloads the given address in L1/L2 cache. This is a non
-/// blocking function and do not stalls the CPU waiting for data to be
-/// loaded from memory, that can be quite slow.
-#if defined(NO_PREFETCH)
+/// Used to serialize access to std::cout to avoid multiple threads writing at
+/// the same time.
+
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
+
+  static Mutex m;
 
-void prefetch(char*) {}
+  if (sc == IO_LOCK)
+      m.lock();
+
+  if (sc == IO_UNLOCK)
+      m.unlock();
+
+  return os;
+}
+
+
+/// Trampoline helper to avoid moving Logger to misc.h
+void start_logger(bool b) { Logger::start(b); }
+
+
+/// prefetch() preloads the given address in L1/L2 cache. This is a non-blocking
+/// function that doesn't stall the CPU waiting for data to be loaded from memory,
+/// which can be quite slow.
+#ifdef NO_PREFETCH
+
+void prefetch(void*) {}
 
 #else
 
-void prefetch(char* addr) {
+void prefetch(void* addr) {
 
-#  if defined(__INTEL_COMPILER) || defined(__ICL)
-   // This hack prevents prefetches to be optimized away by
-   // Intel compiler. Both MSVC and gcc seems not affected.
+#  if defined(__INTEL_COMPILER)
+   // This hack prevents prefetches from being optimized away by
+   // Intel compiler. Both MSVC and gcc seem not be affected by this.
    __asm__ ("");
 #  endif
 
-  _mm_prefetch(addr, _MM_HINT_T2);
-  _mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead
+#  if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+  _mm_prefetch((char*)addr, _MM_HINT_T0);
+#  else
+  __builtin_prefetch(addr);
+#  endif
 }
 
 #endif