mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-25 11:36:51 +08:00
This addresses the issue where Stockfish may output non-proven checkmate scores if the search is prematurely halted, either due to a time control or node limit, before it explores other possibilities where the checkmate score could have been delayed or refuted. The fix also replaces staving off from proven mated scores in a multithread environment making use of the threads instead of a negative effect with multithreads (1t was better in proving mated in scores than more threads). Issue reported on mate tracker repo by and this PR is co-authored with @robertnurnberg Special thanks to @AndyGrant for outlining that a fix is eventually possible. Passed Adj off SMP STC: https://tests.stockfishchess.org/tests/view/65a125d779aa8af82b96c3eb LLR: 2.96 (-2.94,2.94) <-1.75,0.25> Total: 303256 W: 75823 L: 75892 D: 151541 Ptnml(0-2): 406, 35269, 80395, 35104, 454 Passed Adj off SMP LTC: https://tests.stockfishchess.org/tests/view/65a37add79aa8af82b96f0f7 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 56056 W: 13951 L: 13770 D: 28335 Ptnml(0-2): 11, 5910, 16002, 6097, 8 Passed all tests in matetrack without any better mate for opponent found in 1t and multithreads. Fixed bugs in https://github.com/official-stockfish/Stockfish/pull/4976 closes https://github.com/official-stockfish/Stockfish/pull/4990 Bench: 1308279 Co-Authored-By: Robert Nürnberg <28635489+robertnurnberg@users.noreply.github.com>
122 lines
3.9 KiB
C++
122 lines
3.9 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
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
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef THREAD_H_INCLUDED
|
|
#define THREAD_H_INCLUDED
|
|
|
|
#include <atomic>
|
|
#include <condition_variable>
|
|
#include <cstddef>
|
|
#include <cstdint>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <vector>
|
|
|
|
#include "position.h"
|
|
#include "search.h"
|
|
#include "thread_win32_osx.h"
|
|
|
|
namespace Stockfish {
|
|
|
|
class OptionsMap;
|
|
using Value = int;
|
|
|
|
// 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<Search::ISearchManager>, size_t);
|
|
virtual ~Thread();
|
|
|
|
void idle_loop();
|
|
void start_searching();
|
|
void wait_for_search_finished();
|
|
size_t id() const { return idx; }
|
|
|
|
std::unique_ptr<Search::Worker> worker;
|
|
|
|
private:
|
|
std::mutex mutex;
|
|
std::condition_variable cv;
|
|
size_t idx, nthreads;
|
|
bool exit = false, searching = true; // Set before starting std::thread
|
|
NativeThread stdThread;
|
|
};
|
|
|
|
|
|
// 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() {
|
|
// destroy any existing thread(s)
|
|
if (threads.size() > 0)
|
|
{
|
|
main_thread()->wait_for_search_finished();
|
|
|
|
while (threads.size() > 0)
|
|
delete threads.back(), threads.pop_back();
|
|
}
|
|
}
|
|
|
|
void
|
|
start_thinking(const OptionsMap&, Position&, StateListPtr&, Search::LimitsType, bool = false);
|
|
void clear();
|
|
void set(Search::SharedState);
|
|
|
|
Search::SearchManager* main_manager() const {
|
|
return static_cast<Search::SearchManager*>(main_thread()->worker.get()->manager.get());
|
|
};
|
|
Thread* main_thread() const { return threads.front(); }
|
|
uint64_t nodes_searched() const { return accumulate(&Search::Worker::nodes); }
|
|
uint64_t tb_hits() const { return accumulate(&Search::Worker::tbHits); }
|
|
Thread* get_best_thread() const;
|
|
void start_searching();
|
|
void wait_for_search_finished() const;
|
|
|
|
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<Thread*> threads;
|
|
|
|
uint64_t accumulate(std::atomic<uint64_t> Search::Worker::*member) const {
|
|
|
|
uint64_t sum = 0;
|
|
for (Thread* th : threads)
|
|
sum += (th->worker.get()->*member).load(std::memory_order_relaxed);
|
|
return sum;
|
|
}
|
|
};
|
|
|
|
} // namespace Stockfish
|
|
|
|
#endif // #ifndef THREAD_H_INCLUDED
|