X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=d2ff8704072764821eadc49e12f02283d04f2b68;hp=83eaf800ac480aabd64856c5d02ac3b27d8cffa5;hb=343544f3f7fe780a4231b78646ab2fd61760e294;hpb=aabd526f7c9cec1d1f6a8f7da738311487aa42b8
diff --git a/src/tt.cpp b/src/tt.cpp
index 83eaf800..d2ff8704 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 Marco Costalba
+ Copyright (C) 2008-2013 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,180 +17,105 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
-#include
#include
+#include
+#include "bitboard.h"
#include "tt.h"
+TranspositionTable TT; // Our global transposition table
-////
-//// Functions
-////
-
-TranspositionTable::TranspositionTable() {
-
- size = writes = 0;
- entries = 0;
- generation = 0;
-}
-
-TranspositionTable::~TranspositionTable() {
-
- delete [] entries;
-}
+/// TranspositionTable::set_size() 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 ClusterSize number of TTEntry.
-/// TranspositionTable::set_size sets the size of the transposition table,
-/// measured in megabytes.
+void TranspositionTable::set_size(size_t mbSize) {
-void TranspositionTable::set_size(unsigned mbSize) {
+ assert(msb((mbSize << 20) / sizeof(TTEntry)) < 32);
- assert(mbSize >= 4 && mbSize <= 4096);
+ uint32_t size = ClusterSize << msb((mbSize << 20) / sizeof(TTEntry[ClusterSize]));
- unsigned newSize = 1024;
+ if (hashMask == size - ClusterSize)
+ return;
- // We store a cluster of 4 TTEntry for each position and newSize is
- // the maximum number of storable positions
- while ((2 * newSize) * 4 * (sizeof(TTEntry)) <= (mbSize << 20))
- newSize *= 2;
+ hashMask = size - ClusterSize;
+ free(mem);
+ mem = calloc(size * sizeof(TTEntry) + CACHE_LINE_SIZE - 1, 1);
- if (newSize != size)
+ if (!mem)
{
- size = newSize;
- delete [] entries;
- entries = new TTEntry[size * 4];
- if (!entries)
- {
- std::cerr << "Failed to allocate " << mbSize
- << " MB for transposition table." << std::endl;
- exit(EXIT_FAILURE);
- }
- clear();
+ std::cerr << "Failed to allocate " << mbSize
+ << "MB for transposition table." << std::endl;
+ exit(EXIT_FAILURE);
}
+
+ table = (TTEntry*)((uintptr_t(mem) + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1));
}
-/// TranspositionTable::clear overwrites the entire transposition table
+/// TranspositionTable::clear() overwrites the entire transposition table
/// with zeroes. It is called whenever the table is resized, or when the
/// user asks the program to clear the table (from the UCI interface).
-/// Perhaps we should also clear it when the "ucinewgame" command is recieved?
void TranspositionTable::clear() {
- memset(entries, 0, size * 4 * sizeof(TTEntry));
+ std::memset(table, 0, (hashMask + ClusterSize) * sizeof(TTEntry));
}
-/// TranspositionTable::store writes a new entry containing a position,
-/// a value, a value type, a search depth, and a best move to the
-/// transposition table. Transposition table is organized in clusters of
-/// four TTEntry objects, and when a new entry is written, it replaces
-/// the least valuable of the four entries in a cluster. 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. A TTEntry of type VALUE_TYPE_EVAL
-/// never replaces another entry for the same position.
+/// TranspositionTable::probe() looks up the current position in the
+/// transposition table. Returns a pointer to the TTEntry or NULL if
+/// position is not found.
-void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, Move m) {
+const TTEntry* TranspositionTable::probe(const Key key) const {
- TTEntry *tte, *replace;
+ const TTEntry* tte = first_entry(key);
+ uint32_t key32 = key >> 32;
- tte = replace = first_entry(posKey);
- for (int i = 0; i < 4; i++, tte++)
- {
- if (!tte->key() || tte->key() == posKey) // empty or overwrite old
- {
- // Do not overwrite when new type is VALUE_TYPE_EVAL
- if (tte->key() && t == VALUE_TYPE_EVAL)
- return;
-
- if (m == MOVE_NONE)
- m = tte->move();
-
- *tte = TTEntry(posKey, v, t, d, m, generation);
- return;
- }
- else if (i == 0) // replace would be a no-op in this common case
- continue;
-
- int c1 = (replace->generation() == generation ? 2 : 0);
- int c2 = (tte->generation() == generation ? -2 : 0);
- int c3 = (tte->depth() < replace->depth() ? 1 : 0);
-
- if (c1 + c2 + c3 > 0)
- replace = tte;
- }
- *replace = TTEntry(posKey, v, t, d, m, generation);
- writes++;
-}
-
-
-/// TranspositionTable::retrieve looks up the current position in the
-/// transposition table. Returns a pointer to the TTEntry or NULL
-/// if position is not found.
-
-TTEntry* TranspositionTable::retrieve(const Key posKey) const {
-
- TTEntry *tte = first_entry(posKey);
-
- for (int i = 0; i < 4; i++, tte++)
- if (tte->key() == posKey)
+ for (unsigned i = 0; i < ClusterSize; ++i, ++tte)
+ if (tte->key() == key32)
return tte;
return NULL;
}
-/// TranspositionTable::first_entry returns a pointer to the first
-/// entry of a cluster given a position.
-
-inline TTEntry* TranspositionTable::first_entry(const Key posKey) const {
-
- return entries + (int(posKey & (size - 1)) << 2);
-}
-
-/// TranspositionTable::new_search() is called at the beginning of every new
-/// search. It increments the "generation" variable, which is used to
-/// distinguish transposition table entries from previous searches from
-/// entries from the current search.
-
-void TranspositionTable::new_search() {
-
- generation++;
- writes = 0;
-}
-
+/// 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 on which cluster the position will be placed.
+/// When a new entry is written and there are no empty entries available in cluster,
+/// it replaces the least valuable of 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.
-/// TranspositionTable::insert_pv() is called at the end of a search
-/// iteration, and inserts the PV back into the PV. This makes sure
-/// the old PV moves are searched first, even if the old TT entries
-/// have been overwritten.
+void TranspositionTable::store(const Key key, Value v, Bound b, Depth d, Move m, Value statV, Value evalM) {
-void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
+ int c1, c2, c3;
+ TTEntry *tte, *replace;
+ uint32_t key32 = key >> 32; // Use the high 32 bits as key inside the cluster
- StateInfo st;
- Position p(pos);
+ tte = replace = first_entry(key);
- for (int i = 0; pv[i] != MOVE_NONE; i++)
+ for (unsigned i = 0; i < ClusterSize; ++i, ++tte)
{
- store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i]);
- p.do_move(pv[i], st);
- }
-}
+ if (!tte->key() || tte->key() == key32) // Empty or overwrite old
+ {
+ if (!m)
+ m = tte->move(); // Preserve any existing ttMove
+ replace = tte;
+ break;
+ }
-/// TranspositionTable::full() returns the permill of all transposition table
-/// entries which have received at least one write during the current search.
-/// It is used to display the "info hashfull ..." information in UCI.
+ // Implement replace strategy
+ c1 = (replace->generation() == generation ? 2 : 0);
+ c2 = (tte->generation() == generation || tte->bound() == BOUND_EXACT ? -2 : 0);
+ c3 = (tte->depth() < replace->depth() ? 1 : 0);
-int TranspositionTable::full() const {
+ if (c1 + c2 + c3 > 0)
+ replace = tte;
+ }
- double N = double(size) * 4.0;
- return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N))));
+ replace->save(key32, v, b, d, m, generation, statV, evalM);
}