X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=f7718ce442d50136b9508405bc6f3bdb76e34654;hp=723d1ba942bb64860ce005ab8e3a1f8033f1f99d;hb=55297064268e47103f95a1eb8fd8fe80b6aa2887;hpb=f7722d4de701ad8f58f254cf165cc23c7cf43156 diff --git a/src/search.cpp b/src/search.cpp index 723d1ba9..f7718ce4 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -59,6 +59,10 @@ namespace { // Used for debugging SMP code. const bool FakeSplit = false; + // Fast lookup table of sliding pieces indexed by Piece + const bool Slidings[18] = { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1 }; + inline bool piece_is_slider(Piece p) { return Slidings[p]; } + // ThreadsManager class is used to handle all the threads related stuff in search, // init, starting, parking and, the most important, launching a slave thread at a // split point are what this class does. All the access to shared thread data is @@ -75,36 +79,23 @@ namespace { 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 wake_sleeping_threads(); - void put_threads_to_sleep(); + void wake_sleeping_thread(int threadID); void idle_loop(int threadID, SplitPoint* sp); template - 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, AllThreadsShouldSleep; + volatile bool AllThreadsShouldExit; Thread threads[MAX_THREADS]; - Lock MPLock, WaitLock; - -#if !defined(_MSC_VER) - pthread_cond_t WaitCond; -#else - HANDLE SitIdleEvent[MAX_THREADS]; -#endif - + WaitCondition WaitCond[MAX_THREADS]; }; @@ -241,7 +232,10 @@ namespace { const Value EasyMoveMargin = Value(0x200); - /// Global variables + /// Namespace variables + + // Book object + Book OpeningBook; // Iteration counter int Iteration; @@ -281,25 +275,21 @@ namespace { /// 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 + template Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); - template - inline Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { - return search(pos, ss, alpha, beta, depth, ply); - } - - template - void sp_search(Position& pos, SearchStack* ss, Value dumy, Value beta, Depth depth, int ply); - template Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); template - void do_sp_search(SplitPoint* sp, int threadID); + inline Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { + + return depth < ONE_PLY ? qsearch(pos, ss, alpha, beta, DEPTH_ZERO, ply) + : search(pos, ss, alpha, beta, depth, ply); + } template Depth extension(const Position& pos, Move m, bool captureOrPromotion, bool moveIsCheck, bool singleEvasion, bool mateThreat, bool* dangerous); @@ -308,7 +298,6 @@ namespace { bool value_is_mate(Value value); Value value_to_tt(Value v, int ply); Value value_from_tt(Value v, int ply); - bool move_is_killer(Move m, SearchStack* ss); bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply); bool connected_threat(const Position& pos, Move m, Move threat); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); @@ -318,8 +307,8 @@ namespace { 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); @@ -328,7 +317,7 @@ namespace { 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 @@ -345,7 +334,6 @@ namespace { 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 @@ -411,13 +399,12 @@ int perft(Position& pos, Depth depth) /// 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; @@ -427,12 +414,12 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr UseTimeManagement = !ExactMaxTime && !MaxDepth && !MaxNodes && !InfiniteSearch; // Look for a book move, only during games, not tests - if (UseTimeManagement && get_option_value_bool("OwnBook")) + if (UseTimeManagement && Options["OwnBook"].value()) { - if (get_option_value_string("Book File") != OpeningBook.file_name()) - OpeningBook.open(get_option_value_string("Book File")); + if (Options["Book File"].value() != OpeningBook.file_name()) + OpeningBook.open(Options["Book File"].value()); - Move bookMove = OpeningBook.get_move(pos, get_option_value_bool("Best Book Move")); + Move bookMove = OpeningBook.get_move(pos, Options["Best Book Move"].value()); if (bookMove != MOVE_NONE) { if (PonderSearch) @@ -444,43 +431,47 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr } // Read UCI option values - TT.set_size(get_option_value_int("Hash")); - if (button_was_pressed("Clear Hash")) + TT.set_size(Options["Hash"].value()); + if (Options["Clear Hash"].value()) + { + Options["Clear Hash"].set_value("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)")); - SingleEvasionExtension[1] = Depth(get_option_value_int("Single Evasion Extension (PV nodes)")); - SingleEvasionExtension[0] = Depth(get_option_value_int("Single Evasion Extension (non-PV nodes)")); - PawnPushTo7thExtension[1] = Depth(get_option_value_int("Pawn Push to 7th Extension (PV nodes)")); - PawnPushTo7thExtension[0] = Depth(get_option_value_int("Pawn Push to 7th Extension (non-PV nodes)")); - PassedPawnExtension[1] = Depth(get_option_value_int("Passed Pawn Extension (PV nodes)")); - PassedPawnExtension[0] = Depth(get_option_value_int("Passed Pawn Extension (non-PV nodes)")); - PawnEndgameExtension[1] = Depth(get_option_value_int("Pawn Endgame Extension (PV nodes)")); - PawnEndgameExtension[0] = Depth(get_option_value_int("Pawn Endgame Extension (non-PV nodes)")); - MateThreatExtension[1] = Depth(get_option_value_int("Mate Threat Extension (PV nodes)")); - MateThreatExtension[0] = Depth(get_option_value_int("Mate Threat Extension (non-PV nodes)")); - - MinimumSplitDepth = get_option_value_int("Minimum Split Depth") * ONE_PLY; - MaxThreadsPerSplitPoint = get_option_value_int("Maximum Number of Threads per Split Point"); - MultiPV = get_option_value_int("MultiPV"); - UseLogFile = get_option_value_bool("Use Search Log"); + CheckExtension[1] = Options["Check Extension (PV nodes)"].value(); + CheckExtension[0] = Options["Check Extension (non-PV nodes)"].value(); + SingleEvasionExtension[1] = Options["Single Evasion Extension (PV nodes)"].value(); + SingleEvasionExtension[0] = Options["Single Evasion Extension (non-PV nodes)"].value(); + PawnPushTo7thExtension[1] = Options["Pawn Push to 7th Extension (PV nodes)"].value(); + PawnPushTo7thExtension[0] = Options["Pawn Push to 7th Extension (non-PV nodes)"].value(); + PassedPawnExtension[1] = Options["Passed Pawn Extension (PV nodes)"].value(); + PassedPawnExtension[0] = Options["Passed Pawn Extension (non-PV nodes)"].value(); + PawnEndgameExtension[1] = Options["Pawn Endgame Extension (PV nodes)"].value(); + PawnEndgameExtension[0] = Options["Pawn Endgame Extension (non-PV nodes)"].value(); + MateThreatExtension[1] = Options["Mate Threat Extension (PV nodes)"].value(); + MateThreatExtension[0] = Options["Mate Threat Extension (non-PV nodes)"].value(); + + MinimumSplitDepth = Options["Minimum Split Depth"].value() * ONE_PLY; + MaxThreadsPerSplitPoint = Options["Maximum Number of Threads per Split Point"].value(); + MultiPV = Options["MultiPV"].value(); + UseLogFile = Options["Use Search Log"].value(); if (UseLogFile) - LogFile.open(get_option_value_string("Search Log Filename").c_str(), std::ios::out | std::ios::app); + LogFile.open(Options["Search Log Filename"].value().c_str(), std::ios::out | std::ios::app); read_weights(pos.side_to_move()); // Set the number of active threads - int newActiveThreads = get_option_value_int("Threads"); + int newActiveThreads = Options["Threads"].value(); if (newActiveThreads != ThreadsMgr.active_threads()) { ThreadsMgr.set_active_threads(newActiveThreads); init_eval(ThreadsMgr.active_threads()); } - // Wake up sleeping threads - ThreadsMgr.wake_sleeping_threads(); + // Wake up needed threads + for (int i = 1; i < newActiveThreads; i++) + ThreadsMgr.wake_sleeping_thread(i); // Set thinking time int myTime = time[pos.side_to_move()]; @@ -514,7 +505,8 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr if (UseLogFile) LogFile.close(); - ThreadsMgr.put_threads_to_sleep(); + // This makes all the threads to go to sleep + ThreadsMgr.set_active_threads(1); return !Quit; } @@ -527,16 +519,15 @@ namespace { // 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) @@ -549,13 +540,13 @@ namespace { // 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 @@ -594,11 +585,11 @@ namespace { } // 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! @@ -627,12 +618,11 @@ namespace { 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; @@ -666,12 +656,12 @@ namespace { 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 (pv[0] == MOVE_NONE) + if (pv[0] == MOVE_NONE || MultiPV > 1) { pv[0] = rml.move(0); pv[1] = MOVE_NONE; @@ -694,14 +684,14 @@ namespace { 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); @@ -720,7 +710,7 @@ namespace { int64_t nodes; Move move; Depth depth, ext, newDepth; - Value value, evalMargin, alpha, beta; + Value value, alpha, beta; bool isCheck, moveIsCheck, captureOrPromotion, dangerous; int researchCountFH, researchCountFL; @@ -739,7 +729,8 @@ namespace { // Step 5. Evaluate the position statically // At root we do this only to get reference value for child nodes - ss->eval = isCheck ? VALUE_NONE : evaluate(pos, evalMargin); + ss->evalMargin = VALUE_NONE; + ss->eval = isCheck ? VALUE_NONE : evaluate(pos, ss->evalMargin); // Step 6. Razoring (omitted at root) // Step 7. Static null move pruning (omitted at root) @@ -762,7 +753,7 @@ namespace { 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. @@ -883,7 +874,7 @@ namespace { 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); @@ -925,8 +916,8 @@ namespace { << " 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++) @@ -963,9 +954,14 @@ namespace { } - // search<>() is the main search function for both PV and non-PV nodes + // search<>() is the main search function for both PV and non-PV nodes and for + // normal and SplitPoint nodes. When called just after a split point the search + // is simpler because we have already probed the hash table, done a null move + // search, and searched the first move before splitting, we don't have to repeat + // all this work again. We also don't need to store anything to the hash table + // here: This is taken care of after we return from the split point. - template + template Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE); @@ -980,41 +976,41 @@ namespace { Key posKey; Move ttMove, move, excludedMove, threatMove; Depth ext, newDepth; - Value bestValue, value, evalMargin, oldAlpha; + ValueType vt; + Value bestValue, value, oldAlpha; Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific bool isCheck, singleEvasion, singularExtensionNode, moveIsCheck, captureOrPromotion, dangerous; bool mateThreat = false; int moveCount = 0; int threadID = pos.thread(); + SplitPoint* sp = NULL; refinedValue = bestValue = value = -VALUE_INFINITE; oldAlpha = alpha; isCheck = pos.is_check(); - if (SplitPoint) + if (SpNode) { + sp = ss->sp; tte = NULL; ttMove = excludedMove = MOVE_NONE; - threatMove = ss->sp->threatMove; - mateThreat = ss->sp->mateThreat; - goto split_start; - } + 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 - if (AbortSearch || ThreadsMgr.thread_should_stop(threadID)) - return VALUE_DRAW; - - if (pos.is_draw() || ply >= PLY_MAX - 1) + if ( AbortSearch || ThreadsMgr.thread_should_stop(threadID) + || pos.is_draw() || ply >= PLY_MAX - 1) return VALUE_DRAW; // Step 3. Mate distance pruning @@ -1031,7 +1027,7 @@ namespace { posKey = excludedMove ? pos.get_exclusion_key() : pos.get_key(); tte = TT.retrieve(posKey); - ttMove = (tte ? tte->move() : MOVE_NONE); + ttMove = tte ? tte->move() : MOVE_NONE; // At PV nodes, we don't use the TT for pruning, but only for move ordering. // This is to avoid problems in the following areas: @@ -1040,12 +1036,9 @@ namespace { // * Fifty move rule detection // * Searching for a mate // * Printing of full PV line - if (!PvNode && tte && ok_to_use_TT(tte, depth, beta, ply)) { - // Refresh tte entry to avoid aging - TT.store(posKey, tte->value(), tte->type(), tte->depth(), ttMove, tte->static_value(), tte->static_value_margin()); - + TT.refresh(tte); ss->bestMove = ttMove; // Can be MOVE_NONE return value_from_tt(tte->value(), ply); } @@ -1053,19 +1046,19 @@ namespace { // Step 5. Evaluate the position statically and // update gain statistics of parent move. if (isCheck) - ss->eval = evalMargin = VALUE_NONE; + ss->eval = ss->evalMargin = VALUE_NONE; else if (tte) { assert(tte->static_value() != VALUE_NONE); ss->eval = tte->static_value(); - evalMargin = tte->static_value_margin(); + ss->evalMargin = tte->static_value_margin(); refinedValue = refine_eval(tte, ss->eval, ply); } else { - refinedValue = ss->eval = evaluate(pos, evalMargin); - TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, evalMargin); + refinedValue = ss->eval = evaluate(pos, ss->evalMargin); + TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, ss->evalMargin); } // Save gain for the parent non-capture move @@ -1121,9 +1114,7 @@ namespace { pos.do_null_move(st); (ss+1)->skipNullMove = true; - - nullValue = depth-R*ONE_PLY < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -beta, -alpha, depth-R*ONE_PLY, ply+1); + nullValue = -search(pos, ss+1, -beta, -alpha, depth-R*ONE_PLY, ply+1); (ss+1)->skipNullMove = false; pos.undo_null_move(); @@ -1182,45 +1173,46 @@ namespace { if (PvNode) mateThreat = pos.has_mate_threat(); -split_start: +split_point_start: // At split points actual search starts from here // Initialize a MovePicker object for the current position - MovePicker mpBase = MovePicker(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); - MovePicker& mp = SplitPoint ? *ss->sp->mp : mpBase; + // FIXME currently MovePicker() c'tor is needless called also in SplitPoint + MovePicker mpBase(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); + MovePicker& mp = SpNode ? *sp->mp : mpBase; CheckInfo ci(pos); ss->bestMove = MOVE_NONE; - singleEvasion = SplitPoint ? false : isCheck && mp.number_of_evasions() == 1; - futilityBase = SplitPoint ? ss->eval : ss->eval + evalMargin; - singularExtensionNode = !SplitPoint + singleEvasion = !SpNode && isCheck && mp.number_of_evasions() == 1; + futilityBase = ss->eval + ss->evalMargin; + singularExtensionNode = !SpNode && depth >= SingularExtensionDepth[PvNode] && tte && tte->move() && !excludedMove // Do not allow recursive singular extension search && (tte->type() & VALUE_TYPE_LOWER) && tte->depth() >= depth - 3 * ONE_PLY; - - // Step 10. Loop through moves - // Loop through all legal moves until no moves remain or a beta cutoff occurs - if (SplitPoint) + if (SpNode) { - lock_grab(&(ss->sp->lock)); - bestValue = ss->sp->bestValue; + lock_grab(&(sp->lock)); + bestValue = sp->bestValue; } + // Step 10. Loop through moves + // Loop through all legal moves until no moves remain or a beta cutoff occurs while ( bestValue < beta && (move = mp.get_next_move()) != MOVE_NONE && !ThreadsMgr.thread_should_stop(threadID)) { - if (SplitPoint) - { - moveCount = ++ss->sp->moveCount; - lock_release(&(ss->sp->lock)); - } - assert(move_is_ok(move)); - if (move == excludedMove) + if (SpNode) + { + moveCount = ++sp->moveCount; + lock_release(&(sp->lock)); + } + else if (move == excludedMove) continue; + else + movesSearched[moveCount++] = move; moveIsCheck = pos.move_is_check(move, ci); captureOrPromotion = pos.move_is_capture_or_promotion(move); @@ -1252,10 +1244,9 @@ split_start: } } - newDepth = depth - ONE_PLY + ext; - // Update current move (this must be done after singular extension search) - movesSearched[moveCount++] = ss->currentMove = move; + ss->currentMove = move; + newDepth = depth - ONE_PLY + ext; // Step 12. Futility pruning (is omitted in PV nodes) if ( !PvNode @@ -1270,8 +1261,9 @@ split_start: && !(threatMove && connected_threat(pos, move, threatMove)) && bestValue > value_mated_in(PLY_MAX)) // FIXME bestValue is racy { - if (SplitPoint) - lock_grab(&(ss->sp->lock)); + if (SpNode) + lock_grab(&(sp->lock)); + continue; } @@ -1284,14 +1276,26 @@ split_start: if (futilityValueScaled < beta) { - if (SplitPoint) + if (SpNode) { - lock_grab(&(ss->sp->lock)); - if (futilityValueScaled > ss->sp->bestValue) - ss->sp->bestValue = futilityValueScaled; + lock_grab(&(sp->lock)); + if (futilityValueScaled > sp->bestValue) + sp->bestValue = bestValue = futilityValueScaled; } else if (futilityValueScaled > bestValue) bestValue = futilityValueScaled; + + continue; + } + + // Prune neg. see moves at low depths + if ( predictedDepth < 2 * ONE_PLY + && bestValue > value_mated_in(PLY_MAX) + && pos.see_sign(move) < 0) + { + if (SpNode) + lock_grab(&(sp->lock)); + continue; } } @@ -1301,9 +1305,8 @@ split_start: // Step extra. pv search (only in PV nodes) // The first move in list is the expected PV - if (!SplitPoint && PvNode && moveCount == 1) - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); + if (!SpNode && PvNode && moveCount == 1) + value = -search(pos, ss+1, -beta, -alpha, newDepth, ply+1); else { // Step 14. Reduced depth search @@ -1314,15 +1317,14 @@ split_start: && !captureOrPromotion && !dangerous && !move_is_castle(move) - && !move_is_killer(move, ss)) + && !(ss->killers[0] == move || ss->killers[1] == move)) { ss->reduction = reduction(depth, moveCount); if (ss->reduction) { - alpha = SplitPoint ? ss->sp->alpha : alpha; + alpha = SpNode ? sp->alpha : alpha; Depth d = newDepth - ss->reduction; - value = d < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -(alpha+1), -alpha, d, ply+1); + value = -search(pos, ss+1, -(alpha+1), -alpha, d, ply+1); doFullDepthSearch = (value > alpha); } @@ -1335,7 +1337,7 @@ split_start: assert(newDepth - ONE_PLY >= ONE_PLY); ss->reduction = ONE_PLY; - alpha = SplitPoint ? ss->sp->alpha : alpha; + alpha = SpNode ? sp->alpha : alpha; value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1); doFullDepthSearch = (value > alpha); } @@ -1345,16 +1347,14 @@ split_start: // Step 15. Full depth search if (doFullDepthSearch) { - alpha = SplitPoint ? ss->sp->alpha : alpha; - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1); + alpha = SpNode ? sp->alpha : alpha; + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1); // Step extra. pv search (only in PV nodes) // Search only for possible new PV nodes, if instead value >= beta then // parent node fails low with value <= alpha and tries another move. if (PvNode && value > alpha && value < beta) - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); + value = -search(pos, ss+1, -beta, -alpha, newDepth, ply+1); } } @@ -1364,39 +1364,44 @@ split_start: assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); // Step 17. Check for new best move - if (SplitPoint) + if (SpNode) { - lock_grab(&(ss->sp->lock)); - bestValue = ss->sp->bestValue; - alpha = ss->sp->alpha; + lock_grab(&(sp->lock)); + bestValue = sp->bestValue; + alpha = sp->alpha; } - if (value > bestValue && !(SplitPoint && ThreadsMgr.thread_should_stop(threadID))) + if (value > bestValue && !(SpNode && ThreadsMgr.thread_should_stop(threadID))) { bestValue = value; + + if (SpNode) + sp->bestValue = value; + if (value > alpha) { - if (SplitPoint && (!PvNode || value >= beta)) - ss->sp->stopRequest = true; + if (SpNode && (!PvNode || value >= beta)) + sp->stopRequest = true; if (PvNode && value < beta) // We want always alpha < beta + { alpha = value; + if (SpNode) + sp->alpha = value; + } if (value == value_mate_in(ply + 1)) ss->mateKiller = move; ss->bestMove = move; - } - if (SplitPoint) - { - ss->sp->bestValue = bestValue; - ss->sp->alpha = alpha; - ss->sp->parentSstack->bestMove = ss->bestMove; + + if (SpNode) + sp->parentSstack->bestMove = move; } } // Step 18. Check for split - if ( !SplitPoint + if ( !SpNode && depth >= MinimumSplitDepth && ThreadsMgr.active_threads() > 1 && bestValue < beta @@ -1408,37 +1413,39 @@ split_start: threatMove, mateThreat, moveCount, &mp, PvNode); } - if (SplitPoint) - { - /* Here we have the lock still grabbed */ - ss->sp->slaves[threadID] = 0; - lock_release(&(ss->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, 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); @@ -1468,7 +1475,6 @@ split_start: 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 @@ -1617,185 +1623,6 @@ split_start: } - // sp_search() is used to search from a split point. This function is called - // by each thread working at the split point. It is similar to the normal - // search() function, but simpler. Because we have already probed the hash - // table, done a null move search, and searched the first move before - // splitting, we don't have to repeat all this work in sp_search(). We - // also don't need to store anything to the hash table here: This is taken - // care of after we return from the split point. - - template - void do_sp_search(SplitPoint* sp, int threadID) { - - assert(threadID >= 0 && threadID < ThreadsMgr.active_threads()); - assert(ThreadsMgr.active_threads() > 1); - - Position pos(*sp->pos, threadID); - SearchStack* ss = sp->sstack[threadID] + 1; - ss->sp = sp; - - search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->ply); - } - - template - void sp_search(Position& pos, SearchStack* ss, Value, Value beta, Depth depth, int ply) { - - StateInfo st; - Move move; - Depth ext, newDepth; - Value value; - Value futilityValueScaled; // NonPV specific - bool isCheck, moveIsCheck, captureOrPromotion, dangerous; - int moveCount; - value = -VALUE_INFINITE; - SplitPoint* sp = ss->sp; - Move threatMove = sp->threatMove; - MovePicker& mp = *sp->mp; - int threadID = pos.thread(); - - CheckInfo ci(pos); - isCheck = pos.is_check(); - - // Step 10. Loop through moves - // Loop through all legal moves until no moves remain or a beta cutoff occurs - lock_grab(&(sp->lock)); - - while ( sp->bestValue < beta - && (move = mp.get_next_move()) != MOVE_NONE - && !ThreadsMgr.thread_should_stop(threadID)) - { - moveCount = ++sp->moveCount; - lock_release(&(sp->lock)); - - assert(move_is_ok(move)); - - moveIsCheck = pos.move_is_check(move, ci); - captureOrPromotion = pos.move_is_capture_or_promotion(move); - - // Step 11. Decide the new search depth - ext = extension(pos, move, captureOrPromotion, moveIsCheck, false, sp->mateThreat, &dangerous); - newDepth = depth - ONE_PLY + ext; - - // Update current move - ss->currentMove = move; - - // Step 12. Futility pruning (is omitted in PV nodes) - if ( !PvNode - && !captureOrPromotion - && !isCheck - && !dangerous - && !move_is_castle(move)) - { - // Move count based pruning - if ( moveCount >= futility_move_count(depth) - && !(threatMove && connected_threat(pos, move, threatMove)) - && sp->bestValue > value_mated_in(PLY_MAX)) - { - lock_grab(&(sp->lock)); - continue; - } - - // Value based pruning - Depth predictedDepth = newDepth - reduction(depth, moveCount); - futilityValueScaled = ss->eval + futility_margin(predictedDepth, moveCount) - + H.gain(pos.piece_on(move_from(move)), move_to(move)); - - if (futilityValueScaled < beta) - { - lock_grab(&(sp->lock)); - - if (futilityValueScaled > sp->bestValue) - sp->bestValue = futilityValueScaled; - continue; - } - } - - // Step 13. Make the move - pos.do_move(move, st, ci, moveIsCheck); - - // Step 14. Reduced search - // If the move fails high will be re-searched at full depth. - bool doFullDepthSearch = true; - - if ( !captureOrPromotion - && !dangerous - && !move_is_castle(move) - && !move_is_killer(move, ss)) - { - ss->reduction = reduction(depth, moveCount); - if (ss->reduction) - { - Value localAlpha = sp->alpha; - Depth d = newDepth - ss->reduction; - value = d < ONE_PLY ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, d, ply+1); - - doFullDepthSearch = (value > localAlpha); - } - - // The move failed high, but if reduction is very big we could - // face a false positive, retry with a less aggressive reduction, - // if the move fails high again then go with full depth search. - if (doFullDepthSearch && ss->reduction > 2 * ONE_PLY) - { - assert(newDepth - ONE_PLY >= ONE_PLY); - - ss->reduction = ONE_PLY; - Value localAlpha = sp->alpha; - value = -search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth-ss->reduction, ply+1); - doFullDepthSearch = (value > localAlpha); - } - ss->reduction = DEPTH_ZERO; // Restore original reduction - } - - // Step 15. Full depth search - if (doFullDepthSearch) - { - Value localAlpha = sp->alpha; - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth, ply+1); - - // Step extra. pv search (only in PV nodes) - // Search only for possible new PV nodes, if instead value >= beta then - // parent node fails low with value <= alpha and tries another move. - if (PvNode && value > localAlpha && value < beta) - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -sp->alpha, DEPTH_ZERO, ply+1) - : - search(pos, ss+1, -beta, -sp->alpha, newDepth, ply+1); - } - - // Step 16. Undo move - pos.undo_move(move); - - assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); - - // Step 17. Check for new best move - lock_grab(&(sp->lock)); - - if (value > sp->bestValue && !ThreadsMgr.thread_should_stop(threadID)) - { - sp->bestValue = value; - if (value > sp->alpha) - { - if (!PvNode || value >= beta) - sp->stopRequest = true; - - if (PvNode && value < beta) // We want always sp->alpha < beta - sp->alpha = value; - - sp->parentSstack->bestMove = ss->bestMove = move; - } - } - } - - /* Here we have the lock still grabbed */ - - sp->slaves[threadID] = 0; - - lock_release(&(sp->lock)); - } - - // connected_moves() tests whether two moves are 'connected' in the sense // that the first move somehow made the second move possible (for instance // if the moving piece is the same in both moves). The first move is assumed @@ -1895,17 +1722,6 @@ split_start: } - // move_is_killer() checks if the given move is among the killer moves - - bool move_is_killer(Move m, SearchStack* ss) { - - if (ss->killers[0] == m || ss->killers[1] == m) - return true; - - return false; - } - - // extension() decides whether a move should be searched with normal depth, // or with extended depth. Certain classes of moves (checking moves, in // particular) are searched with bigger depth than ordinary moves and in @@ -2051,7 +1867,6 @@ split_start: void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount) { - Move m; H.success(pos.piece_on(move_from(move)), move_to(move), depth); @@ -2120,10 +1935,10 @@ split_start: // 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); } @@ -2131,13 +1946,13 @@ split_start: // 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(); // Poll for input - if (Bioskey()) + if (data_available()) { // We are line oriented, don't read single chars std::string command; @@ -2180,7 +1995,7 @@ split_start: 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; } @@ -2197,7 +2012,7 @@ split_start: if ( (Iteration >= 3 && UseTimeManagement && noMoreTime) || (ExactMaxTime && t >= ExactMaxTime) - || (Iteration >= 3 && MaxNodes && ThreadsMgr.nodes_searched() >= MaxNodes)) + || (Iteration >= 3 && MaxNodes && pos.nodes_searched() >= MaxNodes)) AbortSearch = true; } @@ -2277,8 +2092,8 @@ split_start: << " 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++) @@ -2291,8 +2106,7 @@ split_start: 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; } } @@ -2358,7 +2172,7 @@ split_start: #if !defined(_MSC_VER) - void* init_thread(void *threadID) { + void* init_thread(void* threadID) { ThreadsMgr.idle_loop(*(int*)threadID, NULL); return NULL; @@ -2377,25 +2191,6 @@ split_start: /// 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 @@ -2418,38 +2213,42 @@ split_start: // If we are not thinking, wait for a condition to be signaled // instead of wasting CPU time polling for work. - while (AllThreadsShouldSleep || threadID >= ActiveThreads) + while (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING) { assert(!sp); assert(threadID != 0); - threads[threadID].state = THREAD_SLEEPING; -#if !defined(_MSC_VER) + if (AllThreadsShouldExit) + break; + + threads[threadID].state = THREAD_AVAILABLE; + lock_grab(&WaitLock); - if (AllThreadsShouldSleep || threadID >= ActiveThreads) - pthread_cond_wait(&WaitCond, &WaitLock); + + if (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING) + cond_wait(&WaitCond[threadID], &WaitLock); + lock_release(&WaitLock); -#else - WaitForSingleObject(SitIdleEvent[threadID], INFINITE); -#endif } - // If thread has just woken up, mark it as available - if (threads[threadID].state == THREAD_SLEEPING) - threads[threadID].state = THREAD_AVAILABLE; - // If this thread has been assigned work, launch a search if (threads[threadID].state == THREAD_WORKISWAITING) { - assert(!AllThreadsShouldExit && !AllThreadsShouldSleep); + assert(!AllThreadsShouldExit); threads[threadID].state = THREAD_SEARCHING; - if (threads[threadID].splitPoint->pvNode) - do_sp_search(threads[threadID].splitPoint, threadID); - else - do_sp_search(threads[threadID].splitPoint, threadID); + // Here we call search() with SplitPoint template parameter set to true + SplitPoint* tsp = threads[threadID].splitPoint; + Position pos(*tsp->pos, threadID); + SearchStack* ss = tsp->sstack[threadID] + 1; + ss->sp = tsp; + if (tsp->pvNode) + search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + else { + search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + } assert(threads[threadID].state == THREAD_SEARCHING); threads[threadID].state = THREAD_AVAILABLE; @@ -2484,23 +2283,15 @@ split_start: void ThreadsManager::init_threads() { - volatile int i; + int i, arg[MAX_THREADS]; bool ok; -#if !defined(_MSC_VER) - pthread_t pthread[1]; -#endif - // Initialize global locks lock_init(&MPLock); lock_init(&WaitLock); -#if !defined(_MSC_VER) - pthread_cond_init(&WaitCond, NULL); -#else for (i = 0; i < MAX_THREADS; i++) - SitIdleEvent[i] = CreateEvent(0, FALSE, FALSE, 0); -#endif + cond_init(&WaitCond[i]); // Initialize splitPoints[] locks for (i = 0; i < MAX_THREADS; i++) @@ -2510,33 +2301,34 @@ split_start: // Will be set just before program exits to properly end the threads AllThreadsShouldExit = false; - // Threads will be put to sleep as soon as created - AllThreadsShouldSleep = true; - - // All threads except the main thread should be initialized to THREAD_AVAILABLE + // Threads will be put all threads to sleep as soon as created ActiveThreads = 1; + + // All threads except the main thread should be initialized to THREAD_INITIALIZING threads[0].state = THREAD_SEARCHING; for (i = 1; i < MAX_THREADS; i++) - threads[i].state = THREAD_AVAILABLE; + threads[i].state = THREAD_INITIALIZING; // Launch the helper threads for (i = 1; i < MAX_THREADS; i++) { + arg[i] = i; #if !defined(_MSC_VER) - ok = (pthread_create(pthread, NULL, init_thread, (void*)(&i)) == 0); + pthread_t pthread[1]; + 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; - Application::exit_with_failure(); + exit(EXIT_FAILURE); } // Wait until the thread has finished launching and is gone to sleep - while (threads[i].state != THREAD_SLEEPING) {} + while (threads[i].state == THREAD_INITIALIZING) {} } } @@ -2546,14 +2338,14 @@ split_start: void ThreadsManager::exit_threads() { - ActiveThreads = MAX_THREADS; // Wake up all the threads - AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop() - AllThreadsShouldSleep = true; // Avoid an assert in wake_sleeping_threads() - wake_sleeping_threads(); + AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop() - // Wait for thread termination + // Wake up all the threads and waits for termination for (int i = 1; i < MAX_THREADS; i++) + { + wake_sleeping_thread(i); while (threads[i].state != THREAD_TERMINATED) {} + } // Now we can safely destroy the locks for (int i = 0; i < MAX_THREADS; i++) @@ -2562,6 +2354,10 @@ split_start: lock_destroy(&WaitLock); lock_destroy(&MPLock); + + // Now we can safely destroy the wait conditions + for (int i = 0; i < MAX_THREADS; i++) + cond_destroy(&WaitCond[i]); } @@ -2637,25 +2433,24 @@ split_start: // split point objects), the function immediately returns. If splitting is // possible, a SplitPoint object is initialized with all the data that must be // copied to the helper threads and we tell our helper threads that they have - // been assigned work. This will cause them to instantly leave their idle loops - // and call sp_search(). When all threads have returned from sp_search() then - // split() returns. + // been assigned work. This will cause them to instantly leave their idle loops and + // call search().When all threads have returned from search() then split() returns. template - 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); @@ -2685,7 +2480,8 @@ split_start: 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; @@ -2739,48 +2535,23 @@ split_start: *bestValue = splitPoint.bestValue; masterThread.activeSplitPoints--; masterThread.splitPoint = splitPoint.parent; + pos.set_nodes_searched(pos.nodes_searched() + splitPoint.nodes); lock_release(&MPLock); } - // wake_sleeping_threads() wakes up all sleeping threads when it is time + // wake_sleeping_thread() wakes up all sleeping threads when it is time // to start a new search from the root. - void ThreadsManager::wake_sleeping_threads() { - - assert(AllThreadsShouldSleep); - assert(ActiveThreads > 0); - - AllThreadsShouldSleep = false; - - if (ActiveThreads == 1) - return; - -#if !defined(_MSC_VER) - pthread_mutex_lock(&WaitLock); - pthread_cond_broadcast(&WaitCond); - pthread_mutex_unlock(&WaitLock); -#else - for (int i = 1; i < MAX_THREADS; i++) - SetEvent(SitIdleEvent[i]); -#endif + void ThreadsManager::wake_sleeping_thread(int threadID) { + lock_grab(&WaitLock); + cond_signal(&WaitCond[threadID]); + lock_release(&WaitLock); } - // put_threads_to_sleep() makes all the threads go to sleep just before - // to leave think(), at the end of the search. Threads should have already - // finished the job and should be idle. - - void ThreadsManager::put_threads_to_sleep() { - - assert(!AllThreadsShouldSleep); - - // This makes the threads to go to sleep - AllThreadsShouldSleep = true; - } - /// The RootMoveList class // RootMoveList c'tor @@ -2794,7 +2565,7 @@ split_start: // Initialize search stack init_ss_array(ss, PLY_MAX_PLUS_2); - ss[0].eval = VALUE_NONE; + ss[0].eval = ss[0].evalMargin = VALUE_NONE; count = 0; // Generate all legal moves