summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2550c63)
Assorted fixes but no functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
////
// The main transposition table
////
// The main transposition table
-TranspositionTable TT = TranspositionTable(TTDefaultSize);
// Number of active threads:
// Number of active threads:
return bestValue;
if (bestValue <= oldAlpha)
return bestValue;
if (bestValue <= oldAlpha)
- TT.store(pos, value_to_tt(bestValue, ply), depth, MOVE_NONE, VALUE_TYPE_UPPER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, depth, MOVE_NONE);
else if (bestValue >= beta)
{
else if (bestValue >= beta)
{
update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]);
}
update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]);
}
- TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
- TT.store(pos, value_to_tt(bestValue, ply), depth, ss[ply].pv[ply], VALUE_TYPE_EXACT);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, depth, ss[ply].pv[ply]);
return bestValue;
if (bestValue < beta)
return bestValue;
if (bestValue < beta)
- TT.store(pos, value_to_tt(bestValue, ply), depth, MOVE_NONE, VALUE_TYPE_UPPER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, depth, MOVE_NONE);
else
{
BetaCounter.add(pos.side_to_move(), depth, threadID);
else
{
BetaCounter.add(pos.side_to_move(), depth, threadID);
update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]);
}
update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]);
}
- TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
}
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
}
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
{
// Store the score to avoid a future costly evaluation() call
if (!isCheck && !tte && ei.futilityMargin == 0)
{
// Store the score to avoid a future costly evaluation() call
if (!isCheck && !tte && ei.futilityMargin == 0)
- TT.store(pos, value_to_tt(bestValue, ply), Depth(-127*OnePly), MOVE_NONE, VALUE_TYPE_EVAL);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_EVAL, Depth(-127*OnePly), MOVE_NONE);
{
Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1));
if (bestValue < beta)
{
Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1));
if (bestValue < beta)
- TT.store(pos, value_to_tt(bestValue, ply), d, MOVE_NONE, VALUE_TYPE_UPPER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, d, MOVE_NONE);
- TT.store(pos, value_to_tt(bestValue, ply), d, m, VALUE_TYPE_LOWER);
+ TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, d, m);
}
// Update killers only for good check moves
}
// Update killers only for good check moves
+TranspositionTable::TranspositionTable() {
-TranspositionTable::TranspositionTable(unsigned mbSize) {
-
- size = 0;
- generation = 0;
- writes = 0;
TranspositionTable::~TranspositionTable() {
delete [] entries;
TranspositionTable::~TranspositionTable() {
delete [] entries;
// We store a cluster of 4 TTEntry for each position and newSize is
// the maximum number of storable positions
// 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;
+ while ((2 * newSize) * 4 * (sizeof(TTEntry)) <= (mbSize << 20))
+ newSize *= 2;
+
- 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();
+ 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();
}
}
/// 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
+/// 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?
/// user asks the program to clear the table (from the UCI interface).
/// Perhaps we should also clear it when the "ucinewgame" command is recieved?
/// TranspositionTable::store writes a new entry containing a position,
/// a value, a value type, a search depth, and a best move to the
/// 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
+/// 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.
/// 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.
-void TranspositionTable::store(const Position &pos, Value v, Depth d,
- Move m, ValueType type) {
+void TranspositionTable::store(const Position& p, Value v, ValueType t, Depth d, Move m) {
+
- tte = replace = first_entry(pos);
+ tte = replace = first_entry(p);
for (int i = 0; i < 4; i++, tte++)
{
for (int i = 0; i < 4; i++, tte++)
{
- if (!tte->key() || tte->key() == pos.get_key()) // empty or overwrite old
- {
- // Do not overwrite position entry when VALUE_TYPE_EVAL
- if ( tte->key()
- && type == VALUE_TYPE_EVAL)
- return;
-
- if (m == MOVE_NONE)
- m = tte->move();
-
- *tte = TTEntry(pos.get_key(), v, type, 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;
+ if (!tte->key() || tte->key() == p.get_key()) // 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(p.get_key(), 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(pos.get_key(), v, type, d, m, generation);
+ *replace = TTEntry(p.get_key(), v, t, d, m, generation);
/// transposition table. Returns a pointer to the TTEntry or NULL
/// if position is not found.
/// transposition table. Returns a pointer to the TTEntry or NULL
/// if position is not found.
-TTEntry* TranspositionTable::retrieve(const Position &pos) const {
+TTEntry* TranspositionTable::retrieve(const Position& pos) const {
TTEntry *tte = first_entry(pos);
for (int i = 0; i < 4; i++, tte++)
TTEntry *tte = first_entry(pos);
for (int i = 0; i < 4; i++, tte++)
if (tte->key() == pos.get_key())
return tte;
if (tte->key() == pos.get_key())
return tte;
/// TranspositionTable::first_entry returns a pointer to the first
/// entry of a cluster given a position.
/// 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 {
+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
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.
/// distinguish transposition table entries from previous searches from
/// entries from the current search.
/// TranspositionTable::insert_pv() is called at the end of a search
/// 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.
+/// 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[]) {
+void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
StateInfo st;
Position p(pos);
for (int i = 0; pv[i] != MOVE_NONE; i++)
{
StateInfo st;
Position p(pos);
for (int i = 0; pv[i] != MOVE_NONE; i++)
{
- store(p, VALUE_NONE, Depth(-127*OnePly), pv[i], VALUE_TYPE_NONE);
- p.do_move(pv[i], st);
+ store(p, VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i]);
+ p.do_move(pv[i], st);
/// entries which have received at least one write during the current search.
/// It is used to display the "info hashfull ..." information in UCI.
/// 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() {
+int TranspositionTable::full() const {
double N = double(size) * 4.0;
return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N))));
}
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 & 0x1FFFF) | (t << 20) | (generation << 23)),
- value_(int16_t(v)), depth_(int16_t(d)) {}
- TTEntry();
- TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation);
+ TTEntry() {}
+ TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation)
+ : key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
+ value_(int16_t(v)), depth_(int16_t(d)) {}
+
Key key() const { return key_; }
Depth depth() const { return Depth(depth_); }
Move move() const { return Move(data & 0x1FFFF); }
Key key() const { return key_; }
Depth depth() const { return Depth(depth_); }
Move move() const { return Move(data & 0x1FFFF); }
class TranspositionTable {
public:
class TranspositionTable {
public:
- TranspositionTable(unsigned mbSize);
~TranspositionTable();
void set_size(unsigned mbSize);
void clear();
~TranspositionTable();
void set_size(unsigned mbSize);
void clear();
- void store(const Position &pos, Value v, Depth d, Move m, ValueType type);
- TTEntry* retrieve(const Position &pos) const;
+ void store(const Position& pos, Value v, ValueType type, Depth d, Move m);
+ TTEntry* retrieve(const Position& pos) const;
- void insert_pv(const Position &pos, Move pv[]);
- int full();
+ void insert_pv(const Position& pos, Move pv[]);
+ int full() const;
- inline TTEntry* first_entry(const Position &pos) const;
+ inline TTEntry* first_entry(const Position& pos) const;
- unsigned size;
- int writes;
TTEntry* entries;
uint8_t generation;
};
TTEntry* entries;
uint8_t generation;
};
-
-////
-//// Constants and variables
-////
-
-// Default transposition table size, in megabytes:
-const int TTDefaultSize = 32;
-
-
#endif // !defined(TT_H_INCLUDED)
#endif // !defined(TT_H_INCLUDED)