X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=e26f42ef98cdef9ba5dba7b1bfbe8682356bcd41;hp=6b9f2be059c73cfcf62389a80bd0c5877a293681;hb=6c1af710d16c6a358cc09c51a133120605c39e44;hpb=0c1f119069bf915b85126159d4865c4bcc532239 diff --git a/src/movepick.cpp b/src/movepick.cpp index 6b9f2be0..e26f42ef 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2020 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,17 +21,14 @@ #include #include "movepick.h" -#include "thread.h" 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_WITH_CHECKS, QCAPTURES_1_INIT, QCAPTURES_1, QCHECKS, - QSEARCH_NO_CHECKS, QCAPTURES_2_INIT, QCAPTURES_2, - QSEARCH_RECAPTURES, QRECAPTURES + MAIN_TT, CAPTURE_INIT, GOOD_CAPTURE, REFUTATION, QUIET_INIT, QUIET, BAD_CAPTURE, + EVASION_TT, EVASION_INIT, EVASION, + PROBCUT_TT, PROBCUT_INIT, PROBCUT, + QSEARCH_TT, QCAPTURE_INIT, QCAPTURE, QCHECK_INIT, QCHECK }; // partial_insertion_sort() sorts moves in descending order up to and including @@ -49,15 +46,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,291 +55,212 @@ namespace { /// search captures, promotions, and some checks) and how important good move /// ordering is at the current node. -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s) - : pos(p), ss(s), depth(d) { +/// MovePicker constructor for the main search +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, const LowPlyHistory* lp, + const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers, int pl) + : pos(p), mainHistory(mh), lowPlyHistory(lp), captureHistory(cph), continuationHistory(ch), + ttMove(ttm), refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, depth(d), ply(pl) { - assert(d > DEPTH_ZERO); + assert(d > 0); - Square prevSq = to_sq((ss-1)->currentMove); - countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq]; - killers[0] = ss->killers[0]; - killers[1] = ss->killers[1]; - - stage = pos.checkers() ? EVASION : MAIN_SEARCH; - ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; - stage += (ttMove == MOVE_NONE); + stage = (pos.checkers() ? EVASION_TT : MAIN_TT) + + !(ttm && pos.pseudo_legal(ttm)); } -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s) - : pos(p) { - - assert(d <= DEPTH_ZERO); +/// MovePicker constructor for quiescence search +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, + const CapturePieceToHistory* cph, const PieceToHistory** ch, Square rs) + : pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch), ttMove(ttm), recaptureSquare(rs), depth(d) { - if (pos.checkers()) - stage = EVASION; - - else if (d > DEPTH_QS_NO_CHECKS) - stage = QSEARCH_WITH_CHECKS; - - else if (d > DEPTH_QS_RECAPTURES) - stage = QSEARCH_NO_CHECKS; - - else - { - stage = QSEARCH_RECAPTURES; - recaptureSquare = s; - return; - } + assert(d <= 0); - ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; - stage += (ttMove == MOVE_NONE); + stage = (pos.checkers() ? EVASION_TT : QSEARCH_TT) + + !(ttm && (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare) + && pos.pseudo_legal(ttm)); } -MovePicker::MovePicker(const Position& p, Move ttm, Value th) - : pos(p), threshold(th) { +/// MovePicker constructor for ProbCut: we generate captures with SEE greater +/// than or equal to the given threshold. +MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePieceToHistory* cph) + : pos(p), captureHistory(cph), ttMove(ttm), threshold(th) { assert(!pos.checkers()); - stage = PROBCUT; - - // In ProbCut we generate captures with SEE higher than or equal to the given threshold - ttMove = ttm - && pos.pseudo_legal(ttm) - && pos.capture(ttm) - && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE; - - stage += (ttMove == MOVE_NONE); + stage = PROBCUT_TT + !(ttm && pos.capture(ttm) + && pos.pseudo_legal(ttm) + && pos.see_ge(ttm, threshold)); } +/// 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() { -/// score() assigns a numerical value to each move in a move list. The moves with -/// highest values will be picked first. -template<> -void MovePicker::score() { - // Winning and equal captures in the main search are ordered by MVV, preferring - // captures near our home rank. Surprisingly, this appears to perform slightly - // better than SEE-based move ordering: exchanging big pieces before capturing - // a hanging piece probably helps to reduce the subtree size. - // In the main search we want to push captures with negative SEE values to the - // badCaptures[] array, but instead of doing it now we delay until the move - // has been picked up, saving some SEE calls in case we get a cutoff. - for (auto& m : *this) - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(200 * relative_rank(pos.side_to_move(), to_sq(m))); -} - -template<> -void MovePicker::score() { - - const HistoryStats& history = pos.this_thread()->history; - - const CounterMoveStats& cmh = *(ss-1)->counterMoves; - const CounterMoveStats& fmh = *(ss-2)->counterMoves; - const CounterMoveStats& fm2 = *(ss-4)->counterMoves; - - Color c = pos.side_to_move(); + static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type"); for (auto& m : *this) - m.value = cmh[pos.moved_piece(m)][to_sq(m)] - + fmh[pos.moved_piece(m)][to_sq(m)] - + fm2[pos.moved_piece(m)][to_sq(m)] - + history.get(c, m); + if (Type == CAPTURES) + m.value = int(PieceValue[MG][pos.piece_on(to_sq(m))]) * 6 + + (*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)] + + 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)] + + 2 * (*continuationHistory[1])[pos.moved_piece(m)][to_sq(m)] + + 2 * (*continuationHistory[3])[pos.moved_piece(m)][to_sq(m)] + + (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)] + + (ply < MAX_LPH ? 4 * (*lowPlyHistory)[ply][from_to(m)] : 0); + + else // Type == EVASIONS + { + if (pos.capture(m)) + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); + else + m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] + + (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)] + - (1 << 28); + } } -template<> -void MovePicker::score() { - // Try captures ordered by MVV/LVA, then non-captures ordered by stats heuristics - const HistoryStats& history = pos.this_thread()->history; - Color c = pos.side_to_move(); +/// MovePicker::select() returns the next move satisfying a predicate function. +/// It never returns the TT move. +template +Move MovePicker::select(Pred filter) { - for (auto& m : *this) - if (pos.capture(m)) - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; - else - m.value = history.get(c, m); -} + while (cur < endMoves) + { + if (T == Best) + std::swap(*cur, *std::max_element(cur, endMoves)); + if (*cur != ttMove && filter()) + return *cur++; -/// 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. + cur++; + } + return MOVE_NONE; +} +/// 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, picking the move with the highest score from a list of generated moves. Move MovePicker::next_move(bool skipQuiets) { - Move move; - +top: switch (stage) { - case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS: - case QSEARCH_NO_CHECKS: case PROBCUT: + case MAIN_TT: + case EVASION_TT: + case QSEARCH_TT: + case PROBCUT_TT: ++stage; return ttMove; - case CAPTURES_INIT: - endBadCaptures = cur = moves; + case CAPTURE_INIT: + case PROBCUT_INIT: + case QCAPTURE_INIT: + cur = endBadCaptures = 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)) - return move; - - // Losing capture, move it to the beginning of the array - *endBadCaptures++ = move; - } - } + case GOOD_CAPTURE: + if (select([&](){ + return pos.see_ge(*cur, Value(-69 * cur->value / 1024)) ? + // Move losing capture to endBadCaptures to be tried later + true : (*endBadCaptures++ = *cur, false); })) + return *(cur - 1); - ++stage; - move = killers[0]; // First killer move - if ( move != MOVE_NONE - && move != ttMove - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; - /* fallthrough */ + // Prepare the pointers to loop over the refutations array + cur = std::begin(refutations); + endMoves = std::end(refutations); + + // If the countermove is the same as a killer, skip it + if ( refutations[0].move == refutations[2].move + || refutations[1].move == refutations[2].move) + --endMoves; - case KILLERS: ++stage; - move = killers[1]; // Second killer move - if ( move != MOVE_NONE - && move != ttMove - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; /* fallthrough */ - case COUNTERMOVE: + case REFUTATION: + if (select([&](){ return *cur != MOVE_NONE + && !pos.capture(*cur) + && pos.pseudo_legal(*cur); })) + return *(cur - 1); ++stage; - move = countermove; - if ( move != MOVE_NONE - && move != ttMove - && move != killers[0] - && move != killers[1] - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; /* fallthrough */ case QUIET_INIT: - cur = endBadCaptures; - endMoves = generate(pos, cur); - score(); - partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY); + if (!skipQuiets) + { + cur = endBadCaptures; + endMoves = generate(pos, cur); + + score(); + partial_insertion_sort(cur, endMoves, -3000 * depth); + } + ++stage; /* fallthrough */ case QUIET: - while ( cur < endMoves - && (!skipQuiets || cur->value >= VALUE_ZERO)) - { - move = *cur++; + if ( !skipQuiets + && select([&](){return *cur != refutations[0].move + && *cur != refutations[1].move + && *cur != refutations[2].move;})) + return *(cur - 1); + + // Prepare the pointers to loop over the bad captures + cur = moves; + endMoves = endBadCaptures; - if ( move != ttMove - && move != killers[0] - && move != killers[1] - && move != countermove) - return move; - } ++stage; - cur = moves; // Point to beginning of bad captures /* fallthrough */ - case BAD_CAPTURES: - if (cur < endBadCaptures) - return *cur++; - break; + case BAD_CAPTURE: + return select([](){ return true; }); - 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([](){ return true; }); - case PROBCUT_INIT: - cur = moves; - endMoves = generate(pos, cur); - score(); - ++stage; - /* fallthrough */ + case PROBCUT: + return select([&](){ return pos.see_ge(*cur, 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([&](){ return depth > DEPTH_QS_RECAPTURES + || to_sq(*cur) == recaptureSquare; })) + return *(cur - 1); + + // 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_1_INIT: case QCAPTURES_2_INIT: - cur = moves; - endMoves = generate(pos, cur); - score(); ++stage; /* fallthrough */ - case QCAPTURES_1: case QCAPTURES_2: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if (move != ttMove) - return move; - } - if (stage == QCAPTURES_2) - break; + case QCHECK_INIT: 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: - cur = moves; - endMoves = generate(pos, cur); - score(); ++stage; /* fallthrough */ - case QRECAPTURES: - while (cur < endMoves) - { - move = pick_best(cur++, endMoves); - if (to_sq(move) == recaptureSquare) - return move; - } - break; - - default: - assert(false); + case QCHECK: + return select([](){ return true; }); } - return MOVE_NONE; + assert(false); + return MOVE_NONE; // Silence warning }