/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 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
#include "movegen.h"
#include "tt.h"
-#if defined(_MSC_VER)
-#include <xmmintrin.h>
-#endif
-
-// This is the number of TTEntry slots for each position
-static const int ClusterSize = 4;
-
// The main transposition table
TranspositionTable TT;
/// TranspositionTable::set_size sets the size of the transposition table,
/// measured in megabytes.
-void TranspositionTable::set_size(unsigned mbSize) {
-
- assert(mbSize >= 4 && mbSize <= 4096);
+void TranspositionTable::set_size(size_t mbSize) {
- unsigned newSize = 1024;
+ size_t newSize = 1024;
// We store a cluster of ClusterSize number of TTEntry for each position
// and newSize is the maximum number of storable positions.
- while ((2 * newSize) * ClusterSize * (sizeof(TTEntry)) <= (mbSize << 20))
+ while ((2 * newSize) * sizeof(TTCluster) <= (mbSize << 20))
newSize *= 2;
if (newSize != size)
{
size = newSize;
delete [] entries;
- entries = new TTEntry[size * ClusterSize];
+ entries = new TTCluster[size];
if (!entries)
{
std::cerr << "Failed to allocate " << mbSize
void TranspositionTable::clear() {
- memset(entries, 0, size * ClusterSize * sizeof(TTEntry));
-}
-
-
-/// TranspositionTable::first_entry returns a pointer to the first
-/// entry of a cluster given a position. The low 32 bits of the key
-/// are used to get the index in the table.
-
-inline TTEntry* TranspositionTable::first_entry(const Key posKey) const {
-
- return entries + ((uint32_t(posKey) & (size - 1)) * ClusterSize);
+ memset(entries, 0, size * sizeof(TTCluster));
}
/// 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 Key posKey, Value v, ValueType t, Depth d, Move m) {
+void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, Move m, Value statV, Value kingD) {
TTEntry *tte, *replace;
uint32_t posKey32 = posKey >> 32; // Use the high 32 bits as key
{
if (!tte->key() || tte->key() == posKey32) // empty or overwrite old
{
- // Do not overwrite when new type is VALUE_TYPE_EVAL
- if (tte->key() && t == VALUE_TYPE_EVAL)
- return;
-
+ // Preserve any exsisting ttMove
if (m == MOVE_NONE)
m = tte->move();
- *tte = TTEntry(posKey32, v, t, d, m, generation);
+ tte->save(posKey32, v, t, d, m, generation, statV, kingD);
return;
}
else if (i == 0) // replace would be a no-op in this common case
if (c1 + c2 + c3 > 0)
replace = tte;
}
- *replace = TTEntry(posKey32, v, t, d, m, generation);
+ replace->save(posKey32, v, t, d, m, generation, statV, kingD);
writes++;
}
}
-/// TranspositionTable::prefetch looks up the current position in the
-/// transposition table and load it in L1/L2 cache. This is a non
-/// blocking function and do not stalls the CPU waiting for data
-/// to be loaded from RAM, that can be very slow. When we will
-/// subsequently call retrieve() the TT data will be already
-/// quickly accessible in L1/l2 CPU cache.
-
-void TranspositionTable::prefetch(const Key posKey) const {
-
-#if defined(_MSC_VER)
- _mm_prefetch((char*)first_entry(posKey), _MM_HINT_T0);
-#else
- // We need to force an asm volatile here because gcc builtin
- // is optimized away by Intel compiler.
- char* addr = (char*)first_entry(posKey);
- asm volatile("prefetcht0 %0" :: "m" (addr));
-#endif
-}
-
-
/// 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
void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
StateInfo st;
- Position p(pos);
+ Position p(pos, pos.thread());
for (int i = 0; pv[i] != MOVE_NONE; i++)
{
- store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i]);
+ TTEntry *tte = retrieve(p.get_key());
+ if (!tte || tte->move() != pv[i])
+ store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i], VALUE_NONE, VALUE_NONE);
p.do_move(pv[i], st);
}
}
/// will often get single-move PVs when the search stops while failing high,
/// and a single-move PV means that we don't have a ponder move.
-void TranspositionTable::extract_pv(const Position& pos, Move pv[]) {
+void TranspositionTable::extract_pv(const Position& pos, Move bestMove, Move pv[], const int PLY_MAX) {
- int ply;
- Position p(pos);
- StateInfo st[100];
+ const TTEntry* tte;
+ StateInfo st;
+ Position p(pos, pos.thread());
+ int ply = 0;
- for (ply = 0; pv[ply] != MOVE_NONE; ply++)
- p.do_move(pv[ply], st[ply]);
+ assert(bestMove != MOVE_NONE);
- bool stop;
- const TTEntry* tte;
- for (stop = false, tte = retrieve(p.get_key());
- tte && tte->move() != MOVE_NONE && !stop;
- tte = retrieve(p.get_key()), ply++)
+ pv[ply] = bestMove;
+ p.do_move(pv[ply++], st);
+
+ // Try to add moves from TT while possible
+ while ( (tte = retrieve(p.get_key())) != NULL
+ && tte->move() != MOVE_NONE
+ && move_is_legal(p, tte->move())
+ && (!p.is_draw() || ply < 2)
+ && ply < PLY_MAX)
{
- if (!move_is_legal(p, tte->move()))
- break;
pv[ply] = tte->move();
- p.do_move(pv[ply], st[ply]);
- for (int j = 0; j < ply; j++)
- if (st[j].key == p.get_key()) stop = true;
+ p.do_move(pv[ply++], st);
}
pv[ply] = MOVE_NONE;
}
projects / stockfish / blobdiff