X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftt.cpp;h=b2701ef0d2c7688b6dd12a03da5afc8f090aa005;hb=e5ffe9959c40a5ec6c4bca83a5a48070cae7fa5b;hp=97ca23dc43a6ab3c926520f0194235533815c68f;hpb=787d3585548ed7dac06597780a7d0adb64482d41;p=stockfish
diff --git a/src/tt.cpp b/src/tt.cpp
index 97ca23dc..b2701ef0 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-2010 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,201 +17,127 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
-#include
#include
+#include
#include "tt.h"
+TranspositionTable TT; // Our global transposition table
-////
-//// Functions
-////
-
-/// Constructor
+TranspositionTable::TranspositionTable() {
-TranspositionTable::TranspositionTable(unsigned mbSize) {
-
- size = 0;
- generation = 0;
- writes = 0;
- entries = 0;
- set_size(mbSize);
+ size = generation = 0;
+ entries = NULL;
}
-
-/// Destructor
-
TranspositionTable::~TranspositionTable() {
delete [] entries;
}
-/// TranspositionTable::set_size sets the size of the transposition table,
+/// TranspositionTable::set_size() sets the size of the transposition table,
/// measured in megabytes.
-void TranspositionTable::set_size(unsigned mbSize) {
+void TranspositionTable::set_size(size_t mbSize) {
+
+ size_t newSize = 1024;
- assert(mbSize >= 4 && mbSize <= 1024);
+ // Transposition table consists of clusters and each cluster consists
+ // of ClusterSize number of TTEntries. Each non-empty entry contains
+ // information of exactly one position and newSize is the number of
+ // clusters we are going to allocate.
+ while (2ULL * newSize * sizeof(TTCluster) <= (mbSize << 20))
+ newSize *= 2;
- unsigned newSize = 1024;
+ if (newSize == size)
+ return;
- // We store a cluster of 4 TTEntry for each position and newSize is
- // the maximum number of storable positions
- for ( ; newSize * 4 * (sizeof(TTEntry)) <= (mbSize << 20); newSize *= 2);
- newSize /= 2;
- if (newSize != size)
+ size = newSize;
+ delete [] entries;
+ entries = new (std::nothrow) TTCluster[size];
+ if (!entries)
{
- size = newSize;
- delete [] entries;
- entries = new TTEntry[size * 4];
- if (!entries)
- {
std::cerr << "Failed to allocate " << mbSize
- << " MB for transposition table."
- << std::endl;
+ << "MB for transposition table." << std::endl;
exit(EXIT_FAILURE);
- }
- clear();
}
+ clear();
}
-/// TranspositionTable::clear overwrites the entire transposition table
-/// with zeroes. It is called whenever the table is resized, or when the
+/// 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));
+ memset(entries, 0, size * sizeof(TTCluster));
}
-/// 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. The 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.
+/// 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.
-void TranspositionTable::store(const Position &pos, Value v, Depth d,
- Move m, ValueType type) {
+void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, Move m, Value statV, Value kingD) {
+
+ int c1, c2, c3;
TTEntry *tte, *replace;
+ uint32_t posKey32 = posKey >> 32; // Use the high 32 bits as key inside the cluster
+
+ tte = replace = first_entry(posKey);
- tte = replace = first_entry(pos);
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < ClusterSize; i++, tte++)
{
- if (!(tte+i)->key()) // still empty
- {
- *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
- writes++;
- return;
- }
- if ((tte+i)->key() == pos.get_key()) // overwrite old
- {
- if (m == MOVE_NONE)
- m = (tte+i)->move();
-
- *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
- return;
- }
- if ( i == 0 // already is (replace == tte+i), common case
- || replace->generation() < (tte+i)->generation())
- continue;
-
- if ( replace->generation() > (tte+i)->generation()
- || (tte+i)->depth() < replace->depth())
- replace = tte+i;
+ if (!tte->key() || tte->key() == posKey32) // Empty or overwrite old
+ {
+ // Preserve any existing ttMove
+ if (m == MOVE_NONE)
+ m = tte->move();
+
+ tte->save(posKey32, v, t, d, m, generation, statV, kingD);
+ return;
+ }
+
+ // Implement replace strategy
+ c1 = (replace->generation() == generation ? 2 : 0);
+ c2 = (tte->generation() == generation || tte->type() == VALUE_TYPE_EXACT ? -2 : 0);
+ c3 = (tte->depth() < replace->depth() ? 1 : 0);
+
+ if (c1 + c2 + c3 > 0)
+ replace = tte;
}
- *replace = TTEntry(pos.get_key(), v, type, d, m, generation);
- writes++;
+ replace->save(posKey32, v, t, d, m, generation, statV, kingD);
}
-/// TranspositionTable::retrieve 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. Returns a pointer to the TTEntry or NULL if
+/// position is not found.
-const TTEntry* TranspositionTable::retrieve(const Position &pos) const {
+TTEntry* TranspositionTable::probe(const Key posKey) const {
- TTEntry *tte = first_entry(pos);
+ uint32_t posKey32 = posKey >> 32;
+ TTEntry* tte = first_entry(posKey);
- for (int i = 0; i < 4; i++, tte++)
- {
- if (tte->key() == pos.get_key())
+ for (int i = 0; i < ClusterSize; i++, tte++)
+ if (tte->key() == posKey32)
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 Position &pos) const {
-
- return entries + (int(pos.get_key() & (size - 1)) << 2);
-}
-
/// TranspositionTable::new_search() is called at the beginning of every new
-/// search. It increments the "generation" variable, which is used to
+/// 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::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::insert_pv(const Position &pos, Move pv[]) {
-
- UndoInfo u;
- Position p(pos);
-
- for (int i = 0; pv[i] != MOVE_NONE; i++)
- {
- store(p, VALUE_NONE, Depth(0), pv[i], VALUE_TYPE_NONE);
- p.do_move(pv[i], u);
- }
-}
-
-
-/// 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.
-
-int TranspositionTable::full() {
-
- double N = double(size) * 4.0;
- return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N))));
-}
-
-
-/// Constructors
-
-TTEntry::TTEntry() {
-}
-
-TTEntry::TTEntry(Key k, Value v, ValueType t, Depth d, Move m,
- int generation) :
- key_ (k), data((m & 0x7FFFF) | (t << 20) | (generation << 23)),
- value_(v), depth_(int16_t(d)) {}
-
-
-