X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.cpp;h=a3b1b0324c8ee20357fb515294696d9b9befb240;hb=2608b9249d9c25a699c8db8725e35bd4ec0b65ab;hp=9cd953922ce8d59a685ef2c50d56a68a5088187b;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 9cd95392..a3b1b032 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
#define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX // disable macros min() and max()
@@ -39,25 +39,21 @@
# include
#endif
-#include
-#include
+#include
#include
#include
#include
-#include
-#include "bitcount.h"
#include "misc.h"
#include "thread.h"
using namespace std;
-
/// 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 Version = "";
-static const string Tag = "";
+static const string Tag = "";
/// engine_info() returns the full name of the current Stockfish version.
@@ -93,50 +89,31 @@ const string engine_info(bool to_uci) {
}
-/// 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--; }
-
/// system_time() returns the current system time, measured in milliseconds
int system_time() {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
struct _timeb t;
_ftime(&t);
return int(t.time * 1000 + t.millitm);
@@ -152,7 +129,7 @@ int system_time() {
int cpu_count() {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
SYSTEM_INFO s;
GetSystemInfo(&s);
return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
@@ -176,9 +153,9 @@ int cpu_count() {
/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
/// conversion from milliseconds to struct timespec, as used by pthreads.
-void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
+void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
int tm = msec;
#else
struct timeval t;
@@ -211,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