X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=680cd3adb8c3dc52bf87c9225f2a08db33e65cd7;hp=208cb0b1279d07f23f0b530c8b599b1444ab9bcb;hb=6f3796adaf44c48cf1353181d386a61a57859b67;hpb=232c50fed0b80a0f39322a925575f760648ae0a5
diff --git a/src/thread.cpp b/src/thread.cpp
index 208cb0b1..680cd3ad 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-2019 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,19 +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) {
@@ -50,12 +52,40 @@ Thread::~Thread() {
stdThread.join();
}
+/// Thread::bestMoveCount(Move move) return best move counter for the given root move
+
+int Thread::best_move_count(Move move) {
+
+ 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
+
+void Thread::clear() {
+
+ counterMoves.fill(MOVE_NONE);
+ mainHistory.fill(0);
+ captureHistory.fill(0);
+
+ for (bool inCheck : { false, true })
+ for (StatsType c : { NoCaptures, Captures })
+ for (auto& to : continuationHistory[inCheck][c])
+ for (auto& h : to)
+ h->fill(0);
+
+ for (bool inCheck : { false, true })
+ for (StatsType c : { NoCaptures, Captures })
+ 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()
}
@@ -66,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; });
}
@@ -76,11 +106,17 @@ void Thread::wait_for_search_finished() {
void Thread::idle_loop() {
- WinProcGroup::bindThisThread(idx);
+ // If OS already scheduled us on a different group than 0 then don't overwrite
+ // the choice, eventually we are one of many one-threaded processes running on
+ // 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)
+ 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; });
@@ -94,42 +130,46 @@ void Thread::idle_loop() {
}
}
+/// ThreadPool::set() creates/destroys threads to match the requested number.
+/// Created and launched threads will immediately go to sleep in idle_loop.
+/// Upon resizing, threads are recreated to allow for binding if necessary.
-/// ThreadPool::init() creates and launches the threads that will go
-/// immediately to sleep in idle_loop. We cannot use the c'tor because
-/// Threads is a static object and we need a fully initialized engine at
-/// this point due to allocation of Endgames in the Thread constructor.
+void ThreadPool::set(size_t requested) {
-void ThreadPool::init(size_t requested) {
+ if (size() > 0) { // destroy any existing thread(s)
+ main()->wait_for_search_finished();
- push_back(new MainThread(0));
- set(requested);
-}
+ while (size() > 0)
+ delete back(), pop_back();
+ }
+ if (requested > 0) { // create new thread(s)
+ push_back(new MainThread(0));
-/// ThreadPool::exit() terminates threads before the program exits. Cannot be
-/// done in the destructor because threads must be terminated before deleting
-/// any static object, so before main() returns.
+ while (size() < requested)
+ push_back(new Thread(size()));
+ clear();
-void ThreadPool::exit() {
+ // Reallocate the hash with the new threadpool size
+ TT.resize(Options["Hash"]);
- main()->wait_for_search_finished();
- set(0);
+ // Init thread number dependent search params.
+ Search::init();
+ }
}
+/// ThreadPool::clear() sets threadPool data to initial values.
-/// ThreadPool::set() creates/destroys threads to match the requested number
+void ThreadPool::clear() {
-void ThreadPool::set(size_t requested) {
+ for (Thread* th : *this)
+ th->clear();
- while (size() < requested)
- push_back(new Thread(size()));
-
- while (size() > requested)
- delete back(), pop_back();
+ main()->callsCnt = 0;
+ main()->previousScore = VALUE_INFINITE;
+ main()->previousTimeReduction = 1.0;
}
-
/// ThreadPool::start_thinking() wakes up main thread waiting in idle_loop() and
/// returns immediately. Main thread will wake up other threads and start the search.
@@ -138,8 +178,8 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
main()->wait_for_search_finished();
- stopOnPonderhit = stop = false;
- ponder = ponderMode;
+ main()->stopOnPonderhit = stop = false;
+ main()->ponder = ponderMode;
Search::Limits = limits;
Search::RootMoves rootMoves;
@@ -149,7 +189,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.
@@ -165,10 +205,10 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
// is shared by threads but is accessed in read-only mode.
StateInfo tmp = setupStates->back();
- for (Thread* th : Threads)
+ for (Thread* th : *this)
{
- th->nodes = th->tbHits = 0;
- th->rootDepth = th->completedDepth = DEPTH_ZERO;
+ th->shuffleExts = 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);
}