X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.cpp;h=2f1237a3b0c6b5b02b27636d9c3d78d02f31c84d;hb=d39bc2efa197ba2fd55b68eced1c60bcfe2facc1;hp=6516192d3700cc4dea05ba26f396cc09a6e37594;hpb=4c57cf0ead29536504ca452b876d350a8e2edbdc;p=stockfish
diff --git a/src/thread.cpp b/src/thread.cpp
index 6516192d..2f1237a3 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-2018 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,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) {
@@ -60,11 +61,11 @@ void Thread::clear() {
mainHistory.fill(0);
captureHistory.fill(0);
- for (auto& to : contHistory)
+ for (auto& to : continuationHistory)
for (auto& h : to)
- h.fill(0);
+ h->fill(0);
- contHistory[NO_PIECE][0].fill(Search::CounterMovePruneThreshold - 1);
+ continuationHistory[NO_PIECE][0]->fill(Search::CounterMovePruneThreshold - 1);
}
/// Thread::start_searching() wakes up the thread that will start the search
@@ -97,7 +98,7 @@ 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)
@@ -117,7 +118,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 +136,9 @@ 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"]);
}
}
@@ -158,8 +162,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;
@@ -169,7 +173,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,7 +191,7 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
for (Thread* th : *this)
{
- th->nodes = th->tbHits = th->nmp_ply = th->nmp_odd = 0;
+ th->nodes = th->tbHits = th->nmpMinPly = 0;
th->rootDepth = th->completedDepth = DEPTH_ZERO;
th->rootMoves = rootMoves;
th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th);