Reshuffle stuff in MovePicker

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 9cd953922ce8d59a685ef2c50d56a68a5088187b..d436ee92d8559f290facf2ba13f764ae98f31dfb 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -39,25 +39,21 @@
 #  include <xmmintrin.h>
 #endif
 
-#include <cassert>
-#include <cstdio>
+#include <algorithm>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <algorithm>
 
-#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,44 +89,25 @@ 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
 
@@ -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