X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftt.cpp;h=6121b3ad771b24bd40410e8e5f6bff6004fdccc7;hb=843a6c43053ceb9cc79d29bf7c0d3a5d236e057e;hp=19f21de22f21ee12f077538f4a812f46ef40a64c;hpb=413b24380993cfdb7578ebe10b6a71b51bd8fb5b;p=stockfish
diff --git a/src/tt.cpp b/src/tt.cpp
index 19f21de2..6121b3ad 100644
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, 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,30 +18,57 @@
along with this program. If not, see .
*/
-#include
+#include // For std::memset
#include
+#include
#include "bitboard.h"
+#include "misc.h"
+#include "thread.h"
#include "tt.h"
+#include "uci.h"
TranspositionTable TT; // Our global transposition table
+/// TTEntry::save populates the TTEntry with a new node's data, possibly
+/// overwriting an old position. Update is not atomic and can be racy.
+
+void TTEntry::save(Key k, Value v, bool pv, Bound b, Depth d, Move m, Value ev) {
+
+ assert(d / ONE_PLY * ONE_PLY == d);
+
+ // Preserve any existing move for the same position
+ if (m || (k >> 48) != key16)
+ move16 = (uint16_t)m;
+
+ // Overwrite less valuable entries
+ if ( (k >> 48) != key16
+ ||(d - DEPTH_OFFSET) / ONE_PLY > depth8 - 4
+ || b == BOUND_EXACT)
+ {
+ assert((d - DEPTH_OFFSET) / ONE_PLY >= 0);
+
+ key16 = (uint16_t)(k >> 48);
+ value16 = (int16_t)v;
+ eval16 = (int16_t)ev;
+ genBound8 = (uint8_t)(TT.generation8 | uint8_t(pv) << 2 | b);
+ depth8 = (uint8_t)((d - DEPTH_OFFSET) / ONE_PLY);
+ }
+}
+
/// TranspositionTable::resize() sets the size of the transposition table,
/// measured in megabytes. Transposition table consists of a power of 2 number
-/// of clusters and each cluster consists of TTClusterSize number of TTEntry.
+/// of clusters and each cluster consists of ClusterSize number of TTEntry.
void TranspositionTable::resize(size_t mbSize) {
- size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(TTCluster));
+ Threads.main()->wait_for_search_finished();
- if (newClusterCount == clusterCount)
- return;
-
- clusterCount = newClusterCount;
+ clusterCount = mbSize * 1024 * 1024 / sizeof(Cluster);
free(mem);
- mem = calloc(clusterCount * sizeof(TTCluster) + CACHE_LINE_SIZE - 1, 1);
+ mem = malloc(clusterCount * sizeof(Cluster) + CacheLineSize - 1);
if (!mem)
{
@@ -49,48 +77,84 @@ void TranspositionTable::resize(size_t mbSize) {
exit(EXIT_FAILURE);
}
- table = (TTCluster*)((uintptr_t(mem) + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1));
+ table = (Cluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));
+ clear();
}
-/// TranspositionTable::clear() overwrites the entire transposition table
-/// with zeros. It is called whenever the table is resized, or when the
-/// user asks the program to clear the table (from the UCI interface).
+/// TranspositionTable::clear() initializes the entire transposition table to zero,
+// in a multi-threaded way.
void TranspositionTable::clear() {
- std::memset(table, 0, clusterCount * sizeof(TTCluster));
-}
+ std::vector threads;
+
+ for (size_t idx = 0; idx < Options["Threads"]; ++idx)
+ {
+ threads.emplace_back([this, idx]() {
+
+ // Thread binding gives faster search on systems with a first-touch policy
+ if (Options["Threads"] > 8)
+ WinProcGroup::bindThisThread(idx);
+
+ // Each thread will zero its part of the hash table
+ const size_t stride = clusterCount / Options["Threads"],
+ start = stride * idx,
+ len = idx != Options["Threads"] - 1 ?
+ stride : clusterCount - start;
+ std::memset(&table[start], 0, len * sizeof(Cluster));
+ });
+ }
+
+ for (std::thread& th: threads)
+ th.join();
+}
/// TranspositionTable::probe() looks up the current position in the transposition
/// table. It returns true and a pointer to the TTEntry if the position is found.
/// Otherwise, it returns false and a pointer to an empty or least valuable TTEntry
-/// to be replaced later. A TTEntry t1 is considered to be more valuable than a
-/// TTEntry t2 if t1 is from the current search and t2 is from a previous search,
-/// or if the depth of t1 is bigger than the depth of t2.
+/// to be replaced later. The replace value of an entry is calculated as its depth
+/// minus 8 times its relative age. TTEntry t1 is considered more valuable than
+/// TTEntry t2 if its replace value is greater than that of t2.
TTEntry* TranspositionTable::probe(const Key key, bool& found) const {
TTEntry* const tte = first_entry(key);
const uint16_t key16 = key >> 48; // Use the high 16 bits as key inside the cluster
- for (unsigned i = 0; i < TTClusterSize; ++i)
+ for (int i = 0; i < ClusterSize; ++i)
if (!tte[i].key16 || tte[i].key16 == key16)
{
- if (tte[i].key16)
- tte[i].genBound8 = uint8_t(generation8 | tte[i].bound()); // Refresh
+ tte[i].genBound8 = uint8_t(generation8 | (tte[i].genBound8 & 0x7)); // Refresh
return found = (bool)tte[i].key16, &tte[i];
}
// Find an entry to be replaced according to the replacement strategy
TTEntry* replace = tte;
- for (unsigned i = 1; i < TTClusterSize; ++i)
- if ( (( tte[i].genBound8 & 0xFC) == generation8 || tte[i].bound() == BOUND_EXACT)
- - ((replace->genBound8 & 0xFC) == generation8)
- - (tte[i].depth8 < replace->depth8) < 0)
+ for (int i = 1; i < ClusterSize; ++i)
+ // Due to our packed storage format for generation and its cyclic
+ // nature we add 263 (256 is the modulus plus 7 to keep the unrelated
+ // lowest three bits from affecting the result) to calculate the entry
+ // age correctly even after generation8 overflows into the next cycle.
+ if ( replace->depth8 - ((263 + generation8 - replace->genBound8) & 0xF8)
+ > tte[i].depth8 - ((263 + generation8 - tte[i].genBound8) & 0xF8))
replace = &tte[i];
return found = false, replace;
}
+
+
+/// TranspositionTable::hashfull() 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)
+ for (int j = 0; j < ClusterSize; ++j)
+ cnt += (table[i].entry[j].genBound8 & 0xF8) == generation8;
+
+ return cnt * 1000 / (ClusterSize * (1000 / ClusterSize));
+}