X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=c013042aecf9032c8286580f5bb26b8f8764b15b;hp=f7b7f42673d2a0405580848faa25845ed3a010c5;hb=bd59560480cc4f43a4ba75dc827ba27bcebb92dd;hpb=6661a3154152ab448b1dc11d882586976f616f92 diff --git a/src/movepick.cpp b/src/movepick.cpp index f7b7f426..c013042a 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -2,13 +2,13 @@ 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-2018 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 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 @@ -21,41 +21,32 @@ #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 + 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 }; - // 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; + // 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) { + + 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; + } } } // namespace @@ -64,292 +55,206 @@ 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 +/// 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) { +/// 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), + refutations{killers_p[0], killers_p[1], cm}, 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); + stage = pos.checkers() ? EVASION_TT : MAIN_TT; + ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; + stage += (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) { +/// MovePicker constructor for quiescence search +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_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); + 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); } -MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, const CounterMovesHistoryStats& cmh, PieceType pt) - : pos(p), history(h), counterMovesHistory(cmh) { +/// MovePicker constructor for ProbCut: we generate captures with SEE higher +/// than or equal to the given threshold. +MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePieceToHistory* cph) + : pos(p), captureHistory(cph), threshold(th) { assert(!pos.checkers()); - stage = PROBCUT; - - // 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); - - if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold)) - ttMove = MOVE_NONE; - - endMoves += (ttMove != MOVE_NONE); -} - - -/// 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))); + stage = PROBCUT_TT; + ttMove = ttm + && pos.pseudo_legal(ttm) + && pos.capture(ttm) + && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE; + stage += (ttMove == MOVE_NONE); } -template<> -void MovePicker::score() { - - Square prevSq = to_sq((ss-1)->currentMove); - const HistoryStats& cmh = counterMovesHistory[pos.piece_on(prevSq)][prevSq]; +/// 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() { - for (auto& m : *this) - m.value = history[pos.moved_piece(m)][to_sq(m)] - + cmh[pos.moved_piece(m)][to_sq(m)]; -} - -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; + static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type"); 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)) + if (Type == CAPTURES) 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)]; + + (*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)] + + (*contHistory[0])[pos.moved_piece(m)][to_sq(m)] + + (*contHistory[1])[pos.moved_piece(m)][to_sq(m)] + + (*contHistory[3])[pos.moved_piece(m)][to_sq(m)]; + + 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)] - (1 << 28); + } } +/// MovePicker::select_move() returns the next move satisfying a predicate function +template +Move MovePicker::select_move(Pred filter) { -/// 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) { - - 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; + while (cur < endMoves) + { + if (T == BEST_SCORE) + std::swap(*cur, *std::max_element(cur, endMoves)); - // Be sure countermoves are different from killers - if ( countermove != killers[0] - && countermove != killers[1]) - *endMoves++ = countermove; - break; + move = *cur++; - 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; - - case QUIETS_2_S1: - cur = endMoves; - endMoves = endQuiets; - if (depth >= 3 * ONE_PLY) - insertion_sort(cur, endMoves); - break; - - case BAD_CAPTURES_S1: - // Just pick them in reverse order to get MVV/LVA ordering - cur = moves + MAX_MOVES - 1; - endMoves = endBadCaptures; - break; - - case EVASIONS_S2: - endMoves = generate(pos, moves); - if (endMoves - moves > 1) - score(); - break; - - case QUIET_CHECKS_S3: - endMoves = generate(pos, moves); - break; - - case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: - stage = STOP; - /* Fall through */ - - case STOP: - endMoves = cur + 1; // Avoid another generate_next_stage() call - break; - - default: - assert(false); + if (move != ttMove && filter()) + return move; } + return move = MOVE_NONE; } - -/// 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++; +/// 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_TT: + case EVASION_TT: + case QSEARCH_TT: + case PROBCUT_TT: + ++stage; + return ttMove; + + case CAPTURE_INIT: + case PROBCUT_INIT: + case QCAPTURE_INIT: + endBadCaptures = cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + goto top; + + 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; + + // 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; + /* fallthrough */ + + case KILLER0: + case KILLER1: + case COUNTERMOVE: + while (stage <= COUNTERMOVE) + { + move = refutations[ stage++ - KILLER0]; 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; + } + /* fallthrough */ - case CAPTURES_S6: - move = pick_best(cur++, endMoves); - if (to_sq(move) == recaptureSquare) - return move; - break; + case QUIET_INIT: + cur = endBadCaptures; + endMoves = generate(pos, cur); + score(); + partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY); + ++stage; + /* fallthrough */ + + case QUIET: + 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; + /* fallthrough */ + + case BAD_CAPTURE: + return select_move(Any); + + case EVASION_INIT: + cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + /* fallthrough */ + + case EVASION: + return select_move(Any); + + case PROBCUT: + return select_move([&](){ return pos.see_ge(move, threshold); }); + + case QCAPTURE: + if (select_move([&](){ return depth > DEPTH_QS_RECAPTURES + || to_sq(move) == recaptureSquare; })) + return move; + + // 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 QUIET_CHECKS_S3: - move = *cur++; - if (move != ttMove) - return move; - break; + ++stage; + /* fallthrough */ - case STOP: - return MOVE_NONE; + case QCHECK_INIT: + cur = moves; + endMoves = generate(pos, cur); + ++stage; + /* fallthrough */ - default: - assert(false); - } + case QCHECK: + return select_move(Any); } -} - -/// 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(); } + assert(false); + return MOVE_NONE; // Silence warning +}