X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=1f1490a9f27d8696033db78bf0c9a334385ec678;hp=4dc7d9e9b02aa565a56dd626155c706baf5893ad;hb=e18321f55a2f51a2bf1775200241381b63daf181;hpb=94e41274bba2d8a2f2d58aaa711df5872309d66c diff --git a/src/thread.cpp b/src/thread.cpp index 4dc7d9e9..1f1490a9 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -25,6 +25,7 @@ #include "search.h" #include "thread.h" #include "uci.h" +#include "syzygy/tbprobe.h" ThreadPool Threads; // Global object @@ -35,6 +36,7 @@ Thread::Thread() { resetCalls = exit = false; maxPly = callsCnt = 0; + tbHits = 0; history.clear(); counterMoves.clear(); idx = Threads.size(); // Start from 0 @@ -157,19 +159,30 @@ void ThreadPool::read_uci_options() { /// ThreadPool::nodes_searched() returns the number of nodes searched -int64_t ThreadPool::nodes_searched() { +uint64_t ThreadPool::nodes_searched() const { - int64_t nodes = 0; + uint64_t nodes = 0; for (Thread* th : *this) nodes += th->rootPos.nodes_searched(); return nodes; } +/// ThreadPool::tb_hits() returns the number of TB hits + +uint64_t ThreadPool::tb_hits() const { + + uint64_t hits = 0; + for (Thread* th : *this) + hits += th->tbHits; + return hits; +} + + /// ThreadPool::start_thinking() wakes up the main thread sleeping in idle_loop() /// and starts a new search, then returns immediately. -void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, +void ThreadPool::start_thinking(Position& pos, StateListPtr& states, const Search::LimitsType& limits) { main()->wait_for_search_finished(); @@ -183,6 +196,9 @@ void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m)) rootMoves.push_back(Search::RootMove(m)); + if (!rootMoves.empty()) + Tablebases::filter_root_moves(pos, rootMoves); + // After ownership transfer 'states' becomes empty, so if we stop the search // and call 'go' again without setting a new position states.get() == NULL. assert(states.get() || setupStates.get()); @@ -195,6 +211,7 @@ void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, for (Thread* th : Threads) { th->maxPly = 0; + th->tbHits = 0; th->rootDepth = DEPTH_ZERO; th->rootMoves = rootMoves; th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th);