int active_threads() const { return ActiveThreads; }
void set_active_threads(int newActiveThreads) { ActiveThreads = newActiveThreads; }
- void incrementNodeCounter(int threadID) { threads[threadID].nodes++; }
- void resetNodeCounters();
- int64_t nodes_searched() const;
bool available_thread_exists(int master) const;
bool thread_is_available(int slave, int master) const;
bool thread_should_stop(int threadID) const;
void idle_loop(int threadID, SplitPoint* sp);
template <bool Fake>
- void split(const Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue,
+ void split(Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue,
Depth depth, Move threatMove, bool mateThreat, int moveCount, MovePicker* mp, bool pvNode);
private:
- friend void poll();
-
int ActiveThreads;
volatile bool AllThreadsShouldExit;
Thread threads[MAX_THREADS];
/// Local functions
- Value id_loop(const Position& pos, Move searchMoves[]);
+ Value id_loop(Position& pos, Move searchMoves[]);
Value root_search(Position& pos, SearchStack* ss, Move* pv, RootMoveList& rml, Value* alphaPtr, Value* betaPtr);
template <NodeType PvNode, bool SpNode>
int current_search_time();
std::string value_to_uci(Value v);
- int nps();
- void poll();
+ int nps(const Position& pos);
+ void poll(const Position& pos);
void ponderhit();
void wait_for_stop_or_ponderhit();
void init_ss_array(SearchStack* ss, int size);
void extract_pv_from_tt(const Position& pos, Move bestMove, Move pv[]);
#if !defined(_MSC_VER)
- void *init_thread(void *threadID);
+ void* init_thread(void* threadID);
#else
DWORD WINAPI init_thread(LPVOID threadID);
#endif
void init_threads() { ThreadsMgr.init_threads(); }
void exit_threads() { ThreadsMgr.exit_threads(); }
-int64_t nodes_searched() { return ThreadsMgr.nodes_searched(); }
/// init_search() is called during startup. It initializes various lookup tables
/// search-related global variables, and calls root_search(). It returns false
/// when a quit command is received during the search.
-bool think(const Position& pos, bool infinite, bool ponder, int time[], int increment[],
+bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[],
int movesToGo, int maxDepth, int maxNodes, int maxTime, Move searchMoves[]) {
// Initialize global search variables
StopOnPonderhit = AbortSearch = Quit = AspirationFailLow = false;
NodesSincePoll = 0;
- ThreadsMgr.resetNodeCounters();
SearchStartTime = get_system_time();
ExactMaxTime = maxTime;
MaxDepth = maxDepth;
// Read UCI option values
TT.set_size(get_option_value_int("Hash"));
- if (button_was_pressed("Clear Hash"))
+ if (get_option_value_bool("Clear Hash"))
+ {
+ set_option_value("Clear Hash", "false");
TT.clear();
+ }
CheckExtension[1] = Depth(get_option_value_int("Check Extension (PV nodes)"));
CheckExtension[0] = Depth(get_option_value_int("Check Extension (non-PV nodes)"));
// been consumed, the user stops the search, or the maximum search depth is
// reached.
- Value id_loop(const Position& pos, Move searchMoves[]) {
+ Value id_loop(Position& pos, Move searchMoves[]) {
- Position p(pos, pos.thread());
SearchStack ss[PLY_MAX_PLUS_2];
Move pv[PLY_MAX_PLUS_2];
Move EasyMove = MOVE_NONE;
Value value, alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
// Moves to search are verified, copied, scored and sorted
- RootMoveList rml(p, searchMoves);
+ RootMoveList rml(pos, searchMoves);
// Handle special case of searching on a mate/stale position
if (rml.move_count() == 0)
// Print RootMoveList startup scoring to the standard output,
// so to output information also for iteration 1.
- cout << set960(p.is_chess960()) // Is enough to set once at the beginning
+ cout << set960(pos.is_chess960()) // Is enough to set once at the beginning
<< "info depth " << 1
<< "\ninfo depth " << 1
<< " score " << value_to_uci(rml.move_score(0))
<< " time " << current_search_time()
- << " nodes " << ThreadsMgr.nodes_searched()
- << " nps " << nps()
+ << " nodes " << pos.nodes_searched()
+ << " nps " << nps(pos)
<< " pv " << rml.move(0) << "\n";
// Initialize
}
// Search to the current depth, rml is updated and sorted, alpha and beta could change
- value = root_search(p, ss, pv, rml, &alpha, &beta);
+ value = root_search(pos, ss, pv, rml, &alpha, &beta);
// Write PV to transposition table, in case the relevant entries have
// been overwritten during the search.
- insert_pv_in_tt(p, pv);
+ insert_pv_in_tt(pos, pv);
if (AbortSearch)
break; // Value cannot be trusted. Break out immediately!
stopSearch = true;
// Stop search early if one move seems to be much better than the others
- int64_t nodes = ThreadsMgr.nodes_searched();
if ( Iteration >= 8
&& EasyMove == pv[0]
- && ( ( rml.move_nodes(0) > (nodes * 85) / 100
+ && ( ( rml.move_nodes(0) > (pos.nodes_searched() * 85) / 100
&& current_search_time() > TimeMgr.available_time() / 16)
- ||( rml.move_nodes(0) > (nodes * 98) / 100
+ ||( rml.move_nodes(0) > (pos.nodes_searched() * 98) / 100
&& current_search_time() > TimeMgr.available_time() / 32)))
stopSearch = true;
wait_for_stop_or_ponderhit();
else
// Print final search statistics
- cout << "info nodes " << ThreadsMgr.nodes_searched()
- << " nps " << nps()
+ cout << "info nodes " << pos.nodes_searched()
+ << " nps " << nps(pos)
<< " time " << current_search_time() << endl;
// Print the best move and the ponder move to the standard output
if (dbg_show_hit_rate)
dbg_print_hit_rate(LogFile);
- LogFile << "\nNodes: " << ThreadsMgr.nodes_searched()
- << "\nNodes/second: " << nps()
- << "\nBest move: " << move_to_san(p, pv[0]);
+ LogFile << "\nNodes: " << pos.nodes_searched()
+ << "\nNodes/second: " << nps(pos)
+ << "\nBest move: " << move_to_san(pos, pv[0]);
StateInfo st;
- p.do_move(pv[0], st);
+ pos.do_move(pv[0], st);
LogFile << "\nPonder move: "
- << move_to_san(p, pv[1]) // Works also with MOVE_NONE
+ << move_to_san(pos, pv[1]) // Works also with MOVE_NONE
<< endl;
}
return rml.move_score(0);
FirstRootMove = (i == 0);
// Save the current node count before the move is searched
- nodes = ThreadsMgr.nodes_searched();
+ nodes = pos.nodes_searched();
// Pick the next root move, and print the move and the move number to
// the standard output.
break;
// Remember searched nodes counts for this move
- rml.add_move_nodes(i, ThreadsMgr.nodes_searched() - nodes);
+ rml.add_move_nodes(i, pos.nodes_searched() - nodes);
assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE);
assert(value < beta);
<< " score " << value_to_uci(rml.move_score(j))
<< " depth " << (j <= i ? Iteration : Iteration - 1)
<< " time " << current_search_time()
- << " nodes " << ThreadsMgr.nodes_searched()
- << " nps " << nps()
+ << " nodes " << pos.nodes_searched()
+ << " nps " << nps(pos)
<< " pv ";
for (int k = 0; rml.move_pv(j, k) != MOVE_NONE && k < PLY_MAX; k++)
Key posKey;
Move ttMove, move, excludedMove, threatMove;
Depth ext, newDepth;
+ ValueType vt;
Value bestValue, value, oldAlpha;
Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific
bool isCheck, singleEvasion, singularExtensionNode, moveIsCheck, captureOrPromotion, dangerous;
threatMove = sp->threatMove;
mateThreat = sp->mateThreat;
goto split_point_start;
- }
+ } else {} // Hack to fix icc's "statement is unreachable" warning
// Step 1. Initialize node and poll. Polling can abort search
- ThreadsMgr.incrementNodeCounter(threadID);
ss->currentMove = ss->bestMove = threatMove = MOVE_NONE;
(ss+2)->killers[0] = (ss+2)->killers[1] = (ss+2)->mateKiller = MOVE_NONE;
if (threadID == 0 && ++NodesSincePoll > NodesBetweenPolls)
{
NodesSincePoll = 0;
- poll();
+ poll(pos);
}
// Step 2. Check for aborted search and immediate draw
threatMove, mateThreat, moveCount, &mp, PvNode);
}
- if (SpNode)
- {
- // Here we have the lock still grabbed
- sp->slaves[threadID] = 0;
- lock_release(&(sp->lock));
- return bestValue;
- }
-
// Step 19. Check for mate and stalemate
// All legal moves have been searched and if there are
// no legal moves, it must be mate or stalemate.
// If one move was excluded return fail low score.
- if (!moveCount)
+ if (!SpNode && !moveCount)
return excludedMove ? oldAlpha : isCheck ? value_mated_in(ply) : VALUE_DRAW;
// Step 20. Update tables
// If the search is not aborted, update the transposition table,
// history counters, and killer moves.
- if (AbortSearch || ThreadsMgr.thread_should_stop(threadID))
- return bestValue;
+ if (!SpNode && !AbortSearch && !ThreadsMgr.thread_should_stop(threadID))
+ {
+ move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
+ vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER
+ : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT;
- ValueType vt = (bestValue <= oldAlpha ? VALUE_TYPE_UPPER : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT);
- move = (bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove);
- TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, ss->evalMargin);
+ TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, ss->evalMargin);
- // Update killers and history only for non capture moves that fails high
- if ( bestValue >= beta
- && !pos.move_is_capture_or_promotion(move))
- {
+ // Update killers and history only for non capture moves that fails high
+ if ( bestValue >= beta
+ && !pos.move_is_capture_or_promotion(move))
+ {
update_history(pos, move, depth, movesSearched, moveCount);
update_killers(move, ss);
+ }
+ }
+
+ if (SpNode)
+ {
+ // Here we have the lock still grabbed
+ sp->slaves[threadID] = 0;
+ sp->nodes += pos.nodes_searched();
+ lock_release(&(sp->lock));
}
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
const TTEntry* tte;
Value oldAlpha = alpha;
- ThreadsMgr.incrementNodeCounter(pos.thread());
ss->bestMove = ss->currentMove = MOVE_NONE;
// Check for an instant draw or maximum ply reached
// nps() computes the current nodes/second count.
- int nps() {
+ int nps(const Position& pos) {
int t = current_search_time();
- return (t > 0 ? int((ThreadsMgr.nodes_searched() * 1000) / t) : 0);
+ return (t > 0 ? int((pos.nodes_searched() * 1000) / t) : 0);
}
// looks at the time consumed so far and decides if it's time to abort the
// search.
- void poll() {
+ void poll(const Position& pos) {
static int lastInfoTime;
int t = current_search_time();
if (dbg_show_hit_rate)
dbg_print_hit_rate();
- cout << "info nodes " << ThreadsMgr.nodes_searched() << " nps " << nps()
+ cout << "info nodes " << pos.nodes_searched() << " nps " << nps(pos)
<< " time " << t << endl;
}
if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
|| (ExactMaxTime && t >= ExactMaxTime)
- || (Iteration >= 3 && MaxNodes && ThreadsMgr.nodes_searched() >= MaxNodes))
+ || (Iteration >= 3 && MaxNodes && pos.nodes_searched() >= MaxNodes))
AbortSearch = true;
}
<< " score " << value_to_uci(value)
<< (value >= beta ? " lowerbound" : value <= alpha ? " upperbound" : "")
<< " time " << current_search_time()
- << " nodes " << ThreadsMgr.nodes_searched()
- << " nps " << nps()
+ << " nodes " << pos.nodes_searched()
+ << " nps " << nps(pos)
<< " pv ";
for (Move* m = pv; *m != MOVE_NONE; m++)
ValueType t = value >= beta ? VALUE_TYPE_LOWER :
value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT;
- LogFile << pretty_pv(pos, current_search_time(), Iteration,
- ThreadsMgr.nodes_searched(), value, t, pv) << endl;
+ LogFile << pretty_pv(pos, current_search_time(), Iteration, value, t, pv) << endl;
}
}
#if !defined(_MSC_VER)
- void* init_thread(void *threadID) {
+ void* init_thread(void* threadID) {
ThreadsMgr.idle_loop(*(int*)threadID, NULL);
return NULL;
/// The ThreadsManager class
- // resetNodeCounters(), resetBetaCounters(), searched_nodes() and
- // get_beta_counters() are getters/setters for the per thread
- // counters used to sort the moves at root.
-
- void ThreadsManager::resetNodeCounters() {
-
- for (int i = 0; i < MAX_THREADS; i++)
- threads[i].nodes = 0ULL;
- }
-
- int64_t ThreadsManager::nodes_searched() const {
-
- int64_t result = 0ULL;
- for (int i = 0; i < ActiveThreads; i++)
- result += threads[i].nodes;
-
- return result;
- }
-
// idle_loop() is where the threads are parked when they have no work to do.
// The parameter 'sp', if non-NULL, is a pointer to an active SplitPoint
void ThreadsManager::init_threads() {
- volatile int i;
+ int i, arg[MAX_THREADS];
bool ok;
// Initialize global locks
// Launch the helper threads
for (i = 1; i < MAX_THREADS; i++)
{
+ arg[i] = i;
#if !defined(_MSC_VER)
pthread_t pthread[1];
- ok = (pthread_create(pthread, NULL, init_thread, (void*)(&i)) == 0);
+ ok = (pthread_create(pthread, NULL, init_thread, (void*)(&arg[i])) == 0);
pthread_detach(pthread[0]);
#else
- ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&i), 0, NULL) != NULL);
+ ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&arg[i]), 0, NULL) != NULL);
#endif
-
if (!ok)
{
cout << "Failed to create thread number " << i << endl;
// call search().When all threads have returned from search() then split() returns.
template <bool Fake>
- void ThreadsManager::split(const Position& p, SearchStack* ss, int ply, Value* alpha,
+ void ThreadsManager::split(Position& pos, SearchStack* ss, int ply, Value* alpha,
const Value beta, Value* bestValue, Depth depth, Move threatMove,
bool mateThreat, int moveCount, MovePicker* mp, bool pvNode) {
- assert(p.is_ok());
+ assert(pos.is_ok());
assert(ply > 0 && ply < PLY_MAX);
assert(*bestValue >= -VALUE_INFINITE);
assert(*bestValue <= *alpha);
assert(*alpha < beta);
assert(beta <= VALUE_INFINITE);
assert(depth > DEPTH_ZERO);
- assert(p.thread() >= 0 && p.thread() < ActiveThreads);
+ assert(pos.thread() >= 0 && pos.thread() < ActiveThreads);
assert(ActiveThreads > 1);
- int i, master = p.thread();
+ int i, master = pos.thread();
Thread& masterThread = threads[master];
lock_grab(&MPLock);
splitPoint.bestValue = *bestValue;
splitPoint.mp = mp;
splitPoint.moveCount = moveCount;
- splitPoint.pos = &p;
+ splitPoint.pos = &pos;
+ splitPoint.nodes = 0;
splitPoint.parentSstack = ss;
for (i = 0; i < ActiveThreads; i++)
splitPoint.slaves[i] = 0;
*bestValue = splitPoint.bestValue;
masterThread.activeSplitPoints--;
masterThread.splitPoint = splitPoint.parent;
+ pos.set_nodes_searched(pos.nodes_searched() + splitPoint.nodes);
lock_release(&MPLock);
}
projects / stockfish / blobdiff