X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=0052f21e05c95dc3767e059f9bece1b12c53d570;hp=459c13ccccf887e6e72a8c8be9eafe633c6fed4c;hb=8a7876d48d4360d14d918c1ff444b5d6eb0382de;hpb=dbe5e28eaa284aeaa4927ddde8a4341200e0e601 diff --git a/src/misc.cpp b/src/misc.cpp index 459c13cc..0052f21e 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-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,24 +17,7 @@ along with this program. If not, see . */ -#if defined(_WIN32) || defined(_WIN64) - -#define NOMINMAX // disable macros min() and max() -#include - -#else - -# include -# if defined(__hpux) -# include -# endif - -#endif - -#if !defined(NO_PREFETCH) -# include -#endif - +#include #include #include #include @@ -44,99 +27,48 @@ 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 = ""; - +namespace { -/// 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 ", 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; -} +/// Version number. If Version is left empty, then compile date in the format +/// DD-MM-YY and show in engine_info. +const string Version = ""; +/// Debug counters +int64_t hits[2], means[2]; /// 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 splitted streambuf for cin and cout - Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {} - ~Logger() { start(false); } + Tie(streambuf* b, ofstream* f) : buf(b), file(f) {} - struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout + 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(), ">> "); } - Tie(streambuf* b, ofstream& f) : buf(b), file(f) {} + streambuf* buf; + ofstream* file; - 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'; - static int last = '\n'; + if (last == '\n') + file->rdbuf()->sputn(prefix, 3); - if (last == '\n') - file.rdbuf()->sputn(prefix, 3); + return last = file->rdbuf()->sputc((char)c); + } +}; - return last = file.rdbuf()->sputc((char)c); - } +class Logger { - streambuf* buf; - ofstream& file; - }; + Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {} + ~Logger() { start(false); } ofstream file; Tie in, out; @@ -161,46 +93,85 @@ 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 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_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 s.dwNumberOfProcessors; -#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 sysconf(_SC_NPROCESSORS_ONLN); -# elif defined(__hpux) - struct pst_dynamic psd; - if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1) - return 1; - return psd.psd_proc_cnt; -# else - return 1; -# endif + ss << (Is64Bit ? " 64" : "") + << (HasPext ? " BMI2" : (HasPopCnt ? " SSE4.2" : "")) + << (to_uci ? "\nid author ": " by ") + << "Tord Romstad, Marco Costalba and Joona Kiiski"; -#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 + +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 " + << (double)means[1] / means[0] << endl; +} + + +/// 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; + + 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); } + + +/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap +/// the conversion from milliseconds to struct timespec, as used by pthreads. void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 int tm = msec; #else timespec ts, *tm = &ts; - uint64_t ms = Time::current_time().msec() + msec; + uint64_t ms = Time::now() + msec; ts.tv_sec = ms / 1000; ts.tv_nsec = (ms % 1000) * 1000000LL; @@ -210,10 +181,10 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { } -/// 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) +/// 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*) {} @@ -221,14 +192,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