X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=b3cd10a0e91e8f6987fb843d61057db6a13bd140;hb=413b24380993cfdb7578ebe10b6a71b51bd8fb5b;hp=72f93c5e0677cd1f854d29795ebb042a25e88eab;hpb=3e8bb6f63dbe753ee371267b02e42208d894f01b;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 72f93c5e..b3cd10a0 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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,274 +17,192 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#if !defined(_MSC_VER)
-
-# include
-# include
-# include
-# if defined(__hpux)
-# include
-# endif
-
-#else
-
-#define _CRT_SECURE_NO_DEPRECATE
-#include
-#include
-
-#endif
-
-#if !defined(NO_PREFETCH)
-# include
-#endif
-
-#include
-#include
+#include
#include
#include
#include
-#include "bitcount.h"
#include "misc.h"
#include "thread.h"
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 = "";
-static const string AppName = "Stockfish";
-static const string AppTag = "";
-
+namespace {
-////
-//// Variables
-////
+/// Version number. If Version is left empty, then compile date in the format
+/// DD-MM-YY and show in engine_info.
+const string Version = "";
-static uint64_t dbg_cnt0 = 0;
-static uint64_t dbg_cnt1 = 0;
+/// Debug counters
+int64_t hits[2], means[2];
-bool dbg_show_mean = false;
-bool dbg_show_hit_rate = false;
+/// 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
-////
-//// Functions
-////
+ Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
-void dbg_hit_on(bool b) {
+ 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(), ">> "); }
- assert(!dbg_show_mean);
- dbg_show_hit_rate = true;
- dbg_cnt0++;
- if (b)
- dbg_cnt1++;
-}
+ streambuf* buf;
+ ofstream* file;
-void dbg_hit_on_c(bool c, bool b) {
+ int log(int c, const char* prefix) {
- if (c)
- dbg_hit_on(b);
-}
+ static int last = '\n';
-void dbg_before() {
+ if (last == '\n')
+ file->rdbuf()->sputn(prefix, 3);
- assert(!dbg_show_mean);
- dbg_show_hit_rate = true;
- dbg_cnt0++;
-}
+ return last = file->rdbuf()->sputc((char)c);
+ }
+};
-void dbg_after() {
+class Logger {
- assert(!dbg_show_mean);
- dbg_show_hit_rate = true;
- dbg_cnt1++;
-}
-
-void dbg_mean_of(int v) {
-
- assert(!dbg_show_hit_rate);
- dbg_show_mean = true;
- dbg_cnt0++;
- dbg_cnt1 += v;
-}
+ Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
-void dbg_print_hit_rate() {
+ ofstream file;
+ Tie in, out;
- cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1
- << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl;
-}
+public:
+ static void start(bool b) {
-void dbg_print_mean() {
+ static Logger l;
- cout << "Total " << dbg_cnt0 << " Mean "
- << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl;
-}
+ if (b && !l.file.is_open())
+ {
+ l.file.open("io_log.txt", ifstream::out | ifstream::app);
+ cin.rdbuf(&l.in);
+ cout.rdbuf(&l.out);
+ }
+ else if (!b && l.file.is_open())
+ {
+ cout.rdbuf(l.out.buf);
+ cin.rdbuf(l.in.buf);
+ l.file.close();
+ }
+ }
+};
+} // namespace
-/// engine_name() 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 ", depending
-/// on whether the constant EngineVersion (defined in misc.h) is empty.
+/// engine_info() returns the full name of the current Stockfish version. This
+/// will be either "Stockfish DD-MM-YY" (where DD-MM-YY is the date when
+/// the program was compiled) or "Stockfish ", depending on whether
+/// Version is empty.
-const string engine_name() {
+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(CpuIs64Bit ? " 64bit" : "");
-
- if (!EngineVersion.empty())
- return AppName + " " + EngineVersion + cpu64;
-
- stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
string month, day, year;
+ stringstream ss, date(__DATE__); // From compiler, format is "Sep 21 2008"
- date >> month >> day >> year;
-
- s << setfill('0') << AppName + " " + AppTag + " "
- << year.substr(2, 2) << setw(2)
- << (1 + months.find(month) / 4) << setw(2)
- << day << cpu64;
-
- return s.str();
-}
+ ss << "Stockfish " << Version << setfill('0');
+ if (Version.empty())
+ {
+ date >> month >> day >> year;
+ ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2);
+ }
-/// get_system_time() returns the current system time, measured in
-/// milliseconds.
+ ss << (Is64Bit ? " 64" : "")
+ << (HasPext ? " BMI2" : (HasPopCnt ? " POPCNT" : ""))
+ << (to_uci ? "\nid author ": " by ")
+ << "Tord Romstad, Marco Costalba and Joona Kiiski";
-int get_system_time() {
-
-#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
+ return ss.str();
}
-/// cpu_count() tries to detect the number of CPU cores.
+/// Debug functions used mainly to collect run-time statistics
-#if !defined(_MSC_VER)
+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; }
-# if defined(_SC_NPROCESSORS_ONLN)
-int cpu_count() {
- return Min(sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
-}
-# elif defined(__hpux)
-int cpu_count() {
- struct pst_dynamic psd;
- if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
- return 1;
+void dbg_print() {
- return Min(psd.psd_proc_cnt, MAX_THREADS);
-}
-# else
-int cpu_count() {
- return 1;
-}
-# endif
-
-#else
+ if (hits[0])
+ cerr << "Total " << hits[0] << " Hits " << hits[1]
+ << " hit rate (%) " << 100 * hits[1] / hits[0] << endl;
-int cpu_count() {
- SYSTEM_INFO s;
- GetSystemInfo(&s);
- return Min(s.dwNumberOfProcessors, MAX_THREADS);
+ if (means[0])
+ cerr << "Total " << means[0] << " Mean "
+ << (double)means[1] / means[0] << endl;
}
-#endif
+/// Used to serialize access to std::cout to avoid multiple threads writing at
+/// the same time.
-/// Check for console input. Original code from Beowulf and Olithink
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
-#ifndef _WIN32
+ static Mutex m;
-int data_available()
-{
- fd_set readfds;
- struct timeval timeout;
+ if (sc == IO_LOCK)
+ m.lock();
- FD_ZERO(&readfds);
- FD_SET(fileno(stdin), &readfds);
- timeout.tv_sec = 0; // Set to timeout immediately
- timeout.tv_usec = 0;
- select(16, &readfds, 0, 0, &timeout);
+ if (sc == IO_UNLOCK)
+ m.unlock();
- return (FD_ISSET(fileno(stdin), &readfds));
+ return os;
}
-#else
-int data_available()
-{
- static HANDLE inh = NULL;
- static bool usePipe;
- INPUT_RECORD rec[256];
- DWORD dw, recCnt;
+/// Trampoline helper to avoid moving Logger to misc.h
+void start_logger(bool b) { Logger::start(b); }
- if (!inh)
- {
- inh = GetStdHandle(STD_INPUT_HANDLE);
- usePipe = !GetConsoleMode(inh, &dw);
- if (!usePipe)
- {
- SetConsoleMode(inh, dw & ~(ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT));
- FlushConsoleInputBuffer(inh);
- }
- }
- // If we're running under XBoard then we can't use PeekConsoleInput() as
- // the input commands are sent to us directly over the internal pipe.
- if (usePipe)
- return PeekNamedPipe(inh, NULL, 0, NULL, &dw, NULL) ? dw : 1;
+/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap
+/// the conversion from milliseconds to struct timespec, as used by pthreads.
- // Count the number of unread input records, including keyboard,
- // mouse, and window-resizing input records.
- GetNumberOfConsoleInputEvents(inh, &dw);
+void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
- // Read data from console without removing it from the buffer
- if (dw <= 0 || !PeekConsoleInput(inh, rec, Min(dw, 256), &recCnt))
- return 0;
+#ifdef _WIN32
+ int tm = msec;
+#else
+ timespec ts, *tm = &ts;
+ uint64_t ms = Time::now() + msec;
- // Search for at least one keyboard event
- for (DWORD i = 0; i < recCnt; i++)
- if (rec[i].EventType == KEY_EVENT)
- return 1;
+ ts.tv_sec = ms / 1000;
+ ts.tv_nsec = (ms % 1000) * 1000000LL;
+#endif
- return 0;
+ cond_timedwait(sleepCond, sleepLock, tm);
}
-#endif
+/// 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
-/// 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 RAM, that can be very slow.
-#if defined(NO_PREFETCH)
void prefetch(char*) {}
+
#else
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
+# 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
-