X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=2f99668d4457941b3d9ca0e2b5d0fba56890563a;hp=bdb2cc27c4d31372165ebfff8e073f535c913064;hb=60c121f3b1ee7d5ced3435cc1718e4e6e6fd8383;hpb=17d1940278aadde3d9d844f7c913ca6c8655bbf3

diff --git a/src/misc.cpp b/src/misc.cpp
index bdb2cc27..2f99668d 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,8 @@
   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 <chrono>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -44,77 +27,53 @@
 #include "thread.h"
 
 using namespace std;
+using namespace std::chrono;
 
-/// 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 = "";
+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 = "";
 
-/// 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;
+/// Debug counters
+int64_t hits[2], means[2];
 
-      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();
-}
+/// 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 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
 
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
 
-/// Debug functions used mainly to collect run-time statistics
+  Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
 
-static uint64_t hits[2], means[2];
+  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(), ">> "); }
 
-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; }
+  streambuf* buf;
+  ofstream* file;
 
-void dbg_print() {
+  int log(int c, const char* prefix) {
 
-  if (hits[0])
-      cerr << "Total " << hits[0] << " Hits " << hits[1]
-           << " hit rate (%) " << 100 * hits[1] / hits[0] << endl;
+    static int last = '\n';
 
-  if (means[0])
-      cerr << "Total " << means[0] << " Mean "
-           << (float)means[1] / means[0] << endl;
-}
+    if (last == '\n')
+        file->rdbuf()->sputn(prefix, 3);
 
+    return last = file->rdbuf()->sputc((char)c);
+  }
+};
 
-/// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
-/// cout.rdbuf() with this one that tees cin and cout to a file stream. We can
-/// toggle the logging of std::cout and std:cin at runtime while preserving i/o
-/// functionality and without changing a single line of code!
-/// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
+class Logger {
 
-class Logger: public streambuf {
+  Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
 
-  Logger() : cinbuf(cin.rdbuf()), coutbuf(cout.rdbuf()) {}
-  ~Logger() { start(false); }
+  ofstream file;
+  Tie in, out;
 
 public:
   static void start(bool b) {
@@ -124,91 +83,98 @@ public:
     if (b && !l.file.is_open())
     {
         l.file.open("io_log.txt", ifstream::out | ifstream::app);
-        cin.rdbuf(&l);
-        cout.rdbuf(&l);
+        cin.rdbuf(&l.in);
+        cout.rdbuf(&l.out);
     }
     else if (!b && l.file.is_open())
     {
-        cout.rdbuf(l.coutbuf);
-        cin.rdbuf(l.cinbuf);
+        cout.rdbuf(l.out.buf);
+        cin.rdbuf(l.in.buf);
         l.file.close();
     }
   }
+};
 
-private:
-  int sync() { return file.rdbuf()->pubsync(), coutbuf->pubsync(); }
-  int overflow(int c) { return log(coutbuf->sputc((char)c), "<< ") ; }
-  int underflow() { return cinbuf->sgetc(); }
-  int uflow() { return log(cinbuf->sbumpc(), ">> "); }
+} // namespace
 
-  int log(int c, const char* prefix) {
+/// 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.
 
-    static int last = '\n';
+const string engine_info(bool to_uci) {
 
-    if (last == '\n')
-        file.rdbuf()->sputn(prefix, 3);
+  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"
+
+  ss << "Stockfish " << Version << setfill('0');
 
-    return last = file.rdbuf()->sputc((char)c);
+  if (Version.empty())
+  {
+      date >> month >> day >> year;
+      ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2);
   }
 
-private:
-  ofstream file;
-  streambuf *cinbuf, *coutbuf;
-};
+  ss << (Is64Bit ? " 64" : "")
+     << (HasPext ? " BMI2" : (HasPopCnt ? " POPCNT" : ""))
+     << (to_uci  ? "\nid author ": " by ")
+     << "Tord Romstad, Marco Costalba and Joona Kiiski";
 
+  return ss.str();
+}
 
-/// Trampoline helper to avoid moving Logger to misc.h header
-void start_logger(bool b) { Logger::start(b); }
 
+/// Convert system time to milliseconds. That's all we need.
 
-/// cpu_count() tries to detect the number of CPU cores
+Time::point Time::now() {
+  return duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
+}
 
-int cpu_count() {
 
-#if defined(_WIN32) || defined(_WIN64)
-  SYSTEM_INFO s;
-  GetSystemInfo(&s);
-  return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
-#else
+/// Debug functions used mainly to collect run-time statistics
 
-#  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
+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; }
 
-#endif
+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 "
+           << (double)means[1] / means[0] << endl;
 }
 
 
-/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
-/// conversion from milliseconds to struct timespec, as used by pthreads.
+/// Used to serialize access to std::cout to avoid multiple threads writing at
+/// the same time.
 
-void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
 
-#if defined(_WIN32) || defined(_WIN64)
-  int tm = msec;
-#else
-  timespec ts, *tm = &ts;
-  uint64_t ms = Time::current_time().msec() + msec;
+  static std::mutex m;
 
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000000LL;
-#endif
+  if (sc == IO_LOCK)
+      m.lock();
+
+  if (sc == IO_UNLOCK)
+      m.unlock();
 
-  cond_timedwait(sleepCond, sleepLock, tm);
+  return os;
 }
 
 
-/// 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)
+/// 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(char*) {}
 
@@ -216,14 +182,17 @@ void prefetch(char*) {}
 
 void prefetch(char* 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(addr, _MM_HINT_T0);
+#  else
+  __builtin_prefetch(addr);
+#  endif
 }
 
 #endif