X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=5ebd10d2d6cdfa7657c3d967716e03f8b848961f;hp=41fc33ff9ebba868927ce1de876ab42f512b2618;hb=51330414c4a773a9c3d1dd562fdc8536344a67b8;hpb=ffdf63ff7c1fce40774aa8cff82b17c54155c6cb
diff --git a/src/tt.cpp b/src/tt.cpp
index 41fc33ff..5ebd10d2 100644
--- a/src/tt.cpp
+++ b/src/tt.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-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,7 +17,7 @@
along with this program. If not, see .
*/
-#include
+#include // For std::memset
#include
#include "bitboard.h"
@@ -30,18 +30,17 @@ TranspositionTable TT; // Our global transposition table
/// measured in megabytes. Transposition table consists of a power of 2 number
/// of clusters and each cluster consists of ClusterSize number of TTEntry.
-void TranspositionTable::resize(uint64_t mbSize) {
+void TranspositionTable::resize(size_t mbSize) {
- assert(msb((mbSize << 20) / sizeof(TTEntry)) < 32);
+ size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(Cluster));
- uint32_t size = ClusterSize << msb((mbSize << 20) / sizeof(TTEntry[ClusterSize]));
-
- if (hashMask == size - ClusterSize)
+ if (newClusterCount == clusterCount)
return;
- hashMask = size - ClusterSize;
+ clusterCount = newClusterCount;
+
free(mem);
- mem = calloc(size * sizeof(TTEntry) + CACHE_LINE_SIZE - 1, 1);
+ mem = calloc(clusterCount * sizeof(Cluster) + CacheLineSize - 1, 1);
if (!mem)
{
@@ -50,75 +49,64 @@ void TranspositionTable::resize(uint64_t mbSize) {
exit(EXIT_FAILURE);
}
- table = (TTEntry*)((uintptr_t(mem) + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1));
+ table = (Cluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));
}
/// TranspositionTable::clear() overwrites the entire transposition table
-/// with zeroes. It is called whenever the table is resized, or when the
+/// 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).
void TranspositionTable::clear() {
- std::memset(table, 0, (hashMask + ClusterSize) * sizeof(TTEntry));
+ std::memset(table, 0, clusterCount * sizeof(Cluster));
}
-/// TranspositionTable::probe() looks up the current position in the
-/// transposition table. Returns a pointer to the TTEntry or NULL if
-/// position is not found.
+/// 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. TTEntry t1 is considered more valuable than TTEntry t2 if
+/// both are from the current search and the depth of t1 is greater than the depth of t2,
+/// or if t1 is from a previous search but its depth is at least 8 ply deeper than t2.
-const TTEntry* TranspositionTable::probe(const Key key) const {
+TTEntry* TranspositionTable::probe(const Key key, bool& found) const {
- TTEntry* tte = first_entry(key);
- uint32_t key32 = key >> 32;
+ 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 < ClusterSize; ++i, ++tte)
- if (tte->key32 == key32)
+ for (int i = 0; i < ClusterSize; ++i)
+ if (!tte[i].key16 || tte[i].key16 == key16)
{
- tte->generation8 = generation; // Refresh
- return tte;
- }
-
- return NULL;
-}
+ if (tte[i].key16)
+ tte[i].genBound8 = uint8_t(generation8 | tte[i].bound()); // Refresh
+ return found = (bool)tte[i].key16, &tte[i];
+ }
-/// TranspositionTable::store() writes a new entry containing position key and
-/// valuable information of current position. The lowest order bits of position
-/// key are used to decide in which cluster the position will be placed.
-/// When a new entry is written and there are no empty entries available in the
-/// cluster, it replaces the least valuable of the entries. 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.
+ // Find an entry to be replaced according to the replacement strategy
+ TTEntry* replace = tte;
+ for (int i = 1; i < ClusterSize; ++i)
+ if ( (( tte[i].genBound8 & 0xFC) == generation8) * 8 * ONE_PLY + tte[i].depth8
+ < ((replace->genBound8 & 0xFC) == generation8) * 8 * ONE_PLY + replace->depth8)
+ replace = &tte[i];
-void TranspositionTable::store(const Key key, Value v, Bound b, Depth d, Move m, Value statV) {
+ return found = false, replace;
+}
- int c1, c2, c3;
- TTEntry *tte, *replace;
- uint32_t key32 = key >> 32; // Use the high 32 bits as key inside the cluster
- tte = replace = first_entry(key);
+/// Returns an approximation of the hashtable occupation during a search. The
+/// hash is x permill full, as per UCI protocol.
- for (unsigned i = 0; i < ClusterSize; ++i, ++tte)
+int TranspositionTable::hashfull() const
+{
+ int cnt = 0;
+ for (int i = 0; i < 1000 / ClusterSize; i++)
{
- if (!tte->key32 || tte->key32 == key32) // Empty or overwrite old
- {
- if (!m)
- m = tte->move(); // Preserve any existing ttMove
-
- replace = tte;
- break;
- }
-
- // Implement replace strategy
- c1 = (replace->generation8 == generation ? 2 : 0);
- c2 = (tte->generation8 == generation || tte->bound() == BOUND_EXACT ? -2 : 0);
- c3 = (tte->depth16 < replace->depth16 ? 1 : 0);
-
- if (c1 + c2 + c3 > 0)
- replace = tte;
+ const TTEntry* tte = &table[i].entry[0];
+ for (int j = 0; j < ClusterSize; j++)
+ if ((tte[j].genBound8 & 0xFC) == generation8)
+ cnt++;
}
-
- replace->save(key32, v, b, d, m, generation, statV);
+ return cnt;
}