X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=694b9222fe573945c826e627865e6b4d5565f58c;hb=HEAD;hp=face865af823be4309803b19faf61b5782447a26;hpb=36f2133df3e5aea1436a17ae20f3a0d488be31bd;p=stockfish diff --git a/src/movepick.cpp b/src/movepick.cpp index face865a..0267a8e2 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -1,14 +1,12 @@ /* 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) 2004-2023 The Stockfish developers (see AUTHORS file) Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,338 +16,351 @@ along with this program. If not, see . */ -#include - #include "movepick.h" -#include "thread.h" - -namespace { - - enum Stages { - MAIN_SEARCH, CAPTURES_S1, KILLERS_S1, QUIETS_1_S1, QUIETS_2_S1, BAD_CAPTURES_S1, - EVASION, EVASIONS_S2, - QSEARCH_0, CAPTURES_S3, QUIET_CHECKS_S3, - QSEARCH_1, CAPTURES_S4, - PROBCUT, CAPTURES_S5, - RECAPTURE, CAPTURES_S6, - STOP - }; - - // Our insertion sort, which is guaranteed to be stable, as it should be - void insertion_sort(ExtMove* begin, ExtMove* end) - { - ExtMove tmp, *p, *q; - - for (p = begin + 1; p < end; ++p) - { - tmp = *p; - for (q = p; q != begin && *(q-1) < tmp; --q) - *q = *(q-1); - *q = tmp; - } - } - - // 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. - inline Move pick_best(ExtMove* begin, ExtMove* end) - { - std::swap(*begin, *std::max_element(begin, end)); - return *begin; - } - -} // namespace - - -/// Constructors of the MovePicker class. As arguments we pass information -/// to help it to return the (presumably) good moves first, to decide which -/// moves to return (in the quiescence search, for instance, we only want to -/// 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, const HistoryStats& h, const CounterMovesHistoryStats& cmh, - Move cm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) { - - assert(d > DEPTH_ZERO); - - endBadCaptures = moves + MAX_MOVES - 1; - countermove = cm; - ss = s; - - if (pos.checkers()) - stage = EVASION; - - else - stage = MAIN_SEARCH; - - ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); - endMoves += (ttMove != MOVE_NONE); -} - -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh, - Square s) : pos(p), history(h), counterMovesHistory(cmh) { - - assert(d <= DEPTH_ZERO); - - if (pos.checkers()) - stage = EVASION; - - else if (d > DEPTH_QS_NO_CHECKS) - stage = QSEARCH_0; - - else if (d > DEPTH_QS_RECAPTURES) - stage = QSEARCH_1; - else - { - stage = RECAPTURE; - recaptureSquare = s; - ttm = MOVE_NONE; - } - - ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); - endMoves += (ttMove != MOVE_NONE); -} - -MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, const CounterMovesHistoryStats& cmh, PieceType pt) - : pos(p), history(h), counterMovesHistory(cmh) { - - assert(!pos.checkers()); +#include +#include +#include +#include - stage = PROBCUT; +#include "bitboard.h" +#include "position.h" - // In ProbCut we generate only captures that are better than the parent's - // captured piece. - captureThreshold = PieceValue[MG][pt]; - ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); +namespace Stockfish { - if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold)) - ttMove = MOVE_NONE; +namespace { - endMoves += (ttMove != MOVE_NONE); +enum Stages { + // generate main search moves + MAIN_TT, + CAPTURE_INIT, + GOOD_CAPTURE, + REFUTATION, + QUIET_INIT, + QUIET, + BAD_CAPTURE, + + // generate evasion moves + EVASION_TT, + EVASION_INIT, + EVASION, + + // generate probcut moves + PROBCUT_TT, + PROBCUT_INIT, + PROBCUT, + + // generate qsearch moves + QSEARCH_TT, + QCAPTURE_INIT, + QCAPTURE, + QCHECK_INIT, + QCHECK +}; + +// Sort 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) { + + for (ExtMove *sortedEnd = begin, *p = begin + 1; p < end; ++p) + if (p->value >= limit) + { + ExtMove tmp = *p, *q; + *p = *++sortedEnd; + for (q = sortedEnd; q != begin && *(q - 1) < tmp; --q) + *q = *(q - 1); + *q = tmp; + } } - -/// score() assign 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/LVA. - // Suprisingly, this appears to perform slightly better than SEE based - // move ordering. The reason is probably that in a position with a winning - // capture, capturing a more valuable (but sufficiently defended) piece - // first usually doesn't hurt. The opponent will have to recapture, and - // the hanging piece will still be hanging (except in the unusual cases - // where it is possible to recapture with the hanging piece). Exchanging - // big pieces before capturing a hanging piece probably helps to reduce - // the subtree size. - // In 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 in pick_move_from_list(). This way we save some SEE - // calls in case we get a cutoff. - for (auto& m : *this) - if (type_of(m) == ENPASSANT) - m.value = PieceValue[MG][PAWN] - Value(PAWN); - - else if (type_of(m) == PROMOTION) - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(PAWN) - + PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; - else - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(type_of(pos.moved_piece(m))); +} // namespace + + +// Constructors of the MovePicker class. As arguments, we pass information +// to help it return the (presumably) good moves first, to decide which +// moves to return (in the quiescence search, for instance, we only want to +// search captures, promotions, and some checks) and how important a good +// move ordering is at the current node. + +// MovePicker constructor for the main search +MovePicker::MovePicker(const Position& p, + Move ttm, + Depth d, + const ButterflyHistory* mh, + const CapturePieceToHistory* cph, + const PieceToHistory** ch, + const PawnHistory* ph, + Move cm, + const Move* killers) : + pos(p), + mainHistory(mh), + captureHistory(cph), + continuationHistory(ch), + pawnHistory(ph), + ttMove(ttm), + refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, + depth(d) { + assert(d > 0); + + stage = (pos.checkers() ? EVASION_TT : MAIN_TT) + !(ttm && pos.pseudo_legal(ttm)); } -template<> -void MovePicker::score() { - - Square prevSq = to_sq((ss-1)->currentMove); - const HistoryStats& cmh = counterMovesHistory[pos.piece_on(prevSq)][prevSq]; - - for (auto& m : *this) - m.value = history[pos.moved_piece(m)][to_sq(m)] - + cmh[pos.moved_piece(m)][to_sq(m)] * 3; +// Constructor for quiescence search +MovePicker::MovePicker(const Position& p, + Move ttm, + Depth d, + const ButterflyHistory* mh, + const CapturePieceToHistory* cph, + const PieceToHistory** ch, + const PawnHistory* ph) : + pos(p), + mainHistory(mh), + captureHistory(cph), + continuationHistory(ch), + pawnHistory(ph), + ttMove(ttm), + depth(d) { + assert(d <= 0); + + stage = (pos.checkers() ? EVASION_TT : QSEARCH_TT) + !(ttm && pos.pseudo_legal(ttm)); } -template<> -void MovePicker::score() { - // Try good captures ordered by MVV/LVA, then non-captures if destination square - // is not under attack, ordered by history value, then bad-captures and quiet - // moves with a negative SEE. This last group is ordered by the SEE value. - Value see; - - for (auto& m : *this) - if ((see = pos.see_sign(m)) < VALUE_ZERO) - m.value = see - HistoryStats::Max; // At the bottom - - else 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[pos.moved_piece(m)][to_sq(m)]; +// 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_TT + + !(ttm && pos.capture_stage(ttm) && pos.pseudo_legal(ttm) && pos.see_ge(ttm, threshold)); } +// 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 history tables. +template +void MovePicker::score() { -/// generate_next_stage() generates, scores and sorts the next bunch of moves, -/// when there are no more moves to try for the current stage. - -void MovePicker::generate_next_stage() { - - cur = moves; - - switch (++stage) { + static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type"); - case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: - endMoves = generate(pos, moves); - score(); - break; - - case KILLERS_S1: - cur = killers; - endMoves = cur + 2; - - killers[0] = ss->killers[0]; - killers[1] = ss->killers[1]; - killers[2].move = MOVE_NONE; + [[maybe_unused]] Bitboard threatenedByPawn, threatenedByMinor, threatenedByRook, + threatenedPieces; + if constexpr (Type == QUIETS) + { + Color us = pos.side_to_move(); - // Be sure countermoves are different from killers - if ( countermove != killers[0] - && countermove != killers[1]) - *endMoves++ = countermove; - break; + threatenedByPawn = pos.attacks_by(~us); + threatenedByMinor = + pos.attacks_by(~us) | pos.attacks_by(~us) | threatenedByPawn; + threatenedByRook = pos.attacks_by(~us) | threatenedByMinor; - case QUIETS_1_S1: - endQuiets = endMoves = generate(pos, moves); - score(); - endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; }); - insertion_sort(cur, endMoves); - break; + // Pieces threatened by pieces of lesser material value + threatenedPieces = (pos.pieces(us, QUEEN) & threatenedByRook) + | (pos.pieces(us, ROOK) & threatenedByMinor) + | (pos.pieces(us, KNIGHT, BISHOP) & threatenedByPawn); + } - case QUIETS_2_S1: - cur = endMoves; - endMoves = endQuiets; - if (depth >= 3 * ONE_PLY) - insertion_sort(cur, endMoves); - break; + for (auto& m : *this) + if constexpr (Type == CAPTURES) + m.value = + (7 * int(PieceValue[pos.piece_on(to_sq(m))]) + + (*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))]) + / 16; + + else if constexpr (Type == QUIETS) + { + Piece pc = pos.moved_piece(m); + PieceType pt = type_of(pos.moved_piece(m)); + Square from = from_sq(m); + Square to = to_sq(m); + + // histories + m.value = 2 * (*mainHistory)[pos.side_to_move()][from_to(m)]; + m.value += 2 * (*pawnHistory)[pawn_structure(pos)][pc][to]; + m.value += 2 * (*continuationHistory[0])[pc][to]; + m.value += (*continuationHistory[1])[pc][to]; + m.value += (*continuationHistory[2])[pc][to] / 4; + m.value += (*continuationHistory[3])[pc][to]; + m.value += (*continuationHistory[5])[pc][to]; + + // bonus for checks + m.value += bool(pos.check_squares(pt) & to) * 16384; + + // bonus for escaping from capture + m.value += threatenedPieces & from ? (pt == QUEEN && !(to & threatenedByRook) ? 50000 + : pt == ROOK && !(to & threatenedByMinor) ? 25000 + : !(to & threatenedByPawn) ? 15000 + : 0) + : 0; + + // malus for putting piece en prise + m.value -= !(threatenedPieces & from) + ? (pt == QUEEN ? bool(to & threatenedByRook) * 50000 + + bool(to & threatenedByMinor) * 10000 + + bool(to & threatenedByPawn) * 20000 + : pt == ROOK ? bool(to & threatenedByMinor) * 25000 + + bool(to & threatenedByPawn) * 10000 + : pt != PAWN ? bool(to & threatenedByPawn) * 15000 + : 0) + : 0; + } + + else // Type == EVASIONS + { + if (pos.capture_stage(m)) + m.value = PieceValue[pos.piece_on(to_sq(m))] - Value(type_of(pos.moved_piece(m))) + + (1 << 28); + else + m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] + + (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)] + + (*pawnHistory)[pawn_structure(pos)][pos.moved_piece(m)][to_sq(m)]; + } +} - case BAD_CAPTURES_S1: - // Just pick them in reverse order to get MVV/LVA ordering - cur = moves + MAX_MOVES - 1; - endMoves = endBadCaptures; - break; +// Returns the next move satisfying a predicate function. +// It never returns the TT move. +template +Move MovePicker::select(Pred filter) { - case EVASIONS_S2: - endMoves = generate(pos, moves); - if (endMoves - moves > 1) - score(); - break; + while (cur < endMoves) + { + if constexpr (T == Best) + std::swap(*cur, *std::max_element(cur, endMoves)); - case QUIET_CHECKS_S3: - endMoves = generate(pos, moves); - break; + if (*cur != ttMove && filter()) + return *cur++; - case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: - stage = STOP; - /* Fall through */ + cur++; + } + return MOVE_NONE; +} - case STOP: - endMoves = cur + 1; // Avoid another generate_next_stage() call - break; +// 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) { - default: - assert(false); - } -} +top: + switch (stage) + { + case MAIN_TT : + case EVASION_TT : + case QSEARCH_TT : + case PROBCUT_TT : + ++stage; + return ttMove; + + case CAPTURE_INIT : + case PROBCUT_INIT : + case QCAPTURE_INIT : + cur = endBadCaptures = moves; + endMoves = generate(pos, cur); + + score(); + partial_insertion_sort(cur, endMoves, std::numeric_limits::min()); + ++stage; + goto top; + + case GOOD_CAPTURE : + if (select([&]() { + // Move losing capture to endBadCaptures to be tried later + return pos.see_ge(*cur, Value(-cur->value)) ? true + : (*endBadCaptures++ = *cur, false); + })) + return *(cur - 1); + + // 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; + + ++stage; + [[fallthrough]]; + + case REFUTATION : + if (select([&]() { + return *cur != MOVE_NONE && !pos.capture_stage(*cur) && pos.pseudo_legal(*cur); + })) + return *(cur - 1); + ++stage; + [[fallthrough]]; + + case QUIET_INIT : + if (!skipQuiets) + { + cur = endBadCaptures; + endMoves = generate(pos, cur); + + score(); + partial_insertion_sort(cur, endMoves, -1960 - 3130 * depth); + } + + ++stage; + [[fallthrough]]; + + case QUIET : + 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; + + ++stage; + [[fallthrough]]; + + case BAD_CAPTURE : + return select([]() { return true; }); + + case EVASION_INIT : + cur = moves; + endMoves = generate(pos, cur); + + score(); + ++stage; + [[fallthrough]]; + + case EVASION : + return select([]() { return true; }); + + case PROBCUT : + return select([&]() { return pos.see_ge(*cur, threshold); }); + + case QCAPTURE : + if (select([]() { return true; })) + 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; + + ++stage; + [[fallthrough]]; + + case QCHECK_INIT : + cur = moves; + endMoves = generate(pos, cur); + + ++stage; + [[fallthrough]]; + + case QCHECK : + return select([]() { return true; }); + } -/// 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. -template<> -Move MovePicker::next_move() { - - Move move; - - while (true) - { - while (cur == endMoves) - generate_next_stage(); - - switch (stage) { - - case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: - ++cur; - return ttMove; - - case CAPTURES_S1: - move = pick_best(cur++, endMoves); - if (move != ttMove) - { - if (pos.see_sign(move) >= VALUE_ZERO) - return move; - - // Losing capture, move it to the tail of the array - *endBadCaptures-- = move; - } - break; - - case KILLERS_S1: - move = *cur++; - if ( move != MOVE_NONE - && move != ttMove - && pos.pseudo_legal(move) - && !pos.capture(move)) - return move; - break; - - case QUIETS_1_S1: case QUIETS_2_S1: - move = *cur++; - if ( move != ttMove - && move != killers[0] - && move != killers[1] - && move != killers[2]) - return move; - break; - - case BAD_CAPTURES_S1: - return *cur--; - - case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4: - move = pick_best(cur++, endMoves); - if (move != ttMove) - return move; - break; - - case CAPTURES_S5: - move = pick_best(cur++, endMoves); - if (move != ttMove && pos.see(move) > captureThreshold) - return move; - break; - - case CAPTURES_S6: - move = pick_best(cur++, endMoves); - if (to_sq(move) == recaptureSquare) - return move; - break; - - case QUIET_CHECKS_S3: - move = *cur++; - if (move != ttMove) - return move; - break; - - case STOP: - return MOVE_NONE; - - default: - assert(false); - } - } + assert(false); + return MOVE_NONE; // Silence warning } - -/// Version of next_move() to use at split point nodes where the move is grabbed -/// from the split point's shared MovePicker object. This function is not thread -/// safe so must be lock protected by the caller. -template<> -Move MovePicker::next_move() { return ss->splitPoint->movePicker->next_move(); } +} // namespace Stockfish