X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=4a4e058f9f731436e476642d0f4f0bbced3209ec;hp=bdb64ab5ea1cd300e8f69b3ccffb12bca37633a4;hb=1ae6ae9b60ab9489bfd986bd811c1ec6d0331870;hpb=8fa53a5b92bdfce4613ef04b88715ec9ccd9864c diff --git a/src/search.cpp b/src/search.cpp index bdb64ab5..4a4e058f 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -17,6 +17,7 @@ along with this program. If not, see . */ +#include #include #include #include @@ -24,13 +25,11 @@ #include #include #include -#include #include "book.h" #include "evaluate.h" #include "history.h" #include "misc.h" -#include "move.h" #include "movegen.h" #include "movepick.h" #include "search.h" @@ -39,9 +38,18 @@ #include "tt.h" #include "ucioption.h" +namespace Search { + + volatile SignalsType Signals; + LimitsType Limits; + std::vector SearchMoves; + Position RootPosition; +} + using std::cout; using std::endl; using std::string; +using namespace Search; namespace { @@ -52,15 +60,21 @@ namespace { enum NodeType { Root, PV, NonPV, SplitPointRoot, SplitPointPV, SplitPointNonPV }; // RootMove struct is used for moves at the root of the tree. For each root - // move, we store a score, a node count, and a PV (really a refutation - // in the case of moves which fail low). Score is normally set at - // -VALUE_INFINITE for all non-pv moves. + // move we store a score, a node count, and a PV (really a refutation in the + // case of moves which fail low). Score is normally set at -VALUE_INFINITE for + // all non-pv moves. struct RootMove { - // RootMove::operator<() is the comparison function used when - // sorting the moves. A move m1 is considered to be better - // than a move m2 if it has an higher score + RootMove(){} + RootMove(Move m) { + nodes = 0; + score = prevScore = -VALUE_INFINITE; + pv.push_back(m); + pv.push_back(MOVE_NONE); + } + bool operator<(const RootMove& m) const { return score < m.score; } + bool operator==(const Move& m) const { return pv[0] == m; } void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); @@ -71,15 +85,6 @@ namespace { std::vector pv; }; - // RootMoveList struct is mainly a std::vector of RootMove objects - struct RootMoveList : public std::vector { - - void init(Position& pos, Move searchMoves[]); - RootMove* find(const Move& m, int startIndex = 0); - - int bestMoveChanges; - }; - /// Constants @@ -87,8 +92,6 @@ namespace { 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]; } - // Step 6. Razoring - // Maximum depth for razoring const Depth RazorDepth = 4 * ONE_PLY; @@ -98,8 +101,6 @@ namespace { // Maximum depth for use of dynamic threat detection when null move fails low const Depth ThreatDepth = 5 * ONE_PLY; - // Step 9. Internal iterative deepening - // Minimum depth for use of internal iterative deepening const Depth IIDDepth[] = { 8 * ONE_PLY, 5 * ONE_PLY }; @@ -107,19 +108,9 @@ namespace { // when the static evaluation is bigger then beta - IIDMargin. const Value IIDMargin = Value(0x100); - // Step 11. Decide the new search depth - - // Extensions. Array index 0 is used for non-PV nodes, index 1 for PV nodes - const Depth CheckExtension[] = { ONE_PLY / 2, ONE_PLY / 1 }; - const Depth PawnEndgameExtension[] = { ONE_PLY / 1, ONE_PLY / 1 }; - const Depth PawnPushTo7thExtension[] = { ONE_PLY / 2, ONE_PLY / 2 }; - const Depth PassedPawnExtension[] = { DEPTH_ZERO, ONE_PLY / 2 }; - // Minimum depth for use of singular extension const Depth SingularExtensionDepth[] = { 8 * ONE_PLY, 6 * ONE_PLY }; - // Step 12. Futility pruning - // Futility margin for quiescence search const Value FutilityMarginQS = Value(0x80); @@ -138,8 +129,6 @@ namespace { return d < 16 * ONE_PLY ? FutilityMoveCounts[d] : MAX_MOVES; } - // Step 14. Reduced search - // Reduction lookup tables (initialized at startup) and their access function int8_t Reductions[2][64][64]; // [pv][depth][moveNumber] @@ -150,39 +139,29 @@ namespace { // Easy move margin. An easy move candidate must be at least this much // better than the second best move. - const Value EasyMoveMargin = Value(0x200); + const Value EasyMoveMargin = Value(0x150); /// Namespace variables - // Root move list - RootMoveList Rml; - - // MultiPV mode - int MultiPV, UCIMultiPV, MultiPVIdx; - - // Time management variables - bool StopOnPonderhit, FirstRootMove, StopRequest, QuitRequest, AspirationFailLow; + std::vector RootMoves; + size_t MultiPV, UCIMultiPV, PVIdx; TimeManager TimeMgr; - SearchLimits Limits; - - // Skill level adjustment + int BestMoveChanges; int SkillLevel; bool SkillLevelEnabled; - - // History table History H; /// Local functions - Move id_loop(Position& pos, Move searchMoves[], Move* ponderMove); + void id_loop(Position& pos); template - Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth); + Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth); template - Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth); + Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth); bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta, Value *bValue); bool connected_moves(const Position& pos, Move m1, Move m2); @@ -192,29 +171,25 @@ 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 do_skill_level(Move* best, Move* ponder); - - int elapsed_search_time(int set = 0); + Move do_skill_level(); + int elapsed_time(bool reset = false); 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 wait_for_stop_or_ponderhit(); - - // MovePickerExt template class extends MovePicker and allows to choose at compile - // time the proper moves source according to the type of node. In the default case - // we simply create and use a standard MovePicker object. + void pv_info_to_log(Position& pos, int depth, Value score, int time, Move pv[]); + void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta); + + // MovePickerExt class template extends MovePicker and allows to choose at + // compile time the proper moves source according to the type of node. In the + // default case we simply create and use a standard MovePicker object. template struct MovePickerExt : public MovePicker { - MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b) + MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, Stack* ss, Value b) : MovePicker(p, ttm, d, h, ss, b) {} }; // In case of a SpNode we use split point's shared MovePicker object as moves source template<> struct MovePickerExt : public MovePicker { - MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b) + MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, Stack* ss, Value b) : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {} Move get_next_move() { return mp->get_next_move(); } @@ -229,71 +204,50 @@ namespace { return os << move_to_uci(m, chess960); } - // When formatting a move for std::cout we must know if we are in Chess960 - // or not. To keep using the handy operator<<() on the move the trick is to - // embed this flag in the stream itself. Function-like named enum set960 is - // used as a custom manipulator and the stream internal general-purpose array, - // accessed through ios_base::iword(), is used to pass the flag to the move's - // operator<<() that will read it to properly format castling moves. + // When formatting a move for std::cout we must know if we are in Chess960 or + // not. To keep using the handy operator<<() on the move the trick is to embed + // this flag in the stream itself. Function-like named enum set960 is used as + // a custom manipulator and the stream internal general-purpose array, accessed + // through ios_base::iword(), is used to pass the flag to the move's operator<< + // that will read it to properly format castling moves. enum set960 {}; - std::ostream& operator<< (std::ostream& os, const set960& f) { + std::ostream& operator<<(std::ostream& os, const set960& f) { - os.iword(0) = int(f); + os.iword(0) = f; return os; } - // 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 - // any case are marked as 'dangerous'. Note that also if a move is not - // extended, as example because the corresponding UCI option is set to zero, - // the move is marked as 'dangerous' so, at least, we avoid to prune it. - template - FORCE_INLINE Depth extension(const Position& pos, Move m, bool captureOrPromotion, - bool moveIsCheck, bool* dangerous) { - assert(m != MOVE_NONE); - - Depth result = DEPTH_ZERO; - *dangerous = moveIsCheck; - - if (moveIsCheck && pos.see_sign(m) >= 0) - result += CheckExtension[PvNode]; + // is_dangerous() checks whether a move belongs to some classes of known + // 'dangerous' moves so that we avoid to prune it. + FORCE_INLINE bool is_dangerous(const Position& pos, Move m, bool captureOrPromotion) { + // Test for a pawn pushed to 7th or a passed pawn move if (type_of(pos.piece_on(move_from(m))) == PAWN) { Color c = pos.side_to_move(); - if (relative_rank(c, move_to(m)) == RANK_7) - { - result += PawnPushTo7thExtension[PvNode]; - *dangerous = true; - } - if (pos.pawn_is_passed(c, move_to(m))) - { - result += PassedPawnExtension[PvNode]; - *dangerous = true; - } + if ( relative_rank(c, move_to(m)) == RANK_7 + || pos.pawn_is_passed(c, move_to(m))) + return true; } + // Test for a capture that triggers a pawn endgame if ( captureOrPromotion && type_of(pos.piece_on(move_to(m))) != PAWN && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) - PieceValueMidgame[pos.piece_on(move_to(m))] == VALUE_ZERO) && !is_special(m)) - { - result += PawnEndgameExtension[PvNode]; - *dangerous = true; - } + return true; - return std::min(result, ONE_PLY); + return false; } } // namespace -/// init_search() is called during startup to initialize various lookup tables +/// Search::init() is called during startup to initialize various lookup tables -void init_search() { +void Search::init() { int d; // depth (ONE_PLY == 2) int hd; // half depth (ONE_PLY == 1) @@ -318,23 +272,20 @@ void init_search() { } -/// perft() is our utility to verify move generation. All the leaf nodes up to -/// the given depth are generated and counted and the sum returned. +/// Search::perft() is our utility to verify move generation. All the leaf nodes +/// up to the given depth are generated and counted and the sum returned. -int64_t perft(Position& pos, Depth depth) { +int64_t Search::perft(Position& pos, Depth depth) { StateInfo st; int64_t sum = 0; - // Generate all legal moves MoveList ml(pos); - // If we are at the last ply we don't need to do and undo - // the moves, just to count them. + // At the last ply just return the number of moves (leaf nodes) if (depth <= ONE_PLY) return ml.size(); - // Loop through all legal moves CheckInfo ci(pos); for ( ; !ml.end(); ++ml) { @@ -346,81 +297,65 @@ int64_t perft(Position& pos, Depth depth) { } -/// think() is the external interface to Stockfish's search, and is called when -/// the program receives the UCI 'go' command. It initializes various global -/// variables, and calls id_loop(). It returns false when a "quit" command is -/// received during the search. +/// Search::think() is the external interface to Stockfish's search, and is +/// called by the main thread when the program receives the UCI 'go' command. It +/// searches from RootPosition and at the end prints the "bestmove" to output. -bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { +void Search::think() { static Book book; // Defined static to initialize the PRNG only once - // Initialize global search-related variables - StopOnPonderhit = StopRequest = QuitRequest = AspirationFailLow = false; - elapsed_search_time(get_system_time()); - Limits = limits; + Position& pos = RootPosition; + elapsed_time(true); TimeMgr.init(Limits, pos.startpos_ply_counter()); - - // Set output stream in normal or chess960 mode + TT.new_search(); + H.clear(); + RootMoves.clear(); + + // Populate RootMoves with all the legal moves (default) or, if a SearchMoves + // is given, with the subset of legal moves to search. + for (MoveList ml(pos); !ml.end(); ++ml) + if ( SearchMoves.empty() + || std::count(SearchMoves.begin(), SearchMoves.end(), ml.move())) + RootMoves.push_back(RootMove(ml.move())); + + // Set output stream mode: normal or chess960. Castling notation is different cout << set960(pos.is_chess960()); - // Look for a book move if (Options["OwnBook"].value()) { if (Options["Book File"].value() != book.name()) book.open(Options["Book File"].value()); Move bookMove = book.probe(pos, Options["Best Book Move"].value()); - if (bookMove != MOVE_NONE) - { - if (Limits.ponder) - wait_for_stop_or_ponderhit(); - cout << "bestmove " << bookMove << endl; - return !QuitRequest; + if ( bookMove != MOVE_NONE + && std::count(RootMoves.begin(), RootMoves.end(), bookMove)) + { + std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), bookMove)); + goto finish; } } - // 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(); - + // Read UCI options: GUI could change UCI parameters during the game read_evaluation_uci_options(pos.side_to_move()); Threads.read_uci_options(); - // Set a new TT size if changed TT.set_size(Options["Hash"].value()); - if (Options["Clear Hash"].value()) { Options["Clear Hash"].set_value("false"); TT.clear(); } + UCIMultiPV = Options["MultiPV"].value(); + SkillLevel = Options["Skill Level"].value(); + // Do we have to play with skill handicap? In this case enable MultiPV that // we will use behind the scenes to retrieve a set of possible moves. SkillLevelEnabled = (SkillLevel < 20); - MultiPV = (SkillLevelEnabled ? std::max(UCIMultiPV, 4) : UCIMultiPV); + MultiPV = (SkillLevelEnabled ? std::max(UCIMultiPV, (size_t)4) : UCIMultiPV); - // Wake up needed threads and reset maxPly counter - for (int i = 0; i < Threads.size(); i++) - { - Threads[i].wake_up(); - Threads[i].maxPly = 0; - } - - // 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()); @@ -433,51 +368,58 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { << endl; } - // We're ready to start thinking. Call the iterative deepening loop function - Move ponderMove = MOVE_NONE; - Move bestMove = id_loop(pos, searchMoves, &ponderMove); + for (int i = 0; i < Threads.size(); i++) + { + Threads[i].maxPly = 0; + Threads[i].wake_up(); + } + + // 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); + + // We're ready to start searching. Call the iterative deepening loop function + id_loop(pos); + + // Stop timer and send all the slaves to sleep, if not already sleeping + Threads.set_timer(0); + Threads.set_size(1); - // Write current search final statistics to log file if (Options["Use Search Log"].value()) { - int e = elapsed_search_time(); + int e = elapsed_time(); Log log(Options["Search Log Filename"].value()); log << "Nodes: " << pos.nodes_searched() << "\nNodes/second: " << (e > 0 ? pos.nodes_searched() * 1000 / e : 0) - << "\nBest move: " << move_to_san(pos, bestMove); + << "\nBest move: " << move_to_san(pos, RootMoves[0].pv[0]); StateInfo st; - pos.do_move(bestMove, st); - log << "\nPonder move: " << move_to_san(pos, ponderMove) << endl; - pos.undo_move(bestMove); // Return from think() with unchanged position + pos.do_move(RootMoves[0].pv[0], st); + log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << endl; + pos.undo_move(RootMoves[0].pv[0]); } - // 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(); +finish: - // 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 (Limits.ponder || Limits.infinite) - wait_for_stop_or_ponderhit(); + // When we reach max depth we arrive here even without a StopRequest, but if + // we are pondering or in infinite search, we shouldn't print the best move + // before we are told to do so. + if (!Signals.stop && (Limits.ponder || Limits.infinite)) + Threads.wait_for_stop_or_ponderhit(); // Could be MOVE_NONE when searching on a stalemate position - cout << "bestmove " << bestMove; + cout << "bestmove " << RootMoves[0].pv[0]; // UCI protol is not clear on allowing sending an empty ponder move, instead // it is clear that ponder move is optional. So skip it if empty. - if (ponderMove != MOVE_NONE) - cout << " ponder " << ponderMove; + if (RootMoves[0].pv[1] != MOVE_NONE) + cout << " ponder " << RootMoves[0].pv[1]; cout << endl; - - return !QuitRequest; } @@ -487,59 +429,49 @@ namespace { // with increasing depth until the allocated thinking time has been consumed, // user stops the search, or the maximum search depth is reached. - Move id_loop(Position& pos, Move searchMoves[], Move* ponderMove) { - - SearchStack ss[PLY_MAX_PLUS_2]; - Value bestValues[PLY_MAX_PLUS_2]; - int bestMoveChanges[PLY_MAX_PLUS_2]; - int depth, aspirationDelta; - Value value, alpha, beta; - Move bestMove, easyMove, skillBest, skillPonder; - - // Initialize stuff before a new search - memset(ss, 0, 4 * sizeof(SearchStack)); - TT.new_search(); - H.clear(); - *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 + void id_loop(Position& pos) { - // Moves to search are verified and copied - Rml.init(pos, searchMoves); + Stack ss[PLY_MAX_PLUS_2]; + int depth, prevBestMoveChanges; + Value bestValue, alpha, beta, delta; + bool bestMoveNeverChanged = true; + Move skillBest = MOVE_NONE; - // Handle special case of searching on a mate/stalemate position - if (!Rml.size()) + memset(ss, 0, 4 * sizeof(Stack)); + depth = BestMoveChanges = 0; + bestValue = delta = -VALUE_INFINITE; + ss->currentMove = MOVE_NULL; // Hack to skip update gains + + // Handle the special case of a mate/stalemate position + if (RootMoves.empty()) { - cout << "info" << depth_to_uci(DEPTH_ZERO) - << score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW, alpha, beta) << endl; + cout << "info depth 0" + << score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW) << endl; - return MOVE_NONE; + RootMoves.push_back(MOVE_NONE); + return; } // Iterative deepening loop until requested to stop or target depth reached - while (!StopRequest && ++depth <= PLY_MAX && (!Limits.maxDepth || depth <= Limits.maxDepth)) + while (!Signals.stop && ++depth <= PLY_MAX && (!Limits.maxDepth || depth <= Limits.maxDepth)) { - // Save now last iteration's scores, before Rml moves are reordered - for (size_t i = 0; i < Rml.size(); i++) - Rml[i].prevScore = Rml[i].score; + // Save last iteration's scores before first PV line is searched and all + // the move scores but the (new) PV are set to -VALUE_INFINITE. + for (size_t i = 0; i < RootMoves.size(); i++) + RootMoves[i].prevScore = RootMoves[i].score; - Rml.bestMoveChanges = 0; + prevBestMoveChanges = BestMoveChanges; + BestMoveChanges = 0; // MultiPV loop. We perform a full root search for each PV line - for (MultiPVIdx = 0; MultiPVIdx < std::min(MultiPV, (int)Rml.size()); MultiPVIdx++) + for (PVIdx = 0; PVIdx < std::min(MultiPV, RootMoves.size()); PVIdx++) { - // Calculate dynamic aspiration window based on previous iterations - if (depth >= 5 && abs(Rml[MultiPVIdx].prevScore) < VALUE_KNOWN_WIN) + // Set aspiration window default width + if (depth >= 5 && abs(RootMoves[PVIdx].prevScore) < VALUE_KNOWN_WIN) { - int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2]; - int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3]; - - aspirationDelta = std::min(std::max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24); - aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize - - alpha = std::max(Rml[MultiPVIdx].prevScore - aspirationDelta, -VALUE_INFINITE); - beta = std::min(Rml[MultiPVIdx].prevScore + aspirationDelta, VALUE_INFINITE); + delta = Value(16); + alpha = RootMoves[PVIdx].prevScore - delta; + beta = RootMoves[PVIdx].prevScore + delta; } else { @@ -552,7 +484,7 @@ namespace { do { // Search starts from ss+1 to allow referencing (ss-1). This is // needed by update gains and ss copy when splitting at Root. - value = search(pos, ss+1, alpha, beta, depth * ONE_PLY); + bestValue = search(pos, ss+1, alpha, beta, depth * ONE_PLY); // Bring to front the best move. It is critical that sorting is // done with a stable algorithm because all the values but the first @@ -560,136 +492,117 @@ namespace { // we want to keep the same order for all the moves but the new // PV that goes to the front. Note that in case of MultiPV search // the already searched PV lines are preserved. - sort(Rml.begin() + MultiPVIdx, Rml.end()); + sort(RootMoves.begin() + PVIdx, RootMoves.end()); // In case we have found an exact score and we are going to leave // the fail high/low loop then reorder the PV moves, otherwise // leave the last PV move in its position so to be searched again. // Of course this is needed only in MultiPV search. - if (MultiPVIdx && value > alpha && value < beta) - sort(Rml.begin(), Rml.begin() + MultiPVIdx); - - // Write PV back to transposition table in case the relevant entries - // have been overwritten during the search. - for (int i = 0; i <= MultiPVIdx; i++) - Rml[i].insert_pv_in_tt(pos); - - // If search has been stopped exit the aspiration window loop, - // note that sorting and writing PV back to TT is safe becuase - // Rml is still valid, although refers to the previous iteration. - if (StopRequest) + if (PVIdx && bestValue > alpha && bestValue < beta) + sort(RootMoves.begin(), RootMoves.begin() + PVIdx); + + // Write PV back to transposition table in case the relevant + // entries have been overwritten during the search. + for (size_t i = 0; i <= PVIdx; i++) + RootMoves[i].insert_pv_in_tt(pos); + + // If search has been stopped exit the aspiration window loop. + // Sorting and writing PV back to TT is safe becuase RootMoves + // is still valid, although refers to previous iteration. + if (Signals.stop) break; // Send full PV info to GUI if we are going to leave the loop or - // 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) || elapsed_search_time() > 2000) - for (int i = 0; i < std::min(UCIMultiPV, (int)Rml.size()); i++) - { - bool updated = (i <= MultiPVIdx); - - if (depth == 1 && !updated) - continue; - - Depth d = (updated ? depth : depth - 1) * ONE_PLY; - Value s = (updated ? Rml[i].score : Rml[i].prevScore); - - cout << "info" - << depth_to_uci(d) - << (i == MultiPVIdx ? score_to_uci(s, alpha, beta) : score_to_uci(s)) - << speed_to_uci(pos.nodes_searched()) - << pv_to_uci(&Rml[i].pv[0], i + 1, pos.is_chess960()) - << endl; - } + // if we have a fail high/low and we are deep in the search. + if ((bestValue > alpha && bestValue < beta) || elapsed_time() > 2000) + pv_info_to_uci(pos, depth, alpha, beta); // In case of failing high/low increase aspiration window and // research, otherwise exit the fail high/low loop. - if (value >= beta) + if (bestValue >= beta) { - beta = std::min(beta + aspirationDelta, VALUE_INFINITE); - aspirationDelta += aspirationDelta / 2; + beta += delta; + delta += delta / 2; } - else if (value <= alpha) + else if (bestValue <= alpha) { - AspirationFailLow = true; - StopOnPonderhit = false; + Signals.failedLowAtRoot = true; + Signals.stopOnPonderhit = false; - alpha = std::max(alpha - aspirationDelta, -VALUE_INFINITE); - aspirationDelta += aspirationDelta / 2; + alpha -= delta; + delta += delta / 2; } else break; - } while (abs(value) < VALUE_KNOWN_WIN); - } + assert(alpha >= -VALUE_INFINITE && beta <= VALUE_INFINITE); - // Collect info about search result - bestMove = Rml[0].pv[0]; - *ponderMove = Rml[0].pv[1]; - bestValues[depth] = value; - bestMoveChanges[depth] = Rml.bestMoveChanges; + } while (abs(bestValue) < VALUE_KNOWN_WIN); + } - // Skills: Do we need to pick now the best and the ponder moves ? + // Skills: Do we need to pick now the best move ? if (SkillLevelEnabled && depth == 1 + SkillLevel) - do_skill_level(&skillBest, &skillPonder); + skillBest = do_skill_level(); if (Options["Use Search Log"].value()) - { - Log log(Options["Search Log Filename"].value()); - log << pretty_pv(pos, depth, value, elapsed_search_time(), &Rml[0].pv[0]) << endl; - } + pv_info_to_log(pos, depth, bestValue, elapsed_time(), &RootMoves[0].pv[0]); - // Init easyMove at first iteration or drop it if differs from the best move - if (depth == 1 && (Rml.size() == 1 || Rml[0].score > Rml[1].score + EasyMoveMargin)) - easyMove = bestMove; - else if (bestMove != easyMove) - easyMove = MOVE_NONE; + // Filter out startup noise when monitoring best move stability + if (depth > 2 && BestMoveChanges) + bestMoveNeverChanged = false; - // Check for some early stop condition - if (!StopRequest && Limits.useTimeManagement()) + // Do we have time for the next iteration? Can we stop searching now? + if (!Signals.stop && !Signals.stopOnPonderhit && Limits.useTimeManagement()) { - // Easy move: Stop search early if one move seems to be much better - // than the others or if there is only a single legal move. Also in - // the latter case search to some depth anyway to get a proper score. - if ( depth >= 7 - && easyMove == bestMove - && ( Rml.size() == 1 - ||( Rml[0].nodes > (pos.nodes_searched() * 85) / 100 - && elapsed_search_time() > TimeMgr.available_time() / 16) - ||( Rml[0].nodes > (pos.nodes_searched() * 98) / 100 - && elapsed_search_time() > TimeMgr.available_time() / 32))) - StopRequest = true; + bool stop = false; // Local variable, not the volatile Signals.stop // Take in account some extra time if the best move has changed if (depth > 4 && depth < 50) - TimeMgr.pv_instability(bestMoveChanges[depth], bestMoveChanges[depth - 1]); - - // 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 (elapsed_search_time() > (TimeMgr.available_time() * 62) / 100) - StopRequest = true; + TimeMgr.pv_instability(BestMoveChanges, prevBestMoveChanges); + + // 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 (elapsed_time() > (TimeMgr.available_time() * 62) / 100) + stop = true; + + // Stop search early if one move seems to be much better than others + if ( depth >= 10 + && !stop + && ( bestMoveNeverChanged + || elapsed_time() > (TimeMgr.available_time() * 40) / 100)) + { + Value rBeta = bestValue - EasyMoveMargin; + (ss+1)->excludedMove = RootMoves[0].pv[0]; + (ss+1)->skipNullMove = true; + Value v = search(pos, ss+1, rBeta - 1, rBeta, (depth * ONE_PLY) / 2); + (ss+1)->skipNullMove = false; + (ss+1)->excludedMove = MOVE_NONE; + + if (v < rBeta) + stop = true; + } - // If we are allowed to ponder do not stop the search now but keep pondering - if (StopRequest && Limits.ponder) + if (stop) { - StopRequest = false; - StopOnPonderhit = true; + // If we are allowed to ponder do not stop the search now but + // keep pondering until GUI sends "ponderhit" or "stop". + if (Limits.ponder) + Signals.stopOnPonderhit = true; + else + Signals.stop = true; } } } - // When using skills overwrite best and ponder moves with the sub-optimal ones + // When using skills swap best PV line with the sub-optimal one if (SkillLevelEnabled) { if (skillBest == MOVE_NONE) // Still unassigned ? - do_skill_level(&skillBest, &skillPonder); + skillBest = do_skill_level(); - bestMove = skillBest; - *ponderMove = skillPonder; + std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), skillBest)); } - - return bestMove; } @@ -701,7 +614,7 @@ namespace { // here: This is taken care of after we return from the split point. template - Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth) { + Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) { const bool PvNode = (NT == PV || NT == Root || NT == SplitPointPV || NT == SplitPointRoot); const bool SpNode = (NT == SplitPointPV || NT == SplitPointNonPV || NT == SplitPointRoot); @@ -722,7 +635,8 @@ namespace { ValueType vt; Value bestValue, value, oldAlpha; Value refinedValue, nullValue, futilityBase, futilityValue; - bool isPvMove, inCheck, singularExtensionNode, givesCheck, captureOrPromotion, dangerous; + bool isPvMove, inCheck, singularExtensionNode, givesCheck; + bool captureOrPromotion, dangerous, doFullDepthSearch; int moveCount = 0, playedMoveCount = 0; Thread& thread = Threads[pos.thread()]; SplitPoint* sp = NULL; @@ -753,7 +667,7 @@ namespace { } // Step 2. Check for aborted search and immediate draw - if (( StopRequest + if (( Signals.stop || pos.is_draw() || ss->ply > PLY_MAX) && !RootNode) return VALUE_DRAW; @@ -773,7 +687,7 @@ namespace { excludedMove = ss->excludedMove; posKey = excludedMove ? pos.get_exclusion_key() : pos.get_key(); tte = TT.probe(posKey); - ttMove = RootNode ? Rml[MultiPVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; + ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; // At PV nodes we check for exact scores, while at non-PV nodes we check for // a fail high/low. Biggest advantage at probing at PV nodes is to have a @@ -962,7 +876,6 @@ namespace { split_point_start: // At split points actual search starts from here - // Initialize a MovePicker object for the current position MovePickerExt mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta); CheckInfo ci(pos); ss->bestMove = MOVE_NONE; @@ -971,13 +884,16 @@ split_point_start: // At split points actual search starts from here && !SpNode && depth >= SingularExtensionDepth[PvNode] && ttMove != MOVE_NONE - && !excludedMove // Do not allow recursive singular extension search + && !excludedMove // Recursive singular search is not allowed && (tte->type() & VALUE_TYPE_LOWER) && tte->depth() >= depth - 3 * ONE_PLY; if (SpNode) { lock_grab(&(sp->lock)); bestValue = sp->bestValue; + moveCount = sp->moveCount; + + assert(bestValue > -VALUE_INFINITE && moveCount > 0); } // Step 11. Loop through moves @@ -994,7 +910,7 @@ split_point_start: // At split points actual search starts from here // At root obey the "searchmoves" option and skip moves not listed in Root // Move List, as a consequence any illegal move is also skipped. In MultiPV // mode we also skip PV moves which have been already searched. - if (RootNode && !Rml.find(move, MultiPVIdx)) + if (RootNode && !std::count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) continue; // At PV and SpNode nodes we want all moves to be legal since the beginning @@ -1012,25 +928,28 @@ split_point_start: // At split points actual search starts from here if (RootNode) { // This is used by time management - FirstRootMove = (moveCount == 1); + Signals.firstRootMove = (moveCount == 1); - // Save the current node count before the move is searched nodes = pos.nodes_searched(); - // For long searches send current move info to GUI - if (pos.thread() == 0 && elapsed_search_time() > 2000) - cout << "info" << depth_to_uci(depth) + if (pos.thread() == 0 && elapsed_time() > 2000) + cout << "info depth " << depth / ONE_PLY << " currmove " << move - << " currmovenumber " << moveCount + MultiPVIdx << endl; + << " currmovenumber " << moveCount + PVIdx << endl; } - // At Root and at first iteration do a PV search on all the moves to score root moves - isPvMove = (PvNode && moveCount <= (RootNode && depth <= ONE_PLY ? MAX_MOVES : 1)); - givesCheck = pos.move_gives_check(move, ci); + isPvMove = (PvNode && moveCount <= 1); captureOrPromotion = pos.is_capture_or_promotion(move); + givesCheck = pos.move_gives_check(move, ci); + dangerous = givesCheck || is_dangerous(pos, move, captureOrPromotion); + ext = DEPTH_ZERO; + + // Step 12. Extend checks and, in PV nodes, also dangerous moves + if (PvNode && dangerous) + ext = ONE_PLY; - // Step 12. Decide the new search depth - ext = extension(pos, move, captureOrPromotion, givesCheck, &dangerous); + else if (givesCheck && pos.see_sign(move) >= 0) + ext = PvNode ? ONE_PLY : ONE_PLY / 2; // Singular extension search. If all moves but one fail low on a search of // (alpha-s, beta-s), and just one fails high on (alpha, beta), then that move @@ -1038,9 +957,9 @@ split_point_start: // At split points actual search starts from here // on all the other moves but the ttMove, if result is lower than ttValue minus // a margin then we extend ttMove. if ( singularExtensionNode + && !ext && move == ttMove - && pos.pl_move_is_legal(move, ci.pinned) - && ext < ONE_PLY) + && pos.pl_move_is_legal(move, ci.pinned)) { Value ttValue = value_from_tt(tte->value(), ss->ply); @@ -1049,11 +968,11 @@ split_point_start: // At split points actual search starts from here Value rBeta = ttValue - int(depth); ss->excludedMove = move; ss->skipNullMove = true; - Value v = search(pos, ss, rBeta - 1, rBeta, depth / 2); + value = search(pos, ss, rBeta - 1, rBeta, depth / 2); ss->skipNullMove = false; ss->excludedMove = MOVE_NONE; ss->bestMove = MOVE_NONE; - if (v < rBeta) + if (value < rBeta) ext = ONE_PLY; } } @@ -1067,12 +986,12 @@ split_point_start: // At split points actual search starts from here && !inCheck && !dangerous && move != ttMove - && !is_castle(move)) + && !is_castle(move) + && (bestValue > VALUE_MATED_IN_PLY_MAX || bestValue == -VALUE_INFINITE)) { // Move count based pruning if ( moveCount >= futility_move_count(depth) - && (!threatMove || !connected_threat(pos, move, threatMove)) - && bestValue > VALUE_MATED_IN_PLY_MAX) // FIXME bestValue is racy + && (!threatMove || !connected_threat(pos, move, threatMove))) { if (SpNode) lock_grab(&(sp->lock)); @@ -1090,20 +1009,13 @@ split_point_start: // At split points actual search starts from here if (futilityValue < beta) { if (SpNode) - { lock_grab(&(sp->lock)); - if (futilityValue > sp->bestValue) - sp->bestValue = bestValue = futilityValue; - } - else if (futilityValue > bestValue) - bestValue = futilityValue; continue; } // Prune moves with negative SEE at low depths if ( predictedDepth < 2 * ONE_PLY - && bestValue > VALUE_MATED_IN_PLY_MAX && pos.see_sign(move) < 0) { if (SpNode) @@ -1127,51 +1039,44 @@ split_point_start: // At split points actual search starts from here // Step 14. Make the move pos.do_move(move, st, ci, givesCheck); - // Step extra. pv search (only in PV nodes) - // The first move in list is the expected PV - if (isPvMove) - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -beta, -alpha, newDepth); - else + // Step 15. Reduced depth search (LMR). If the move fails high will be + // re-searched at full depth. + if ( depth > 3 * ONE_PLY + && !isPvMove + && !captureOrPromotion + && !dangerous + && !is_castle(move) + && ss->killers[0] != move + && ss->killers[1] != move) { - // Step 15. Reduced depth search - // If the move fails high will be re-searched at full depth. - bool doFullDepthSearch = true; - - if ( depth > 3 * ONE_PLY - && !captureOrPromotion - && !dangerous - && !is_castle(move) - && ss->killers[0] != move - && ss->killers[1] != move - && (ss->reduction = reduction(depth, moveCount)) != DEPTH_ZERO) - { - Depth d = newDepth - ss->reduction; - alpha = SpNode ? sp->alpha : alpha; + ss->reduction = reduction(depth, moveCount); + Depth d = newDepth - ss->reduction; + alpha = SpNode ? sp->alpha : alpha; - value = d < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -(alpha+1), -alpha, d); + value = d < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) + : - search(pos, ss+1, -(alpha+1), -alpha, d); - ss->reduction = DEPTH_ZERO; - doFullDepthSearch = (value > alpha); - } + doFullDepthSearch = (value > alpha && ss->reduction != DEPTH_ZERO); + ss->reduction = DEPTH_ZERO; + } + else + doFullDepthSearch = !isPvMove; - // Step 16. Full depth search - if (doFullDepthSearch) - { - alpha = SpNode ? sp->alpha : alpha; - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -(alpha+1), -alpha, newDepth); - - // 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 && (RootNode || value < beta)) - value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -beta, -alpha, newDepth); - } + // Step 16. Full depth search, when LMR is skipped or fails high + if (doFullDepthSearch) + { + alpha = SpNode ? sp->alpha : alpha; + value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) + : - search(pos, ss+1, -(alpha+1), -alpha, newDepth); } + // Only for PV nodes do a full PV search on the first move or after a fail + // high, in the latter case search only if value < beta, otherwise let the + // parent node to fail low with value <= alpha and to try another move. + if (PvNode && (isPvMove || (value > alpha && (RootNode || value < beta)))) + value = newDepth < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) + : - search(pos, ss+1, -beta, -alpha, newDepth); + // Step 17. Undo move pos.undo_move(move); @@ -1189,32 +1094,30 @@ split_point_start: // At split points actual search starts from here // was aborted because the user interrupted the search or because we // ran out of time. In this case, the return value of the search cannot // be trusted, and we don't update the best move and/or PV. - if (RootNode && !StopRequest) + if (RootNode && !Signals.stop) { - // Remember searched nodes counts for this move - RootMove* rm = Rml.find(move); - rm->nodes += pos.nodes_searched() - nodes; + RootMove& rm = *std::find(RootMoves.begin(), RootMoves.end(), move); + rm.nodes += pos.nodes_searched() - nodes; // PV move or new best move ? if (isPvMove || value > alpha) { - // Update PV - rm->score = value; - rm->extract_pv_from_tt(pos); + rm.score = value; + rm.extract_pv_from_tt(pos); // We record how often the best move has been changed in each // iteration. This information is used for time management: When // the best move changes frequently, we allocate some more time. if (!isPvMove && MultiPV == 1) - Rml.bestMoveChanges++; + BestMoveChanges++; } else // All other moves but the PV are set to the lowest value, this // is not a problem when sorting becuase sort is stable and move // position in the list is preserved, just the PV is pushed up. - rm->score = -VALUE_INFINITE; + rm.score = -VALUE_INFINITE; - } // RootNode + } if (value > bestValue) { @@ -1240,7 +1143,7 @@ split_point_start: // At split points actual search starts from here && depth >= Threads.min_split_depth() && bestValue < beta && Threads.available_slave_exists(pos.thread()) - && !StopRequest + && !Signals.stop && !thread.cutoff_occurred()) bestValue = Threads.split(pos, ss, alpha, beta, bestValue, depth, threatMove, moveCount, &mp, NT); @@ -1252,13 +1155,20 @@ split_point_start: // At split points actual search starts from here // case of StopRequest or thread.cutoff_occurred() are set, but this is // harmless because return value is discarded anyhow in the parent nodes. // If we are in a singular extension search then return a fail low score. - if (!SpNode && !moveCount) + if (!moveCount) return excludedMove ? oldAlpha : inCheck ? value_mated_in(ss->ply) : VALUE_DRAW; + // If we have pruned all the moves without searching return a fail-low score + if (bestValue == -VALUE_INFINITE) + { + assert(!playedMoveCount); + + bestValue = alpha; + } + // Step 21. Update tables - // If the search is not aborted, update the transposition table, - // history counters, and killer moves. - if (!SpNode && !StopRequest && !thread.cutoff_occurred()) + // Update transposition table entry, history and killers + if (!SpNode && !Signals.stop && !thread.cutoff_occurred()) { move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove; vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER @@ -1292,12 +1202,13 @@ split_point_start: // At split points actual search starts from here return bestValue; } + // qsearch() is the quiescence search function, which is called by the main // search function when the remaining depth is zero (or, to be more precise, // less than ONE_PLY). template - Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth) { + Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) { const bool PvNode = (NT == PV); @@ -1372,7 +1283,6 @@ split_point_start: // At split points actual search starts from here if (PvNode && bestValue > alpha) alpha = bestValue; - // Futility pruning parameters, not needed when in check futilityBase = ss->eval + evalMargin + FutilityMarginQS; enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; } @@ -1454,7 +1364,6 @@ split_point_start: // At split points actual search starts from here if (!pos.pl_move_is_legal(move, ci.pinned)) continue; - // Update current move ss->currentMove = move; // Make and search the move @@ -1675,8 +1584,8 @@ split_point_start: // At split points actual search starts from here } - // can_return_tt() returns true if a transposition table score - // can be used to cut-off at a given point in search. + // can_return_tt() returns true if a transposition table score can be used to + // cut-off at a given point in search. bool can_return_tt(const TTEntry* tte, Depth depth, Value beta, int ply) { @@ -1691,8 +1600,8 @@ split_point_start: // At split points actual search starts from here } - // refine_eval() returns the transposition table score if - // possible otherwise falls back on static position evaluation. + // refine_eval() returns the transposition table score if possible, otherwise + // falls back on static position evaluation. Value refine_eval(const TTEntry* tte, Value defaultEval, int ply) { @@ -1708,8 +1617,8 @@ split_point_start: // At split points actual search starts from here } - // update_history() registers a good move that produced a beta-cutoff - // in history and marks as failures all the other moves of that ply. + // update_history() registers a good move that produced a beta-cutoff in + // history and marks as failures all the other moves of that ply. void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount) { @@ -1732,12 +1641,12 @@ split_point_start: // At split points actual search starts from here // current_search_time() returns the number of milliseconds which have passed // since the beginning of the current search. - int elapsed_search_time(int set) { + int elapsed_time(bool reset) { static int searchStartTime; - if (set) - searchStartTime = set; + if (reset) + searchStartTime = get_system_time(); return get_system_time() - searchStartTime; } @@ -1765,53 +1674,49 @@ split_point_start: // At split points actual search starts from here } - // speed_to_uci() returns a string with time stats of current search suitable - // to be sent to UCI gui. - - string speed_to_uci(int64_t nodes) { + // pv_info_to_uci() sends search info to GUI. UCI protocol requires to send all + // the PV lines also if are still to be searched and so refer to the previous + // search score. - std::stringstream s; - int t = elapsed_search_time(); + void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta) { - s << " nodes " << nodes - << " nps " << (t > 0 ? int(nodes * 1000 / t) : 0) - << " time " << t; + int t = elapsed_time(); + int selDepth = 0; - return s.str(); - } + for (int i = 0; i < Threads.size(); i++) + if (Threads[i].maxPly > selDepth) + selDepth = Threads[i].maxPly; - // pv_to_uci() returns a string with information on the current PV line - // formatted according to UCI specification. + for (size_t i = 0; i < std::min(UCIMultiPV, RootMoves.size()); i++) + { + bool updated = (i <= PVIdx); - string pv_to_uci(const Move pv[], int pvNum, bool chess960) { + if (depth == 1 && !updated) + continue; - std::stringstream s; + int d = (updated ? depth : depth - 1); + Value s = (updated ? RootMoves[i].score : RootMoves[i].prevScore); - s << " multipv " << pvNum << " pv " << set960(chess960); + cout << "info" + << " depth " << d + << " seldepth " << selDepth + << (i == PVIdx ? score_to_uci(s, alpha, beta) : score_to_uci(s)) + << " nodes " << pos.nodes_searched() + << " nps " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0) + << " time " << t + << " multipv " << i + 1 << " pv"; - for ( ; *pv != MOVE_NONE; pv++) - s << *pv << " "; + for (int j = 0; RootMoves[i].pv[j] != MOVE_NONE; j++) + cout << " " << RootMoves[i].pv[j]; - return s.str(); + cout << endl; + } } - // depth_to_uci() returns a string with information on the current depth and - // seldepth formatted according to UCI specification. - - string depth_to_uci(Depth depth) { - - std::stringstream s; - - // Retrieve max searched depth among threads - int selDepth = 0; - for (int i = 0; i < Threads.size(); i++) - if (Threads[i].maxPly > selDepth) - selDepth = Threads[i].maxPly; - - s << " depth " << depth / ONE_PLY << " seldepth " << selDepth; - return s.str(); - } + // pv_info_to_log() writes human-readable search information to the log file + // (which is created when the UCI parameter "Use Search Log" is "true"). It + // uses the two below helpers to pretty format time and score respectively. string time_to_string(int millisecs) { @@ -1827,7 +1732,8 @@ split_point_start: // At split points actual search starts from here if (hours) s << hours << ':'; - s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds; + s << std::setfill('0') << std::setw(2) << minutes << ':' + << std::setw(2) << seconds; return s.str(); } @@ -1840,29 +1746,23 @@ split_point_start: // At split points actual search starts from here else if (v <= VALUE_MATED_IN_PLY_MAX) s << "-#" << (VALUE_MATE + v) / 2; else - s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame; + s << std::setprecision(2) << std::fixed << std::showpos + << float(v) / PawnValueMidgame; return s.str(); } - // pretty_pv() creates a human-readable string from a position and a PV. - // It is used to write search information to the log file (which is created - // when the UCI parameter "Use Search Log" is "true"). - - string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { + void pv_info_to_log(Position& pos, int depth, Value value, int time, Move pv[]) { const int64_t K = 1000; const int64_t M = 1000000; - const int startColumn = 28; - const size_t maxLength = 80 - startColumn; StateInfo state[PLY_MAX_PLUS_2], *st = state; Move* m = pv; - string san; + string san, padding; + size_t length; std::stringstream s; - size_t length = 0; - // First print depth, score, time and searched nodes... s << set960(pos.is_chess960()) << std::setw(2) << depth << std::setw(8) << score_to_string(value) @@ -1870,134 +1770,85 @@ split_point_start: // At split points actual search starts from here if (pos.nodes_searched() < M) s << std::setw(8) << pos.nodes_searched() / 1 << " "; + else if (pos.nodes_searched() < K * M) s << std::setw(7) << pos.nodes_searched() / K << "K "; + else s << std::setw(7) << pos.nodes_searched() / M << "M "; - // ...then print the full PV line in short algebraic notation + padding = string(s.str().length(), ' '); + length = padding.length(); + while (*m != MOVE_NONE) { san = move_to_san(pos, *m); - length += san.length() + 1; - if (length > maxLength) + if (length + san.length() > 80) { - length = san.length() + 1; - s << "\n" + string(startColumn, ' '); + s << "\n" + padding; + length = padding.length(); } + s << san << ' '; + length += san.length() + 1; pos.do_move(*m++, *st++); } - // Restore original position before to leave - while (m != pv) pos.undo_move(*--m); + while (m != pv) + pos.undo_move(*--m); - return s.str(); - } - - - // 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 (that raise StopRequest) is - // sent, and return, after which the bestmove and pondermove will be printed. - - void wait_for_stop_or_ponderhit() { - - string cmd; - StopOnPonderhit = true; - - while (!StopRequest) - { - Threads.getline(cmd); - do_uci_async_cmd(cmd); - } + Log l(Options["Search Log Filename"].value()); + l << s.str() << endl; } // When playing with strength handicap choose best move among the MultiPV set // using a statistical rule dependent on SkillLevel. Idea by Heinz van Saanen. - void do_skill_level(Move* best, Move* ponder) { + + Move do_skill_level() { assert(MultiPV > 1); static RKISS rk; - // Rml list is already sorted by score in descending order - int s; - int max_s = -VALUE_INFINITE; - int size = std::min(MultiPV, (int)Rml.size()); - int max = Rml[0].score; - int var = std::min(max - Rml[size - 1].score, int(PawnValueMidgame)); - int wk = 120 - 2 * SkillLevel; - - // PRNG sequence should be non deterministic + // PRNG sequence should be not deterministic for (int i = abs(get_system_time() % 50); i > 0; i--) rk.rand(); - // Choose best move. For each move's score we add two terms both dependent - // on wk, one deterministic and bigger for weaker moves, and one random, + // Rml list is already sorted by score in descending order + size_t size = std::min(MultiPV, RootMoves.size()); + int variance = std::min(RootMoves[0].score - RootMoves[size - 1].score, PawnValueMidgame); + int weakness = 120 - 2 * SkillLevel; + int max_s = -VALUE_INFINITE; + Move best = MOVE_NONE; + + // Choose best move. For each move score we add two terms both dependent on + // weakness, one deterministic and bigger for weaker moves, and one random, // then we choose the move with the resulting highest score. - for (int i = 0; i < size; i++) + for (size_t i = 0; i < size; i++) { - s = Rml[i].score; + int s = RootMoves[i].score; // Don't allow crazy blunders even at very low skills - if (i > 0 && Rml[i-1].score > s + EasyMoveMargin) + if (i > 0 && RootMoves[i-1].score > s + EasyMoveMargin) break; - // This is our magical formula - s += ((max - s) * wk + var * (rk.rand() % wk)) / 128; + // This is our magic formula + s += ( weakness * int(RootMoves[0].score - s) + + variance * (rk.rand() % weakness)) / 128; if (s > max_s) { max_s = s; - *best = Rml[i].pv[0]; - *ponder = Rml[i].pv[1]; + best = RootMoves[i].pv[0]; } } + return best; } - /// RootMove and RootMoveList method's definitions - - void RootMoveList::init(Position& pos, Move searchMoves[]) { - - Move* sm; - bestMoveChanges = 0; - clear(); - - // Generate all legal moves and add them to RootMoveList - for (MoveList ml(pos); !ml.end(); ++ml) - { - // If we have a searchMoves[] list then verify the move - // is in the list before to add it. - for (sm = searchMoves; *sm && *sm != ml.move(); sm++) {} - - if (sm != searchMoves && *sm != ml.move()) - continue; - - RootMove rm; - rm.pv.push_back(ml.move()); - rm.pv.push_back(MOVE_NONE); - rm.score = rm.prevScore = -VALUE_INFINITE; - rm.nodes = 0; - push_back(rm); - } - } - - RootMove* RootMoveList::find(const Move& m, int startIndex) { - - for (size_t i = startIndex; i < size(); i++) - if ((*this)[i].pv[0] == m) - return &(*this)[i]; - - return NULL; - } - // extract_pv_from_tt() builds a PV by adding moves from the transposition table. // We consider also failing high nodes and not only VALUE_TYPE_EXACT nodes. This // allow to always have a ponder move even when we fail high at root and also a @@ -2032,6 +1883,7 @@ split_point_start: // At split points actual search starts from here do pos.undo_move(pv[--ply]); while (ply); } + // insert_pv_in_tt() is called at the end of a search iteration, and inserts // the PV back into the TT. This makes sure the old PV moves are searched // first, even if the old TT entries have been overwritten. @@ -2044,7 +1896,7 @@ split_point_start: // At split points actual search starts from here Value v, m = VALUE_NONE; int ply = 0; - assert(pv[0] != MOVE_NONE && pos.is_pseudo_legal(pv[0])); + assert(pv[ply] != MOVE_NONE && pos.is_pseudo_legal(pv[ply])); do { k = pos.get_key(); @@ -2062,25 +1914,13 @@ split_point_start: // At split points actual search starts from here do pos.undo_move(pv[--ply]); while (ply); } -} // namespace - - -// Little helper used by idle_loop() to check that all the slave threads of a -// split point have finished searching. - -static bool all_slaves_finished(SplitPoint* sp) { - - for (int i = 0; i < Threads.size(); i++) - if (sp->is_slave[i]) - return false; - return true; -} +} // namespace -// Thread::idle_loop() is where the thread is parked when it has no work to do. -// The parameter 'sp', if non-NULL, is a pointer to an active SplitPoint object -// for which the thread is the master. +/// Thread::idle_loop() is where the thread is parked when it has no work to do. +/// The parameter 'sp', if non-NULL, is a pointer to an active SplitPoint object +/// for which the thread is the master. void Thread::idle_loop(SplitPoint* sp) { @@ -2094,7 +1934,6 @@ void Thread::idle_loop(SplitPoint* sp) { { assert((!sp && threadID) || Threads.use_sleeping_threads()); - // Slave thread should exit as soon as do_terminate flag raises if (do_terminate) { assert(!sp); @@ -2105,7 +1944,7 @@ void Thread::idle_loop(SplitPoint* sp) { lock_grab(&sleepLock); // If we are master and all slaves have finished don't go to sleep - if (sp && all_slaves_finished(sp)) + if (sp && Threads.split_point_finished(sp)) { lock_release(&sleepLock); break; @@ -2127,11 +1966,11 @@ void Thread::idle_loop(SplitPoint* sp) { assert(!do_terminate); // Copy split point position and search stack and call search() - SearchStack ss[PLY_MAX_PLUS_2]; + Stack ss[PLY_MAX_PLUS_2]; SplitPoint* tsp = splitPoint; Position pos(*tsp->pos, threadID); - memcpy(ss, tsp->ss - 1, 4 * sizeof(SearchStack)); + memcpy(ss, tsp->ss - 1, 4 * sizeof(Stack)); (ss+1)->sp = tsp; if (tsp->nodeType == Root) @@ -2157,7 +1996,7 @@ void Thread::idle_loop(SplitPoint* sp) { // If this thread is the master of a split point and all slaves have // finished their work at this split point, return from the idle loop. - if (sp && all_slaves_finished(sp)) + if (sp && Threads.split_point_finished(sp)) { // Because sp->is_slave[] is reset under lock protection, // be sure sp->lock has been released before to return. @@ -2169,39 +2008,16 @@ 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 +/// do_timer_event() is called by the timer thread when the timer triggers. It +/// is used to print debug info and, more important, to detect when we are out of +/// available time and so stop the search. void do_timer_event() { static int lastInfoTime; - int e = elapsed_search_time(); + int e = elapsed_time(); - // Print debug information every second - if (get_system_time() - lastInfoTime >= 1000) + if (get_system_time() - lastInfoTime >= 1000 || !lastInfoTime) { lastInfoTime = get_system_time(); @@ -2209,12 +2025,11 @@ void do_timer_event() { dbg_print_hit_rate(); } - // Should we stop the search? if (Limits.ponder) return; - bool stillAtFirstMove = FirstRootMove - && !AspirationFailLow + bool stillAtFirstMove = Signals.firstRootMove + && !Signals.failedLowAtRoot && e > TimeMgr.available_time(); bool noMoreTime = e > TimeMgr.maximum_time() @@ -2223,5 +2038,5 @@ void do_timer_event() { if ( (Limits.useTimeManagement() && noMoreTime) || (Limits.maxTime && e >= Limits.maxTime) /* missing nodes limit */ ) // FIXME - StopRequest = true; + Signals.stop = true; }