X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=2970ac3b49c30c6ceb0aeda94b95836919eab715;hp=68f6103c651b0d467072edcd15812939fead7f44;hb=47ee6d9fa4091aa05f6fedb62a2bb652b0422f08;hpb=e828753a3ad85c53cdeda61df428a6c73b715ff5 diff --git a/src/misc.cpp b/src/misc.cpp index 68f6103c..2970ac3b 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 Marco Costalba + Copyright (C) 2008-2010 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 @@ -27,14 +27,20 @@ # 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 +#if !defined(NO_PREFETCH) +# include #endif #include @@ -43,18 +49,28 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp); #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 = ""; //// //// Variables //// -static const std::string AppName = "Stockfish"; -static const std::string AppTag = ""; +bool Chess960; -long dbg_cnt0 = 0; -long dbg_cnt1 = 0; +uint64_t dbg_cnt0 = 0; +uint64_t dbg_cnt1 = 0; bool dbg_show_mean = false; bool dbg_show_hit_rate = false; @@ -103,28 +119,26 @@ void dbg_mean_of(int 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() { - std::cout << "Total " << dbg_cnt0 << " Mean " - << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << std::endl; + cout << "Total " << dbg_cnt0 << " Mean " + << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; } -void dbg_print_hit_rate(std::ofstream& logFile) { +void dbg_print_hit_rate(ofstream& logFile) { logFile << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 - << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) - << std::endl; + << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl; } -void dbg_print_mean(std::ofstream& logFile) { +void dbg_print_mean(ofstream& logFile) { logFile << "Total " << dbg_cnt0 << " Mean " - << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << std::endl; + << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; } /// engine_name() returns the full name of the current Stockfish version. @@ -132,26 +146,27 @@ void dbg_print_mean(std::ofstream& logFile) { /// program was compiled) or "Stockfish ", depending on whether /// the constant EngineVersion (defined in misc.h) is empty. -const std::string engine_name() { +const string engine_name() { - if (EngineVersion.empty()) - { - std::string date(__DATE__); // From compiler, format is "Sep 21 2008" - std::string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); + const string cpu64(CpuHas64BitPath ? " 64bit" : ""); - size_t mon = 1 + months.find(date.substr(0, 3)) / 4; + if (!EngineVersion.empty()) + return AppName+ " " + EngineVersion + cpu64; - std::stringstream s; - std::string day = (date[4] == ' ' ? date.substr(5, 1) : date.substr(4, 2)); + string date(__DATE__); // From compiler, format is "Sep 21 2008" + string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); - std::string name = AppName + " " + AppTag + " "; + size_t mon = 1 + months.find(date.substr(0, 3)) / 4; - s << name << date.substr(date.length() - 2) << std::setfill('0') - << std::setw(2) << mon << std::setw(2) << day; + stringstream s; + string day = (date[4] == ' ' ? date.substr(5, 1) : date.substr(4, 2)); - return s.str(); - } else - return "Stockfish " + EngineVersion; + string name = AppName + " " + AppTag + " "; + + s << name << date.substr(date.length() - 2) << setfill('0') + << setw(2) << mon << setw(2) << day << cpu64; + + return s.str(); } @@ -159,9 +174,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 } @@ -171,7 +193,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() { @@ -184,7 +214,7 @@ int cpu_count() { int cpu_count() { SYSTEM_INFO s; GetSystemInfo(&s); - return Min(s.dwNumberOfProcessors, 8); + return Min(s.dwNumberOfProcessors, MAX_THREADS); } #endif @@ -261,4 +291,26 @@ int Bioskey() return 0; } } + +/// 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. + __asm__ (""); +#endif + + _mm_prefetch(addr, _MM_HINT_T2); + _mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead +} + +#endif + #endif