X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftt.cpp;h=16331b8762ae04c60689a341f46af7c3ad49e9c9;hb=9337c6da46dae7c1664f36a4b27e1fedef910b9a;hp=e8a316c96b7ae5831cb32737ec0df38eb72300b8;hpb=b89733b46c9267f61ac41c48204557483658435b;p=stockfish diff --git a/src/tt.cpp b/src/tt.cpp index e8a316c9..16331b87 100644 --- a/src/tt.cpp +++ b/src/tt.cpp @@ -25,7 +25,7 @@ #include #include #include -#if defined(__i386__) || defined(_M_IX86) || defined(_X86_) +#if !defined(NO_PREFETCH) # include #endif @@ -111,7 +111,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 @@ -125,7 +125,7 @@ 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 = TTEntry(posKey32, v, t, d, m, generation, statV, kingD); return; } else if (i == 0) // replace would be a no-op in this common case @@ -138,7 +138,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 = TTEntry(posKey32, v, t, d, m, generation, statV, kingD); writes++; } @@ -166,7 +166,7 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const { /// 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(__i386__) || defined(_M_IX86) || defined(_X86_)) +#if defined(NO_PREFETCH) void TranspositionTable::prefetch(const Key) const {} #else @@ -205,13 +205,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); } } @@ -227,7 +227,7 @@ void TranspositionTable::extract_pv(const Position& pos, Move pv[], const int PL const TTEntry* tte; StateInfo st; - Position p(pos); + Position p(pos, pos.thread()); int ply = 0; // Update position to the end of current PV