X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread.cpp;h=b5cb87d9356974553a50bea29c92342f67c9c173;hb=fbc7a328c67092799547f93e684323e2c1a6226e;hp=c858817a7f1e011e4e4df26b9735bfb1ef9593fd;hpb=1c50d8cbf554733c0db6ab423b413d75cc0c1928;p=stockfish
diff --git a/src/thread.cpp b/src/thread.cpp
index c858817a..b5cb87d9 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2020 Marco Costalba, Joona Kiiski, Gary Linscott, 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
@@ -18,20 +18,21 @@
along with this program. If not, see .
*/
-#include // For std::count
#include
+#include // For std::count
#include "movegen.h"
#include "search.h"
#include "thread.h"
#include "uci.h"
#include "syzygy/tbprobe.h"
+#include "tt.h"
ThreadPool Threads; // Global object
/// Thread constructor launches the thread and waits until it goes to sleep
-/// in idle_loop(). Note that 'searching' and 'exit' should be alredy set.
+/// in idle_loop(). Note that 'searching' and 'exit' should be already set.
Thread::Thread(size_t n) : idx(n), stdThread(&Thread::idle_loop, this) {
@@ -51,6 +52,15 @@ Thread::~Thread() {
stdThread.join();
}
+/// Thread::bestMoveCount(Move move) return best move counter for the given root move
+
+int Thread::best_move_count(Move move) const {
+
+ auto rm = std::find(rootMoves.begin() + pvIdx,
+ rootMoves.begin() + pvLast, move);
+
+ return rm != rootMoves.begin() + pvLast ? rm->bestMoveCount : 0;
+}
/// Thread::clear() reset histories, usually before a new game
@@ -58,20 +68,24 @@ void Thread::clear() {
counterMoves.fill(MOVE_NONE);
mainHistory.fill(0);
+ lowPlyHistory.fill(0);
captureHistory.fill(0);
- for (auto& to : contHistory)
- for (auto& h : to)
- h.fill(0);
-
- contHistory[NO_PIECE][0].fill(Search::CounterMovePruneThreshold - 1);
+ for (bool inCheck : { false, true })
+ for (StatsType c : { NoCaptures, Captures })
+ {
+ for (auto& to : continuationHistory[inCheck][c])
+ for (auto& h : to)
+ h->fill(0);
+ continuationHistory[inCheck][c][NO_PIECE][0]->fill(Search::CounterMovePruneThreshold - 1);
+ }
}
/// Thread::start_searching() wakes up the thread that will start the search
void Thread::start_searching() {
- std::lock_guard lk(mutex);
+ std::lock_guard lk(mutex);
searching = true;
cv.notify_one(); // Wake up the thread in idle_loop()
}
@@ -82,7 +96,7 @@ void Thread::start_searching() {
void Thread::wait_for_search_finished() {
- std::unique_lock lk(mutex);
+ std::unique_lock lk(mutex);
cv.wait(lk, [&]{ return !searching; });
}
@@ -97,12 +111,12 @@ void Thread::idle_loop() {
// some Windows NUMA hardware, for instance in fishtest. To make it simple,
// just check if running threads are below a threshold, in this case all this
// NUMA machinery is not needed.
- if (Options["Threads"] >= 8)
+ if (Options["Threads"] > 8)
WinProcGroup::bindThisThread(idx);
while (true)
{
- std::unique_lock lk(mutex);
+ std::unique_lock lk(mutex);
searching = false;
cv.notify_one(); // Wake up anyone waiting for search finished
cv.wait(lk, [&]{ return searching; });
@@ -117,7 +131,7 @@ void Thread::idle_loop() {
}
/// ThreadPool::set() creates/destroys threads to match the requested number.
-/// Created and launced threads wil go immediately to sleep in idle_loop.
+/// Created and launched threads will immediately go to sleep in idle_loop.
/// Upon resizing, threads are recreated to allow for binding if necessary.
void ThreadPool::set(size_t requested) {
@@ -135,6 +149,12 @@ void ThreadPool::set(size_t requested) {
while (size() < requested)
push_back(new Thread(size()));
clear();
+
+ // Reallocate the hash with the new threadpool size
+ TT.resize(Options["Hash"]);
+
+ // Init thread number dependent search params.
+ Search::init();
}
}
@@ -147,7 +167,7 @@ void ThreadPool::clear() {
main()->callsCnt = 0;
main()->previousScore = VALUE_INFINITE;
- main()->previousTimeReduction = 1;
+ main()->previousTimeReduction = 1.0;
}
/// ThreadPool::start_thinking() wakes up main thread waiting in idle_loop() and
@@ -158,8 +178,9 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
main()->wait_for_search_finished();
- stopOnPonderhit = stop = false;
- ponder = ponderMode;
+ main()->stopOnPonderhit = stop = false;
+ increaseDepth = true;
+ main()->ponder = ponderMode;
Search::Limits = limits;
Search::RootMoves rootMoves;
@@ -169,7 +190,7 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
rootMoves.emplace_back(m);
if (!rootMoves.empty())
- Tablebases::filter_root_moves(pos, rootMoves);
+ Tablebases::rank_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.
@@ -187,12 +208,11 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
for (Thread* th : *this)
{
- th->nodes = th->tbHits = 0;
- th->rootDepth = th->completedDepth = DEPTH_ZERO;
+ th->nodes = th->tbHits = th->nmpMinPly = 0;
+ th->rootDepth = th->completedDepth = 0;
th->rootMoves = rootMoves;
th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th);
- th->nmp_ply = 0;
- th->pair = -1;
+ th->lowPlyHistory.fill(0);
}
setupStates->back() = tmp;