X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=b7d47e7498951320a861dd60c66877a0a3ce710e;hp=5e1dfe1788e8432e44b511e8fce8df25d19aa8f2;hb=62c68c2d2174ee5158cf3282c7429b15483f3d51;hpb=60bc30275decbb00aa26af8dc14ad6cb167eaa82 diff --git a/src/tt.cpp b/src/tt.cpp index 5e1dfe17..b7d47e74 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-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 @@ -25,7 +25,6 @@ #include #include #include -#include #include "movegen.h" #include "tt.h" @@ -53,11 +52,9 @@ TranspositionTable::~TranspositionTable() { /// 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) { - assert(mbSize >= 4 && mbSize <= 4096); - - 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. @@ -91,16 +88,6 @@ void TranspositionTable::clear() { } -/// 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)].data; -} - - /// 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 @@ -111,7 +98,7 @@ inline TTEntry* TranspositionTable::first_entry(const Key posKey) const { /// 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 @@ -121,14 +108,11 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, { if (!tte->key() || tte->key() == posKey32) // empty or overwrite old { - // Do not overwrite when new type is VALUE_TYPE_EV_LO - if (tte->key() && t == VALUE_TYPE_EV_LO) - 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 @@ -141,7 +125,7 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, 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++; } @@ -163,27 +147,6 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const { } -/// 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(__INTEL_COMPILER) || defined(__ICL) - // This hack prevents prefetches to be optimized away by the - // Intel compiler. Both MSVC and gcc seems not affected. - __asm__ (""); -#endif - - char const* addr = (char*)first_entry(posKey); - _mm_prefetch(addr, _MM_HINT_T2); - _mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead -} - - /// 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 @@ -204,11 +167,13 @@ void TranspositionTable::new_search() { 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); } } @@ -220,23 +185,24 @@ void TranspositionTable::insert_pv(const Position& pos, Move pv[]) { /// 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[], int pvSize) { +void TranspositionTable::extract_pv(const Position& pos, Move bestMove, Move pv[], const int PLY_MAX) { const TTEntry* tte; StateInfo st; - Position p(pos); + Position p(pos, pos.thread()); int ply = 0; - // Update position to the end of current PV - while (pv[ply] != MOVE_NONE) - p.do_move(pv[ply++], st); + assert(bestMove != MOVE_NONE); + + pv[ply] = bestMove; + p.do_move(pv[ply++], st); - // Try to add moves from TT until possible + // 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 < pvSize) + && ply < PLY_MAX) { pv[ply] = tte->move(); p.do_move(pv[ply++], st);