X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=d436ee92d8559f290facf2ba13f764ae98f31dfb;hp=0a1879b2bef2dc94da039dc1ed791288b74a0c40;hb=b96db269a87549ceefaf8b812c050292f81b6c5c;hpb=096351d1f53fe98f86cf2b4678f696b9cd8ddebd diff --git a/src/misc.cpp b/src/misc.cpp index 0a1879b2..d436ee92 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-2012 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,12 +17,14 @@ along with this program. If not, see . */ +#if defined(_MSC_VER) -//// -//// Includes -//// +#define _CRT_SECURE_NO_DEPRECATE +#define NOMINMAX // disable macros min() and max() +#include +#include -#if !defined(_MSC_VER) +#else # include # include @@ -31,260 +33,169 @@ # 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 = "2.0.1"; -static const string AppName = "Stockfish"; -static const string AppTag = ""; - +/// Version number. If Version is left empty, then Tag plus current +/// date (in the format YYMMDD) is used as a version number. -//// -//// Variables -//// +static const string Version = ""; +static const string Tag = ""; -static uint64_t dbg_cnt0 = 0; -static uint64_t dbg_cnt1 = 0; - -bool dbg_show_mean = false; -bool dbg_show_hit_rate = false; +/// 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. -//// -//// Functions -//// +const string engine_info(bool to_uci) { -void dbg_hit_on(bool b) { + 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" : ""); - assert(!dbg_show_mean); - dbg_show_hit_rate = true; - dbg_cnt0++; - if (b) - dbg_cnt1++; -} + string month, day, year; + stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008" -void dbg_hit_on_c(bool c, bool b) { + if (Version.empty()) + { + date >> month >> day >> year; - if (c) - dbg_hit_on(b); -} + s << "Stockfish " << Tag + << setfill('0') << " " << year.substr(2) + << setw(2) << (1 + months.find(month) / 4) + << setw(2) << day << cpu64 << popcnt; + } + else + s << "Stockfish " << Version << cpu64 << popcnt; -void dbg_before() { + s << (to_uci ? "\nid author ": " by ") + << "Tord Romstad, Marco Costalba and Joona Kiiski"; - assert(!dbg_show_mean); - dbg_show_hit_rate = true; - dbg_cnt0++; + return s.str(); } -void dbg_after() { - - assert(!dbg_show_mean); - dbg_show_hit_rate = true; - dbg_cnt1++; -} -void dbg_mean_of(int v) { +/// Debug functions used mainly to collect run-time statistics - assert(!dbg_show_hit_rate); - dbg_show_mean = true; - dbg_cnt0++; - dbg_cnt1 += v; -} +static uint64_t hits[2], means[2]; -void dbg_print_hit_rate() { +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; } - cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 - << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl; -} +void dbg_print() { -void dbg_print_mean() { + if (hits[0]) + cerr << "Total " << hits[0] << " Hits " << hits[1] + << " hit rate (%) " << 100 * hits[1] / hits[0] << endl; - cout << "Total " << dbg_cnt0 << " Mean " - << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; + if (means[0]) + cerr << "Total " << means[0] << " Mean " + << (float)means[1] / means[0] << endl; } -/// 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. +/// system_time() returns the current system time, measured in milliseconds -const string engine_name() { - - 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; - - 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(); -} - - -/// get_system_time() returns the current system time, measured in -/// milliseconds. - -int get_system_time() { +int system_time() { #if defined(_MSC_VER) - struct _timeb t; - _ftime(&t); - return int(t.time*1000 + t.millitm); + 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; + struct timeval t; + gettimeofday(&t, NULL); + return t.tv_sec * 1000 + t.tv_usec / 1000; #endif } -/// cpu_count() tries to detect the number of CPU cores. +/// cpu_count() tries to detect the number of CPU cores + +int cpu_count() { -#if !defined(_MSC_VER) +#if defined(_MSC_VER) + SYSTEM_INFO s; + GetSystemInfo(&s); + return std::min(int(s.dwNumberOfProcessors), MAX_THREADS); +#else # if defined(_SC_NPROCESSORS_ONLN) -int cpu_count() { - return Min(sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS); -} + return std::min((int)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; - - return Min(psd.psd_proc_cnt, MAX_THREADS); -} + return std::min((int)psd.psd_proc_cnt, MAX_THREADS); # else -int cpu_count() { return 1; -} # endif -#else - -int cpu_count() { - SYSTEM_INFO s; - GetSystemInfo(&s); - return Min(s.dwNumberOfProcessors, MAX_THREADS); -} - #endif +} -/// Check for console input. Original code from Beowulf and Olithink +/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap +/// conversion from milliseconds to struct timespec, as used by pthreads. -#ifndef _WIN32 +void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) { -int data_available() -{ - fd_set readfds; - struct timeval timeout; +#if defined(_MSC_VER) + int tm = msec; +#else + struct timeval t; + struct timespec abstime, *tm = &abstime; - 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); + gettimeofday(&t, NULL); - return (FD_ISSET(fileno(stdin), &readfds)); -} + abstime.tv_sec = t.tv_sec + (msec / 1000); + abstime.tv_nsec = (t.tv_usec + (msec % 1000) * 1000) * 1000; -#else + if (abstime.tv_nsec > 1000000000LL) + { + abstime.tv_sec += 1; + abstime.tv_nsec -= 1000000000LL; + } +#endif -int data_available() -{ - static HANDLE inh = NULL; - static bool usePipe; - INPUT_RECORD rec[256]; - DWORD dw, recCnt; - - 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; - - // Count the number of unread input records, including keyboard, - // mouse, and window-resizing input records. - GetNumberOfConsoleInputEvents(inh, &dw); - - // Read data from console without removing it from the buffer - if (dw <= 0 || !PeekConsoleInput(inh, rec, Min(dw, 256), &recCnt)) - return 0; - - // Search for at least one keyboard event - for (DWORD i = 0; i < recCnt; i++) - if (rec[i].EventType == KEY_EVENT) - return 1; - - return 0; + cond_timedwait(sleepCond, sleepLock, tm); } -#endif - /// 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. +/// loaded from memory, that can be quite slow. #if defined(NO_PREFETCH) + void prefetch(char*) {} + #else void prefetch(char* addr) { -#if defined(__INTEL_COMPILER) || defined(__ICL) +# if defined(__INTEL_COMPILER) || defined(__ICL) // This hack prevents prefetches to be optimized away by // Intel compiler. Both MSVC and gcc seems not affected. __asm__ (""); -#endif +# endif _mm_prefetch(addr, _MM_HINT_T2); _mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead } #endif -