X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=c013042aecf9032c8286580f5bb26b8f8764b15b;hp=b4cae3a07ac0194ef39f7259ad0ed41a3eaeee53;hb=bd59560480cc4f43a4ba75dc827ba27bcebb92dd;hpb=69067e1988ea945977d586a1442a22be0b55671a diff --git a/src/movepick.cpp b/src/movepick.cpp index b4cae3a0..c013042a 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -25,12 +25,15 @@ namespace { enum Stages { - MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES, - EVASION, EVASIONS_INIT, ALL_EVASIONS, - PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES, - QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES + MAIN_TT, CAPTURE_INIT, GOOD_CAPTURE, KILLER0, KILLER1, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURE, + EVASION_TT, EVASION_INIT, EVASION, + PROBCUT_TT, PROBCUT_INIT, PROBCUT, + QSEARCH_TT, QCAPTURE_INIT, QCAPTURE, QCHECK_INIT, QCHECK }; + // Helper filter used with select_move() + const auto Any = [](){ return true; }; + // partial_insertion_sort() sorts moves in descending order up to and including // a given limit. The order of moves smaller than the limit is left unspecified. void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) { @@ -46,15 +49,6 @@ namespace { } } - // pick_best() finds the best move in the range (begin, end) and moves it to - // the front. It's faster than sorting all the moves in advance when there - // are few moves, e.g., the possible captures. - Move pick_best(ExtMove* begin, ExtMove* end) { - - std::swap(*begin, *std::max_element(begin, end)); - return *begin; - } - } // namespace @@ -67,36 +61,27 @@ namespace { /// MovePicker constructor for the main search MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers_p) - : pos(p), mainHistory(mh), captureHistory(cph), contHistory(ch), countermove(cm), - killers{killers_p[0], killers_p[1]}, depth(d){ + : pos(p), mainHistory(mh), captureHistory(cph), contHistory(ch), + refutations{killers_p[0], killers_p[1], cm}, depth(d){ assert(d > DEPTH_ZERO); - stage = pos.checkers() ? EVASION : MAIN_SEARCH; + stage = pos.checkers() ? EVASION_TT : MAIN_TT; ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; stage += (ttMove == MOVE_NONE); } /// MovePicker constructor for quiescence search -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, const CapturePieceToHistory* cph, Square s) - : pos(p), mainHistory(mh), captureHistory(cph), depth(d) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, + const CapturePieceToHistory* cph, Square rs) + : pos(p), mainHistory(mh), captureHistory(cph), recaptureSquare(rs), depth(d) { assert(d <= DEPTH_ZERO); - if (pos.checkers()) - stage = EVASION; - - else if (d > DEPTH_QS_RECAPTURES) - stage = QSEARCH; - - else - { - stage = QSEARCH_RECAPTURES; - recaptureSquare = s; - return; - } - - ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; + stage = pos.checkers() ? EVASION_TT : QSEARCH_TT; + ttMove = ttm + && pos.pseudo_legal(ttm) + && (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare) ? ttm : MOVE_NONE; stage += (ttMove == MOVE_NONE); } @@ -107,18 +92,17 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePiece assert(!pos.checkers()); - stage = PROBCUT; + stage = PROBCUT_TT; ttMove = ttm && pos.pseudo_legal(ttm) && pos.capture(ttm) && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE; - stage += (ttMove == MOVE_NONE); } -/// score() assigns a numerical value to each move in a list, used for sorting. -/// Captures are ordered by Most Valuable Victim (MVV), preferring captures -/// with a good history. Quiets are ordered using the histories. +/// MovePicker::score() assigns a numerical value to each move in a list, used +/// for sorting. Captures are ordered by Most Valuable Victim (MVV), preferring +/// captures with a good history. Quiets moves are ordered using the histories. template void MovePicker::score() { @@ -127,7 +111,7 @@ void MovePicker::score() { for (auto& m : *this) if (Type == CAPTURES) m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - + Value((*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))]); + + (*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))]; else if (Type == QUIETS) m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] @@ -145,71 +129,72 @@ void MovePicker::score() { } } -/// next_move() is the most important method of the MovePicker class. It returns -/// a new pseudo legal move every time it is called, until there are no more moves -/// left. It picks the move with the biggest value from a list of generated moves -/// taking care not to return the ttMove if it has already been searched. +/// MovePicker::select_move() returns the next move satisfying a predicate function +template +Move MovePicker::select_move(Pred filter) { -Move MovePicker::next_move(bool skipQuiets) { + while (cur < endMoves) + { + if (T == BEST_SCORE) + std::swap(*cur, *std::max_element(cur, endMoves)); + + move = *cur++; + + if (move != ttMove && filter()) + return move; + } + return move = MOVE_NONE; +} - Move move; +/// MovePicker::next_move() is the most important method of the MovePicker class. It +/// returns a new pseudo legal move every time it is called, until there are no more +/// moves left. It picks the move with the highest score from a list of generated moves. +Move MovePicker::next_move(bool skipQuiets) { +top: switch (stage) { - case MAIN_SEARCH: case EVASION: case QSEARCH: case PROBCUT: + case MAIN_TT: + case EVASION_TT: + case QSEARCH_TT: + case PROBCUT_TT: ++stage; return ttMove; - case CAPTURES_INIT: + case CAPTURE_INIT: + case PROBCUT_INIT: + case QCAPTURE_INIT: endBadCaptures = cur = moves; endMoves = generate(pos, cur); score(); ++stage; - /* fallthrough */ + goto top; - case GOOD_CAPTURES: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if (move != ttMove) - { - if (pos.see_ge(move, Value(-55 * (cur-1)->value / 1024))) - return move; - - // Losing capture, move it to the beginning of the array - *endBadCaptures++ = move; - } - } - - ++stage; - move = killers[0]; // First killer move - if ( move != MOVE_NONE - && move != ttMove - && pos.pseudo_legal(move) - && !pos.capture(move)) + case GOOD_CAPTURE: + if (select_move([&](){ return pos.see_ge(move, Value(-55 * (cur-1)->value / 1024)) ? + // Move losing capture to endBadCaptures to be tried later + true : (*endBadCaptures++ = move, false); })) return move; - /* fallthrough */ - case KILLERS: + // If the countermove is the same as a killer, skip it + if ( refutations[0] == refutations[2] + || refutations[1] == refutations[2]) + refutations[2] = MOVE_NONE; ++stage; - move = killers[1]; // Second killer move - if ( move != MOVE_NONE - && move != ttMove - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; /* fallthrough */ + case KILLER0: + case KILLER1: case COUNTERMOVE: - ++stage; - move = countermove; - if ( move != MOVE_NONE - && move != ttMove - && move != killers[0] - && move != killers[1] - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; + while (stage <= COUNTERMOVE) + { + move = refutations[ stage++ - KILLER0]; + if ( move != MOVE_NONE + && move != ttMove + && pos.pseudo_legal(move) + && !pos.capture(move)) + return move; + } /* fallthrough */ case QUIET_INIT: @@ -221,107 +206,55 @@ Move MovePicker::next_move(bool skipQuiets) { /* fallthrough */ case QUIET: - if (!skipQuiets) - while (cur < endMoves) - { - move = *cur++; - - if ( move != ttMove - && move != killers[0] - && move != killers[1] - && move != countermove) - return move; - } + if ( !skipQuiets + && select_move([&](){return move != refutations[0] + && move != refutations[1] + && move != refutations[2];})) + return move; + + // Point to beginning and end of bad captures + cur = moves, endMoves = endBadCaptures; ++stage; - cur = moves; // Point to beginning of bad captures /* fallthrough */ - case BAD_CAPTURES: - if (cur < endBadCaptures) - return *cur++; - break; + case BAD_CAPTURE: + return select_move(Any); - case EVASIONS_INIT: + case EVASION_INIT: cur = moves; endMoves = generate(pos, cur); score(); ++stage; /* fallthrough */ - case ALL_EVASIONS: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if (move != ttMove) - return move; - } - break; + case EVASION: + return select_move(Any); - case PROBCUT_INIT: - cur = moves; - endMoves = generate(pos, cur); - score(); - ++stage; - /* fallthrough */ + case PROBCUT: + return select_move([&](){ return pos.see_ge(move, threshold); }); - case PROBCUT_CAPTURES: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if ( move != ttMove - && pos.see_ge(move, threshold)) - return move; - } - break; + case QCAPTURE: + if (select_move([&](){ return depth > DEPTH_QS_RECAPTURES + || to_sq(move) == recaptureSquare; })) + return move; - case QCAPTURES_INIT: - cur = moves; - endMoves = generate(pos, cur); - score(); - ++stage; - /* fallthrough */ + // If we did not find any move and we do not try checks, we have finished + if (depth != DEPTH_QS_CHECKS) + return MOVE_NONE; - case QCAPTURES: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if (move != ttMove) - return move; - } - if (depth <= DEPTH_QS_NO_CHECKS) - break; - cur = moves; - endMoves = generate(pos, cur); ++stage; /* fallthrough */ - case QCHECKS: - while (cur < endMoves) - { - move = cur++->move; - if (move != ttMove) - return move; - } - break; - - case QSEARCH_RECAPTURES: + case QCHECK_INIT: cur = moves; - endMoves = generate(pos, cur); + endMoves = generate(pos, cur); ++stage; /* fallthrough */ - case QRECAPTURES: - while (cur < endMoves) - { - move = *cur++; - if (to_sq(move) == recaptureSquare) - return move; - } - break; - - default: - assert(false); + case QCHECK: + return select_move(Any); } - return MOVE_NONE; + assert(false); + return MOVE_NONE; // Silence warning }