X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=57dd00790e816670cea1bdfbfea870896492dce5;hp=c10f2e447f724ff3ccff4a6aabfc3e79b0738e9b;hb=6c0a37bbf2ecb828cb41cb3cfac122f34c2a6e4b;hpb=67f611f3eb68a9714d41d62777913bb2a4075314 diff --git a/src/tt.cpp b/src/tt.cpp index c10f2e44..57dd0079 100644 --- a/src/tt.cpp +++ b/src/tt.cpp @@ -25,9 +25,6 @@ #include #include #include -#if !(defined(__hpux) || defined(__ppc__) || defined(__ppc64__) || defined(__arm__)) -# include -#endif #include "movegen.h" #include "tt.h" @@ -41,7 +38,7 @@ TranspositionTable TT; TranspositionTable::TranspositionTable() { - size = writes = 0; + size = overwrites = 0; entries = 0; generation = 0; } @@ -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,8 +98,9 @@ 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) { + int c1, c2, c3; TTEntry *tte, *replace; uint32_t posKey32 = posKey >> 32; // Use the high 32 bits as key @@ -125,21 +113,22 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, 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 (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); + c1 = (replace->generation() == generation ? 2 : 0); + c2 = (tte->generation() == generation ? -2 : 0); + c3 = (tte->depth() < replace->depth() ? 1 : 0); if (c1 + c2 + c3 > 0) replace = tte; } - *replace = TTEntry(posKey32, v, t, d, m, generation); - writes++; + replace->save(posKey32, v, t, d, m, generation, statV, kingD); + overwrites++; } @@ -160,31 +149,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. -#if defined(__hpux) || defined(__ppc__) || defined(__ppc64__) || defined(__arm__) -void TranspositionTable::prefetch(const Key) const {} // Not supported on HP UX -#else - -void TranspositionTable::prefetch(const Key posKey) const { - -#if defined(__INTEL_COMPILER) || defined(__ICL) - // This hack prevents prefetches to be optimized away by - // 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 -} - -#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 @@ -193,7 +157,7 @@ void TranspositionTable::prefetch(const Key posKey) const { void TranspositionTable::new_search() { generation++; - writes = 0; + overwrites = 0; } @@ -205,13 +169,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++) { 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]); + store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i], VALUE_NONE, VALUE_NONE); p.do_move(pv[i], st); } } @@ -223,20 +187,23 @@ 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[], const int PLY_MAX) { +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 while possible + // Extract moves from TT when possible. We try hard to always + // get a ponder move, that's the reason of ply < 2 conditions. while ( (tte = retrieve(p.get_key())) != NULL && tte->move() != MOVE_NONE + && (tte->type() == VALUE_TYPE_EXACT || ply < 2) && move_is_legal(p, tte->move()) && (!p.is_draw() || ply < 2) && ply < PLY_MAX) @@ -249,11 +216,11 @@ void TranspositionTable::extract_pv(const Position& pos, Move pv[], const int PL /// TranspositionTable::full() returns the permill of all transposition table -/// entries which have received at least one write during the current search. +/// entries which have received at least one overwrite during the current search. /// It is used to display the "info hashfull ..." information in UCI. int TranspositionTable::full() const { double N = double(size) * ClusterSize; - return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N)))); + return int(1000 * (1 - exp(overwrites * log(1.0 - 1.0/N)))); }