X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=d6a48eca73d14937f19212d462d9a120398d21d0;hb=HEAD;hp=f54fcbbe71b62691d62de3f9480980db6aa71558;hpb=2c317d7b28161e74f0cdc0a00922b48cb996321f;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index f54fcbbe..43e2e142 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,6 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2004-2024 The Stockfish developers (see AUTHORS file)
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,64 +16,163 @@
along with this program. If not, see .
*/
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
#define THREAD_H_INCLUDED
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
-#include "lock.h"
-#include "movepick.h"
+#include "numa.h"
#include "position.h"
#include "search.h"
+#include "thread_win32_osx.h"
-const int MAX_THREADS = 32;
-const int MAX_ACTIVE_SPLIT_POINTS = 8;
-
-struct SplitPoint {
-
- // Const data after splitPoint has been setup
- SplitPoint* parent;
- const Position* pos;
- Depth depth;
- bool pvNode;
- Value beta;
- int ply;
- int master;
- Move threatMove;
-
- // Const pointers to shared data
- MovePicker* mp;
- SearchStack* ss;
-
- // Shared data
- Lock lock;
- volatile int64_t nodes;
- volatile Value alpha;
- volatile Value bestValue;
- volatile int moveCount;
- volatile bool betaCutoff;
- volatile int slaves[MAX_THREADS];
+namespace Stockfish {
+
+
+class OptionsMap;
+using Value = int;
+
+// Sometimes we don't want to actually bind the threads, but the recipient still
+// needs to think it runs on *some* NUMA node, such that it can access structures
+// that rely on NUMA node knowledge. This class encapsulates this optional process
+// such that the recipient does not need to know whether the binding happened or not.
+class OptionalThreadToNumaNodeBinder {
+ public:
+ OptionalThreadToNumaNodeBinder(NumaIndex n) :
+ numaConfig(nullptr),
+ numaId(n) {}
+
+ OptionalThreadToNumaNodeBinder(const NumaConfig& cfg, NumaIndex n) :
+ numaConfig(&cfg),
+ numaId(n) {}
+
+ NumaReplicatedAccessToken operator()() const {
+ if (numaConfig != nullptr)
+ return numaConfig->bind_current_thread_to_numa_node(numaId);
+ else
+ return NumaReplicatedAccessToken(numaId);
+ }
+
+ private:
+ const NumaConfig* numaConfig;
+ NumaIndex numaId;
};
-// ThreadState type is used to represent thread's current state
-enum ThreadState
-{
- THREAD_INITIALIZING, // thread is initializing itself
- THREAD_SEARCHING, // thread is performing work
- THREAD_AVAILABLE, // thread is waiting for work
- THREAD_BOOKED, // other thread (master) has booked us as a slave
- THREAD_WORKISWAITING, // master has ordered us to start
- THREAD_TERMINATED // we are quitting and thread is terminated
+// Abstraction of a thread. It contains a pointer to the worker and a native thread.
+// After construction, the native thread is started with idle_loop()
+// waiting for a signal to start searching.
+// When the signal is received, the thread starts searching and when
+// the search is finished, it goes back to idle_loop() waiting for a new signal.
+class Thread {
+ public:
+ Thread(Search::SharedState&,
+ std::unique_ptr,
+ size_t,
+ OptionalThreadToNumaNodeBinder);
+ virtual ~Thread();
+
+ void idle_loop();
+ void start_searching();
+ void clear_worker();
+ void run_custom_job(std::function f);
+
+ void ensure_network_replicated();
+
+ // Thread has been slightly altered to allow running custom jobs, so
+ // this name is no longer correct. However, this class (and ThreadPool)
+ // require further work to make them properly generic while maintaining
+ // appropriate specificity regarding search, from the point of view of an
+ // outside user, so renaming of this function is left for whenever that happens.
+ void wait_for_search_finished();
+ size_t id() const { return idx; }
+
+ std::unique_ptr worker;
+ std::function jobFunc;
+
+ private:
+ std::mutex mutex;
+ std::condition_variable cv;
+ size_t idx, nthreads;
+ bool exit = false, searching = true; // Set before starting std::thread
+ NativeThread stdThread;
+ NumaReplicatedAccessToken numaAccessToken;
};
-struct Thread {
- int maxPly;
- Lock sleepLock;
- WaitCondition sleepCond;
- volatile ThreadState state;
- SplitPoint* volatile splitPoint;
- volatile int activeSplitPoints;
- SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
+
+// ThreadPool struct handles all the threads-related stuff like init, starting,
+// parking and, most importantly, launching a thread. All the access to threads
+// is done through this class.
+class ThreadPool {
+ public:
+ ThreadPool() {}
+
+ ~ThreadPool() {
+ // destroy any existing thread(s)
+ if (threads.size() > 0)
+ {
+ main_thread()->wait_for_search_finished();
+
+ threads.clear();
+ }
+ }
+
+ ThreadPool(const ThreadPool&) = delete;
+ ThreadPool(ThreadPool&&) = delete;
+
+ ThreadPool& operator=(const ThreadPool&) = delete;
+ ThreadPool& operator=(ThreadPool&&) = delete;
+
+ void start_thinking(const OptionsMap&, Position&, StateListPtr&, Search::LimitsType);
+ void run_on_thread(size_t threadId, std::function f);
+ void wait_on_thread(size_t threadId);
+ size_t num_threads() const;
+ void clear();
+ void set(const NumaConfig& numaConfig,
+ Search::SharedState,
+ const Search::SearchManager::UpdateContext&);
+
+ Search::SearchManager* main_manager();
+ Thread* main_thread() const { return threads.front().get(); }
+ uint64_t nodes_searched() const;
+ uint64_t tb_hits() const;
+ Thread* get_best_thread() const;
+ void start_searching();
+ void wait_for_search_finished() const;
+
+ std::vector get_bound_thread_count_by_numa_node() const;
+
+ void ensure_network_replicated();
+
+ std::atomic_bool stop, abortedSearch, increaseDepth;
+
+ auto cbegin() const noexcept { return threads.cbegin(); }
+ auto begin() noexcept { return threads.begin(); }
+ auto end() noexcept { return threads.end(); }
+ auto cend() const noexcept { return threads.cend(); }
+ auto size() const noexcept { return threads.size(); }
+ auto empty() const noexcept { return threads.empty(); }
+
+ private:
+ StateListPtr setupStates;
+ std::vector> threads;
+ std::vector boundThreadToNumaNode;
+
+ uint64_t accumulate(std::atomic Search::Worker::*member) const {
+
+ uint64_t sum = 0;
+ for (auto&& th : threads)
+ sum += (th->worker.get()->*member).load(std::memory_order_relaxed);
+ return sum;
+ }
};
-#endif // !defined(THREAD_H_INCLUDED)
+} // namespace Stockfish
+
+#endif // #ifndef THREAD_H_INCLUDED