X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=bdb64ab5ea1cd300e8f69b3ccffb12bca37633a4;hp=d55a1e1743db323aa109a86a08676e2bd5da657a;hb=8fa53a5b92bdfce4613ef04b88715ec9ccd9864c;hpb=5c8af7ccb8f59f901740d5a8f4a9270f69487583 diff --git a/src/search.cpp b/src/search.cpp index d55a1e17..bdb64ab5 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -170,11 +170,6 @@ namespace { int SkillLevel; bool SkillLevelEnabled; - // Node counters, used only by thread[0] but try to keep in different cache - // lines (64 bytes each) from the heavy multi-thread read accessed variables. - int NodesSincePoll; - int NodesBetweenPolls = 30000; - // History table History H; @@ -197,16 +192,14 @@ namespace { bool connected_threat(const Position& pos, Move m, Move threat); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount); - void update_gains(const Position& pos, Move move, Value before, Value after); void do_skill_level(Move* best, Move* ponder); - int current_search_time(int set = 0); + int elapsed_search_time(int set = 0); string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE); string speed_to_uci(int64_t nodes); string pv_to_uci(const Move pv[], int pvNum, bool chess960); string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]); string depth_to_uci(Depth depth); - void poll(const Position& pos); void wait_for_stop_or_ponderhit(); // MovePickerExt template class extends MovePicker and allows to choose at compile @@ -360,28 +353,17 @@ int64_t perft(Position& pos, Depth depth) { bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { - static Book book; // Define static to initialize the PRNG only once + static Book book; // Defined static to initialize the PRNG only once // Initialize global search-related variables StopOnPonderhit = StopRequest = QuitRequest = AspirationFailLow = false; - NodesSincePoll = 0; - current_search_time(get_system_time()); + elapsed_search_time(get_system_time()); Limits = limits; TimeMgr.init(Limits, pos.startpos_ply_counter()); - // Set output steram in normal or chess960 mode + // Set output stream in normal or chess960 mode cout << set960(pos.is_chess960()); - // Set best NodesBetweenPolls interval to avoid lagging under time pressure - if (Limits.maxNodes) - NodesBetweenPolls = std::min(Limits.maxNodes, 30000); - else if (Limits.time && Limits.time < 1000) - NodesBetweenPolls = 1000; - else if (Limits.time && Limits.time < 5000) - NodesBetweenPolls = 5000; - else - NodesBetweenPolls = 30000; - // Look for a book move if (Options["OwnBook"].value()) { @@ -399,6 +381,13 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { } } + // Set best timer interval to avoid lagging under time pressure. Timer is + // used to check for remaining available thinking time. + if (TimeMgr.available_time()) + Threads.set_timer(std::min(100, std::max(TimeMgr.available_time() / 8, 20))); + else + Threads.set_timer(100); + // Read UCI options UCIMultiPV = Options["MultiPV"].value(); SkillLevel = Options["Skill Level"].value(); @@ -427,7 +416,11 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { Threads[i].maxPly = 0; } - // Write to log file and keep it open to be accessed during the search + // Start async mode to catch UCI commands sent to us while searching, + // like "quit", "stop", etc. + Threads.start_listener(); + + // Write current search header to log file if (Options["Use Search Log"].value()) { Log log(Options["Search Log Filename"].value()); @@ -444,14 +437,14 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { Move ponderMove = MOVE_NONE; Move bestMove = id_loop(pos, searchMoves, &ponderMove); - // Write final search statistics and close log file + // Write current search final statistics to log file if (Options["Use Search Log"].value()) { - int t = current_search_time(); + int e = elapsed_search_time(); Log log(Options["Search Log Filename"].value()); log << "Nodes: " << pos.nodes_searched() - << "\nNodes/second: " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0) + << "\nNodes/second: " << (e > 0 ? pos.nodes_searched() * 1000 / e : 0) << "\nBest move: " << move_to_san(pos, bestMove); StateInfo st; @@ -463,9 +456,15 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { // This makes all the threads to go to sleep Threads.set_size(1); + // From now on any UCI command will be read in-sync with Threads.getline() + Threads.stop_listener(); + + // Stop timer, no need to check for available time any more + Threads.set_timer(0); + // If we are pondering or in infinite search, we shouldn't print the // best move before we are told to do so. - if (!StopRequest && (Limits.ponder || Limits.infinite)) + if (Limits.ponder || Limits.infinite) wait_for_stop_or_ponderhit(); // Could be MOVE_NONE when searching on a stalemate position @@ -504,7 +503,7 @@ namespace { *ponderMove = bestMove = easyMove = skillBest = skillPonder = MOVE_NONE; depth = aspirationDelta = 0; value = alpha = -VALUE_INFINITE, beta = VALUE_INFINITE; - ss->currentMove = MOVE_NULL; // Hack to skip update_gains() + ss->currentMove = MOVE_NULL; // Hack to skip update gains // Moves to search are verified and copied Rml.init(pos, searchMoves); @@ -552,7 +551,7 @@ namespace { // research with bigger window until not failing high/low anymore. do { // Search starts from ss+1 to allow referencing (ss-1). This is - // needed by update_gains() and ss copy when splitting at Root. + // needed by update gains and ss copy when splitting at Root. value = search(pos, ss+1, alpha, beta, depth * ONE_PLY); // Bring to front the best move. It is critical that sorting is @@ -585,7 +584,7 @@ namespace { // if we have a fail high/low and we are deep in the search. UCI // protocol requires to send all the PV lines also if are still // to be searched and so refer to the previous search's score. - if ((value > alpha && value < beta) || current_search_time() > 2000) + if ((value > alpha && value < beta) || elapsed_search_time() > 2000) for (int i = 0; i < std::min(UCIMultiPV, (int)Rml.size()); i++) { bool updated = (i <= MultiPVIdx); @@ -638,7 +637,7 @@ namespace { if (Options["Use Search Log"].value()) { Log log(Options["Search Log Filename"].value()); - log << pretty_pv(pos, depth, value, current_search_time(), &Rml[0].pv[0]) << endl; + log << pretty_pv(pos, depth, value, elapsed_search_time(), &Rml[0].pv[0]) << endl; } // Init easyMove at first iteration or drop it if differs from the best move @@ -657,9 +656,9 @@ namespace { && easyMove == bestMove && ( Rml.size() == 1 ||( Rml[0].nodes > (pos.nodes_searched() * 85) / 100 - && current_search_time() > TimeMgr.available_time() / 16) + && elapsed_search_time() > TimeMgr.available_time() / 16) ||( Rml[0].nodes > (pos.nodes_searched() * 98) / 100 - && current_search_time() > TimeMgr.available_time() / 32))) + && elapsed_search_time() > TimeMgr.available_time() / 32))) StopRequest = true; // Take in account some extra time if the best move has changed @@ -668,7 +667,7 @@ namespace { // Stop search if most of available time is already consumed. We probably don't // have enough time to search the first move at the next iteration anyway. - if (current_search_time() > (TimeMgr.available_time() * 62) / 100) + if (elapsed_search_time() > (TimeMgr.available_time() * 62) / 100) StopRequest = true; // If we are allowed to ponder do not stop the search now but keep pondering @@ -737,7 +736,7 @@ namespace { if (PvNode && thread.maxPly < ss->ply) thread.maxPly = ss->ply; - // Step 1. Initialize node and poll. Polling can abort search + // Step 1. Initialize node if (!SpNode) { ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE; @@ -753,12 +752,6 @@ namespace { goto split_point_start; } - if (pos.thread() == 0 && ++NodesSincePoll > NodesBetweenPolls) - { - NodesSincePoll = 0; - poll(pos); - } - // Step 2. Check for aborted search and immediate draw if (( StopRequest || pos.is_draw() @@ -821,8 +814,17 @@ namespace { TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, ss->evalMargin); } - // Save gain for the parent non-capture move - update_gains(pos, (ss-1)->currentMove, (ss-1)->eval, ss->eval); + // Update gain for the parent non-capture move given the static position + // evaluation before and after the move. + if ( (move = (ss-1)->currentMove) != MOVE_NULL + && (ss-1)->eval != VALUE_NONE + && ss->eval != VALUE_NONE + && pos.captured_piece_type() == PIECE_TYPE_NONE + && !is_special(move)) + { + Square to = move_to(move); + H.update_gain(pos.piece_on(to), to, -(ss-1)->eval - ss->eval); + } // Step 6. Razoring (is omitted in PV nodes) if ( !PvNode @@ -1016,7 +1018,7 @@ split_point_start: // At split points actual search starts from here nodes = pos.nodes_searched(); // For long searches send current move info to GUI - if (pos.thread() == 0 && current_search_time() > 2000) + if (pos.thread() == 0 && elapsed_search_time() > 2000) cout << "info" << depth_to_uci(depth) << " currmove " << move << " currmovenumber " << moveCount + MultiPVIdx << endl; @@ -1727,24 +1729,10 @@ split_point_start: // At split points actual search starts from here } - // update_gains() updates the gains table of a non-capture move given - // the static position evaluation before and after the move. - - void update_gains(const Position& pos, Move m, Value before, Value after) { - - if ( m != MOVE_NULL - && before != VALUE_NONE - && after != VALUE_NONE - && pos.captured_piece_type() == PIECE_TYPE_NONE - && !is_special(m)) - H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); - } - - // current_search_time() returns the number of milliseconds which have passed // since the beginning of the current search. - int current_search_time(int set) { + int elapsed_search_time(int set) { static int searchStartTime; @@ -1783,7 +1771,7 @@ split_point_start: // At split points actual search starts from here string speed_to_uci(int64_t nodes) { std::stringstream s; - int t = current_search_time(); + int t = elapsed_search_time(); s << " nodes " << nodes << " nps " << (t > 0 ? int(nodes * 1000 / t) : 0) @@ -1909,99 +1897,24 @@ split_point_start: // At split points actual search starts from here return s.str(); } - // poll() performs two different functions: It polls for user input, and it - // looks at the time consumed so far and decides if it's time to abort the - // search. - - void poll(const Position& pos) { - - static int lastInfoTime; - int t = current_search_time(); - - // Poll for input - if (input_available()) - { - // We are line oriented, don't read single chars - string command; - - if (!std::getline(std::cin, command) || command == "quit") - { - // Quit the program as soon as possible - Limits.ponder = false; - QuitRequest = StopRequest = true; - return; - } - else if (command == "stop") - { - // Stop calculating as soon as possible, but still send the "bestmove" - // and possibly the "ponder" token when finishing the search. - Limits.ponder = false; - StopRequest = true; - } - else if (command == "ponderhit") - { - // The opponent has played the expected move. GUI sends "ponderhit" if - // we were told to ponder on the same move the opponent has played. We - // should continue searching but switching from pondering to normal search. - Limits.ponder = false; - - if (StopOnPonderhit) - StopRequest = true; - } - } - - // Print search information - if (t < 1000) - lastInfoTime = 0; - - else if (lastInfoTime > t) - // HACK: Must be a new search where we searched less than - // NodesBetweenPolls nodes during the first second of search. - lastInfoTime = 0; - - else if (t - lastInfoTime >= 1000) - { - lastInfoTime = t; - - dbg_print_mean(); - dbg_print_hit_rate(); - } - - // Should we stop the search? - if (Limits.ponder) - return; - - bool stillAtFirstMove = FirstRootMove - && !AspirationFailLow - && t > TimeMgr.available_time(); - - bool noMoreTime = t > TimeMgr.maximum_time() - || stillAtFirstMove; - - if ( (Limits.useTimeManagement() && noMoreTime) - || (Limits.maxTime && t >= Limits.maxTime) - || (Limits.maxNodes && pos.nodes_searched() >= Limits.maxNodes)) // FIXME - StopRequest = true; - } - // wait_for_stop_or_ponderhit() is called when the maximum depth is reached // while the program is pondering. The point is to work around a wrinkle in // the UCI protocol: When pondering, the engine is not allowed to give a // "bestmove" before the GUI sends it a "stop" or "ponderhit" command. - // We simply wait here until one of these commands is sent, and return, - // after which the bestmove and pondermove will be printed. + // We simply wait here until one of these commands (that raise StopRequest) is + // sent, and return, after which the bestmove and pondermove will be printed. void wait_for_stop_or_ponderhit() { - string command; - - // Wait for a command from stdin - while ( std::getline(std::cin, command) - && command != "ponderhit" && command != "stop" && command != "quit") {}; + string cmd; + StopOnPonderhit = true; - if (command != "ponderhit" && command != "stop") - QuitRequest = true; // Must be "quit" or getline() returned false + while (!StopRequest) + { + Threads.getline(cmd); + do_uci_async_cmd(cmd); + } } @@ -2254,3 +2167,61 @@ void Thread::idle_loop(SplitPoint* sp) { } } } + + +// do_uci_async_cmd() is called by listener thread when in async mode and 'cmd' +// input line is received from the GUI. + +void do_uci_async_cmd(const std::string& cmd) { + + if (cmd == "quit") + QuitRequest = StopRequest = true; + + else if (cmd == "stop") + StopRequest = true; + + else if (cmd == "ponderhit") + { + // The opponent has played the expected move. GUI sends "ponderhit" if + // we were told to ponder on the same move the opponent has played. We + // should continue searching but switching from pondering to normal search. + Limits.ponder = false; + + if (StopOnPonderhit) + StopRequest = true; + } +} + + +// do_timer_event() is called by the timer thread when the timer triggers + +void do_timer_event() { + + static int lastInfoTime; + int e = elapsed_search_time(); + + // Print debug information every second + if (get_system_time() - lastInfoTime >= 1000) + { + lastInfoTime = get_system_time(); + + dbg_print_mean(); + dbg_print_hit_rate(); + } + + // Should we stop the search? + if (Limits.ponder) + return; + + bool stillAtFirstMove = FirstRootMove + && !AspirationFailLow + && e > TimeMgr.available_time(); + + bool noMoreTime = e > TimeMgr.maximum_time() + || stillAtFirstMove; + + if ( (Limits.useTimeManagement() && noMoreTime) + || (Limits.maxTime && e >= Limits.maxTime) + /* missing nodes limit */ ) // FIXME + StopRequest = true; +}