X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=b3cd10a0e91e8f6987fb843d61057db6a13bd140;hb=413b24380993cfdb7578ebe10b6a71b51bd8fb5b;hp=4ff1c0cfdf5e5cb44a17c978584bd81861555925;hpb=aa2368a6878a867fe63247ee2adf2fde3dfe22be;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 4ff1c0cf..b3cd10a0 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-2013 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,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -24,81 +25,21 @@
#include "misc.h"
#include "thread.h"
-#if defined(__hpux)
-# include
-#endif
-
using namespace std;
-/// Version number. If Version is left empty, then Tag plus current
-/// date, in the format DD-MM-YY, are used as a version number.
-
-static const string Version = "3";
-static const string Tag = "";
-
-
-/// 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) {
+namespace {
- 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"
-
- s << "Stockfish " << Version;
-
- if (Version.empty())
- {
- date >> month >> day >> year;
-
- s << Tag << string(Tag.empty() ? "" : " ") << setfill('0') << setw(2) << day
- << "-" << setw(2) << (1 + months.find(month) / 4) << "-" << year.substr(2);
- }
-
- s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
- << "Tord Romstad, Marco Costalba and Joona Kiiski";
-
- return s.str();
-}
-
-
-/// Convert system time to milliseconds. That's all we need.
-
-Time::point Time::now() {
- sys_time_t t; system_time(&t); return time_to_msec(t);
-}
-
-
-/// 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
struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
@@ -152,18 +93,65 @@ public:
}
};
+} // namespace
+
+/// 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) {
+
+ 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"
+
+ ss << "Stockfish " << Version << setfill('0');
+
+ if (Version.empty())
+ {
+ date >> month >> day >> year;
+ ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2);
+ }
+
+ ss << (Is64Bit ? " 64" : "")
+ << (HasPext ? " BMI2" : (HasPopCnt ? " POPCNT" : ""))
+ << (to_uci ? "\nid author ": " by ")
+ << "Tord Romstad, Marco Costalba and Joona Kiiski";
+
+ return ss.str();
+}
+
+
+/// 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; }
-/// Used to serialize access to std::cout to avoid multiple threads to write at
+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)
+ if (sc == IO_LOCK)
m.lock();
- if (sc == io_unlock)
+ if (sc == IO_UNLOCK)
m.unlock();
return os;
@@ -174,37 +162,12 @@ std::ostream& operator<<(std::ostream& os, SyncCout sc) {
void start_logger(bool b) { Logger::start(b); }
-/// cpu_count() tries to detect the number of CPU cores
-
-int cpu_count() {
-
-#if defined(_WIN32) || defined(_WIN64)
- SYSTEM_INFO s;
- GetSystemInfo(&s);
- return s.dwNumberOfProcessors;
-#else
-
-# 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
-
-#endif
-}
-
-
-/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
-/// conversion from milliseconds to struct timespec, as used by pthreads.
+/// 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;
@@ -218,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*) {}
@@ -230,17 +193,15 @@ void prefetch(char*) {}
void prefetch(char* addr) {
# if defined(__INTEL_COMPILER)
- // This hack prevents prefetches to be optimized away by
- // Intel compiler. Both MSVC and gcc seems not affected.
+ // This hack prevents prefetches from being optimized away by
+ // Intel compiler. Both MSVC and gcc seem not be affected by this.
__asm__ ("");
# endif
# if defined(__INTEL_COMPILER) || defined(_MSC_VER)
_mm_prefetch(addr, _MM_HINT_T0);
- _mm_prefetch(addr+64, _MM_HINT_T0); // 64 bytes ahead
# else
__builtin_prefetch(addr);
- __builtin_prefetch(addr+64);
# endif
}