X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=0d27b615ea75122695f37e8c9da0ab3021525cb4;hp=cf68055cd6de1013d5fdee5fc704cc480e4414cb;hb=86c2d2fc3b596e544e7f280edf2bd7b3f755b83d;hpb=95ce27f9262b63ce8eb611965e5cbc16bae815ad diff --git a/src/misc.cpp b/src/misc.cpp index cf68055c..0d27b615 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -1,13 +1,14 @@ /* - Glaurung, a UCI chess playing engine. - Copyright (C) 2004-2008 Tord Romstad + 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 - Glaurung is free software: you can redistribute it and/or modify + Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - Glaurung is distributed in the hope that it will be useful, + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -26,69 +27,142 @@ # include # include # include +# if defined(__hpux) +# include +# endif #else -# include -# include -# include "dos.h" -int gettimeofday(struct timeval * tp, struct timezone * tzp); +#define _CRT_SECURE_NO_DEPRECATE +#include +#include #endif +#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 = "1.7.1"; +static const string AppName = "Stockfish"; +static const string AppTag = ""; //// //// Variables //// -long dbg_cnt0 = 0; -long dbg_cnt1 = 0; +bool Chess960; + +uint64_t dbg_cnt0 = 0; +uint64_t dbg_cnt1 = 0; + +bool dbg_show_mean = false; +bool dbg_show_hit_rate = false; //// //// Functions //// +void dbg_hit_on(bool b) { + + assert(!dbg_show_mean); + dbg_show_hit_rate = true; + dbg_cnt0++; + if (b) + dbg_cnt1++; +} + +void dbg_hit_on_c(bool c, bool b) { + + if (c) + dbg_hit_on(b); +} + +void dbg_before() { + + assert(!dbg_show_mean); + dbg_show_hit_rate = true; + dbg_cnt0++; +} + +void dbg_after() { + + 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; +} + void dbg_print_hit_rate() { - std::cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 - << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) - << std::endl; + cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 + << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl; +} + +void dbg_print_mean() { + + cout << "Total " << dbg_cnt0 << " Mean " + << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; } -/// engine_name() returns the full name of the current Glaurung version. -/// This will be either "Glaurung YYMMDD" (where YYMMDD is the date when the -/// program was compiled) or "Glaurung ", depending on whether +void dbg_print_hit_rate(ofstream& logFile) { + + logFile << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 + << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl; +} + +void dbg_print_mean(ofstream& logFile) { + + logFile << "Total " << dbg_cnt0 << " Mean " + << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << 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. -const std::string engine_name() { - if(EngineVersion == "") { - static const char monthNames[12][4] = { - "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" - }; - const char *dateString = __DATE__; - std::stringstream s; - int month = 0, day = 0; +const string engine_name() { + + const string cpu64(CpuHas64BitPath ? " 64bit" : ""); - for(int i = 0; i < 12; i++) - if(strncmp(dateString, monthNames[i], 3) == 0) - month = i + 1; - day = atoi(dateString+4); + if (!EngineVersion.empty()) + return AppName+ " " + EngineVersion + cpu64; - s << "Glaurung " << (dateString+9) << std::setfill('0') << std::setw(2) - << month << std::setfill('0') << std::setw(2) << day; + string date(__DATE__); // From compiler, format is "Sep 21 2008" + string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); - return s.str(); - } - else - return "Glaurung " + EngineVersion; + size_t mon = 1 + months.find(date.substr(0, 3)) / 4; + + stringstream s; + string day = (date[4] == ' ' ? date.substr(5, 1) : date.substr(4, 2)); + + string name = AppName + " " + AppTag + " "; + + s << name << date.substr(date.length() - 2) << setfill('0') + << setw(2) << mon << setw(2) << day << cpu64; + + return s.str(); } @@ -96,9 +170,16 @@ const std::string engine_name() { /// milliseconds. int get_system_time() { - struct timeval t; - gettimeofday(&t, NULL); - return t.tv_sec*1000 + t.tv_usec/1000; + +#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 } @@ -108,7 +189,15 @@ int get_system_time() { # if defined(_SC_NPROCESSORS_ONLN) int cpu_count() { - return Min(sysconf(_SC_NPROCESSORS_ONLN), 8); + 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; + + return Min(psd.psd_proc_cnt, MAX_THREADS); } # else int cpu_count() { @@ -121,7 +210,7 @@ int cpu_count() { int cpu_count() { SYSTEM_INFO s; GetSystemInfo(&s); - return Min(s.dwNumberOfProcessors, 8); + return Min(s.dwNumberOfProcessors, MAX_THREADS); } #endif