X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=d436ee92d8559f290facf2ba13f764ae98f31dfb;hp=0920f7f08838b132f7413ee41c2a4229e0c80966;hb=b96db269a87549ceefaf8b812c050292f81b6c5c;hpb=ac7339877b3e083b5dd93f34ec79779d43f784ae diff --git a/src/misc.cpp b/src/misc.cpp index 0920f7f0..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,7 +17,14 @@ along with this program. If not, see . */ -#if !defined(_MSC_VER) +#if defined(_MSC_VER) + +#define _CRT_SECURE_NO_DEPRECATE +#define NOMINMAX // disable macros min() and max() +#include +#include + +#else # include # include @@ -26,117 +33,85 @@ # include # endif -#else - -#define _CRT_SECURE_NO_DEPRECATE -#define NOMINMAX // disable macros min() and max() -#include -#include - #endif #if !defined(NO_PREFETCH) # include #endif -#include -#include +#include #include #include #include -#include -#include "bitcount.h" #include "misc.h" #include "thread.h" using namespace std; -/// Version number. If EngineVersion is left empty, then AppTag plus -/// current date (in the format YYMMDD) is used as a version number. +/// 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 AppName = "Stockfish"; -static const string EngineVersion = ""; -static const string AppTag = ""; +static const string Version = ""; +static const string Tag = ""; -/// engine_name() returns the full name of the current Stockfish 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 ", depending -/// on whether the constant EngineVersion is empty. +/// 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" : ""); + const string cpu64(Is64Bit ? " 64bit" : ""); + const string popcnt(HasPopCnt ? " SSE4.2" : ""); - if (!EngineVersion.empty()) - return AppName + " " + EngineVersion + cpu64; - - stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008" string month, day, year; + stringstream s, 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(); -} - + if (Version.empty()) + { + date >> month >> day >> year; -/// Our brave developers! Required by UCI + 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; -const string engine_authors() { + s << (to_uci ? "\nid author ": " by ") + << "Tord Romstad, Marco Costalba and Joona Kiiski"; - return "Tord Romstad, Marco Costalba and Joona Kiiski"; + return s.str(); } -/// Debug stuff. Helper functions used mainly for debugging purposes - -static uint64_t dbg_hit_cnt0; -static uint64_t dbg_hit_cnt1; -static uint64_t dbg_mean_cnt0; -static uint64_t dbg_mean_cnt1; +/// Debug functions used mainly to collect run-time statistics -void dbg_print_hit_rate() { +static uint64_t hits[2], means[2]; - if (dbg_hit_cnt0) - cerr << "Total " << dbg_hit_cnt0 << " Hit " << dbg_hit_cnt1 - << " hit rate (%) " << 100 * dbg_hit_cnt1 / dbg_hit_cnt0 << endl; -} - -void dbg_print_mean() { - - if (dbg_mean_cnt0) - cerr << "Total " << dbg_mean_cnt0 << " Mean " - << (float)dbg_mean_cnt1 / dbg_mean_cnt0 << endl; -} - -void dbg_mean_of(int v) { +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; } - dbg_mean_cnt0++; - dbg_mean_cnt1 += v; -} +void dbg_print() { -void dbg_hit_on(bool b) { + if (hits[0]) + cerr << "Total " << hits[0] << " Hits " << hits[1] + << " hit rate (%) " << 100 * hits[1] / hits[0] << endl; - dbg_hit_cnt0++; - if (b) - dbg_hit_cnt1++; + if (means[0]) + cerr << "Total " << means[0] << " Mean " + << (float)means[1] / means[0] << endl; } -void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); } -void dbg_before() { dbg_hit_on(false); } -void dbg_after() { dbg_hit_on(true); dbg_hit_cnt0--; } - -/// get_system_time() returns the current system time, measured in milliseconds +/// system_time() returns the current system time, measured in milliseconds -int get_system_time() { +int system_time() { #if defined(_MSC_VER) struct _timeb t; @@ -175,78 +150,32 @@ int cpu_count() { } -/// Check for console input. Original code from Beowulf, Olithink and Greko - -#ifndef _WIN32 - -int input_available() { +/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap +/// conversion from milliseconds to struct timespec, as used by pthreads. - fd_set readfds; - struct timeval timeout; - - 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); - - return (FD_ISSET(fileno(stdin), &readfds)); -} +void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) { +#if defined(_MSC_VER) + int tm = msec; #else + struct timeval t; + struct timespec abstime, *tm = &abstime; -int input_available() { + gettimeofday(&t, NULL); - static HANDLE inh = NULL; - static bool usePipe = false; - INPUT_RECORD rec[256]; - DWORD nchars, recCnt; + abstime.tv_sec = t.tv_sec + (msec / 1000); + abstime.tv_nsec = (t.tv_usec + (msec % 1000) * 1000) * 1000; - if (!inh) + if (abstime.tv_nsec > 1000000000LL) { - inh = GetStdHandle(STD_INPUT_HANDLE); - if (GetConsoleMode(inh, &nchars)) - { - SetConsoleMode(inh, nchars & ~(ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT)); - FlushConsoleInputBuffer(inh); - } else - usePipe = true; + abstime.tv_sec += 1; + abstime.tv_nsec -= 1000000000LL; } +#endif - // When using Standard C input functions, also check if there - // is anything in the buffer. After a call to such functions, - // the input waiting in the pipe will be copied to the buffer, - // and the call to PeekNamedPipe can indicate no input available. - // Setting stdin to unbuffered was not enough. [from Greko] - if (stdin->_cnt > 0) - return 1; - - // When running under a GUI the input commands are sent to us - // directly over the internal pipe. If PeekNamedPipe() returns 0 - // then something went wrong. Probably the parent program exited. - // Returning 1 will make the next call to the input function - // return EOF, where this should be catched then. - if (usePipe) - return PeekNamedPipe(inh, NULL, 0, NULL, &nchars, NULL) ? nchars : 1; - - // Count the number of unread input records, including keyboard, - // mouse, and window-resizing input records. - GetNumberOfConsoleInputEvents(inh, &nchars); - - // Read data from console without removing it from the buffer - if (nchars <= 0 || !PeekConsoleInput(inh, rec, std::min(int(nchars), 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 @@ -259,11 +188,11 @@ void prefetch(char*) {} 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