From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 31 Jan 2015 12:04:15 +0000 (+0100)
Subject: Sync with master
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=60c121f3b1ee7d5ced3435cc1718e4e6e6fd8383;hp=45eac9507c87df81859a09a8c68d21f1efe7942a

Sync with master

bench: 7374604
---

diff --git a/src/search.cpp b/src/search.cpp
index da8f457d..c1884691 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1441,8 +1441,12 @@ string UCI::pv(const Position& pos, Depth depth, Value alpha, Value beta) {
           ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
 
       ss << " nodes "    << pos.nodes_searched()
-         << " nps "      << pos.nodes_searched() * 1000 / elapsed
-         << " tbhits "   << TB::Hits
+         << " nps "      << pos.nodes_searched() * 1000 / elapsed;
+
+      if (elapsed > 1000) // Earlier makes little sense
+          ss << " hashfull "  << TT.hashfull();
+
+      ss << " tbhits "   << TB::Hits
          << " time "     << elapsed
          << " pv";
 
diff --git a/src/tt.cpp b/src/tt.cpp
index bb49a824..d0e2d729 100644
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -94,3 +94,20 @@ TTEntry* TranspositionTable::probe(const Key key, bool& found) const {
 
   return found = false, replace;
 }
+
+
+/// Returns an approximation of the hashtable occupation during a search. The
+/// hash is x permill full, as per UCI protocol.
+
+int TranspositionTable::hashfull() const
+{
+  int cnt = 0;
+  for (int i = 0; i < 1000 / ClusterSize; i++)
+  {
+      const TTEntry* tte = &table[i].entry[0];
+      for (int j = 0; j < ClusterSize; j++)
+          if ((tte[j].genBound8 & 0xFC) == generation8)
+              cnt++;
+  }
+  return cnt;
+}
diff --git a/src/tt.h b/src/tt.h
index 14f820d0..32b4036e 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -88,6 +88,7 @@ public:
   void new_search() { generation8 += 4; } // Lower 2 bits are used by Bound
   uint8_t generation() const { return generation8; }
   TTEntry* probe(const Key key, bool& found) const;
+  int hashfull() const;
   void resize(size_t mbSize);
   void clear();