X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=5c8338c0c19ab96d08f55879015d8f422002985c;hp=04fa40d625ba8212a4dceb2ed0278a966a5b7fe5;hb=6b16ebc82566a69b9336cca6aa7a19ab1824b85d;hpb=4b8a7f2793f0d7dd46d2804cd5f46ccdb080da12 diff --git a/src/movepick.cpp b/src/movepick.cpp index 04fa40d6..34d29562 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -1,14 +1,14 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 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 @@ -20,345 +20,331 @@ #include -#include "movegen.h" #include "movepick.h" -#include "search.h" -#include "types.h" +#include "thread.h" namespace { - enum MovegenPhase { - PH_TT_MOVE, // Transposition table move - PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= captureThreshold (captureThreshold <= 0) - PH_GOOD_PROBCUT, // Queen promotions and captures with SEE values > captureThreshold (captureThreshold >= 0) - PH_KILLERS, // Killer moves from the current ply - PH_NONCAPTURES_1, // Non-captures and underpromotions with positive score - PH_NONCAPTURES_2, // Non-captures and underpromotions with non-positive score - PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < captureThreshold (captureThreshold <= 0) - PH_EVASIONS, // Check evasions - PH_QCAPTURES, // Captures in quiescence search - PH_QCHECKS, // Non-capture checks in quiescence search - PH_STOP + 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 }; - CACHE_LINE_ALIGNMENT - const uint8_t MainSearchTable[] = { PH_TT_MOVE, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES_1, PH_NONCAPTURES_2, PH_BAD_CAPTURES, PH_STOP }; - const uint8_t EvasionTable[] = { PH_TT_MOVE, PH_EVASIONS, PH_STOP }; - const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVE, PH_QCAPTURES, PH_QCHECKS, PH_STOP }; - const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVE, PH_QCAPTURES, PH_STOP }; - const uint8_t ProbCutTable[] = { PH_TT_MOVE, PH_GOOD_PROBCUT, PH_STOP }; -} - -/// Constructors for 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 about how important good -/// move ordering is at the current node. - -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - SearchStack* ss, Value beta) : pos(p), H(h), depth(d) { - captureThreshold = 0; - badCaptures = moves + MAX_MOVES; - - assert(d > DEPTH_ZERO); - - if (p.in_check()) + // Our insertion sort, which is guaranteed to be stable, as it should be + void insertion_sort(ExtMove* begin, ExtMove* end) { - killers[0].move = killers[1].move = MOVE_NONE; - phasePtr = EvasionTable; + 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; + } } - else - { - killers[0].move = ss->killers[0]; - killers[1].move = ss->killers[1]; - - // Consider sligtly negative captures as good if at low - // depth and far from beta. - if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY) - captureThreshold = -PawnValueMidgame; - phasePtr = MainSearchTable; - } - - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); - phasePtr += int(ttMove == MOVE_NONE) - 1; - go_next_phase(); -} - -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h) - : pos(p), H(h) { - - assert(d <= DEPTH_ZERO); - - if (p.in_check()) - phasePtr = EvasionTable; - else if (d >= DEPTH_QS_CHECKS) - phasePtr = QsearchWithChecksTable; - else + // 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) { - phasePtr = QsearchWithoutChecksTable; - - // Skip TT move if is not a capture or a promotion, this avoids - // qsearch tree explosion due to a possible perpetual check or - // similar rare cases when TT table is full. - if (ttm != MOVE_NONE && !pos.move_is_capture(ttm) && !move_is_promotion(ttm)) - ttm = MOVE_NONE; + std::swap(*begin, *std::max_element(begin, end)); + return *begin; } - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); - phasePtr += int(ttMove == MOVE_NONE) - 1; - go_next_phase(); -} - -MovePicker::MovePicker(const Position& p, Move ttm, const History& h, int parentCapture) - : pos(p), H(h) { - - assert (!pos.in_check()); +} // namespace - // In ProbCut we consider only captures better than parent's move - captureThreshold = parentCapture; - phasePtr = ProbCutTable; - if ( ttm != MOVE_NONE - && (!pos.move_is_capture(ttm) || pos.see(ttm) <= captureThreshold)) - ttm = MOVE_NONE; +/// 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. - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); - phasePtr += int(ttMove == MOVE_NONE) - 1; - go_next_phase(); -} +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s) + : pos(p), ss(s), depth(d) { + assert(d > DEPTH_ZERO); -/// MovePicker::go_next_phase() generates, scores and sorts the next bunch -/// of moves when there are no more moves to try for the current phase. + Square prevSq = to_sq((ss-1)->currentMove); + countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq]; -void MovePicker::go_next_phase() { + stage = pos.checkers() ? EVASION : MAIN_SEARCH; + ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; + stage += (ttMove == MOVE_NONE); +} - curMove = moves; - phase = *(++phasePtr); - switch (phase) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s) + : pos(p) { - case PH_TT_MOVE: - lastMove = curMove + 1; - return; + assert(d <= DEPTH_ZERO); - case PH_GOOD_CAPTURES: - case PH_GOOD_PROBCUT: - lastMove = generate(pos, moves); - score_captures(); - return; + if (pos.checkers()) + stage = EVASION; - case PH_KILLERS: - curMove = killers; - lastMove = curMove + 2; - return; + else if (d > DEPTH_QS_NO_CHECKS) + stage = QSEARCH_WITH_CHECKS; - case PH_NONCAPTURES_1: - lastNonCapture = lastMove = generate(pos, moves); - score_noncaptures(); - sort_moves(moves, lastNonCapture, &lastMove); - return; + else if (d > DEPTH_QS_RECAPTURES) + stage = QSEARCH_NO_CHECKS; - case PH_NONCAPTURES_2: - curMove = lastMove; - lastMove = lastNonCapture; - if (depth >= 3 * ONE_PLY) - insertion_sort(curMove, lastMove); + else + { + stage = QSEARCH_RECAPTURES; + recaptureSquare = s; return; + } - case PH_BAD_CAPTURES: - // Bad captures SEE value is already calculated so just pick - // them in order to get SEE move ordering. - curMove = badCaptures; - lastMove = moves + MAX_MOVES; - return; + ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; + stage += (ttMove == MOVE_NONE); +} - case PH_EVASIONS: - assert(pos.in_check()); - lastMove = generate(pos, moves); - score_evasions(); - return; +MovePicker::MovePicker(const Position& p, Move ttm, Value th) + : pos(p), threshold(th) { - case PH_QCAPTURES: - lastMove = generate(pos, moves); - score_captures(); - return; + assert(!pos.checkers()); - case PH_QCHECKS: - lastMove = generate(pos, moves); - return; + stage = PROBCUT; - case PH_STOP: - lastMove = curMove + 1; // Avoid another go_next_phase() call - return; + // 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; - default: - assert(false); - return; - } + stage += (ttMove == MOVE_NONE); } -/// MovePicker::score_captures(), MovePicker::score_noncaptures() and -/// MovePicker::score_evasions() assign a numerical move ordering score -/// to each move in a move list. The moves with highest scores will be -/// picked first by get_next_move(). - -void MovePicker::score_captures() { - // 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 - // badCaptures[] array, but instead of doing it now we delay till when - // the move has been picked up in pick_move_from_list(), this way we save - // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). - Move m; - - // Use MVV/LVA ordering - for (MoveStack* cur = moves; cur != lastMove; cur++) - { - m = cur->move; - cur->score = pos.midgame_value_of_piece_on(move_to(m)) - - pos.type_of_piece_on(move_from(m)); - - if (move_is_promotion(m)) - cur->score += QueenValueMidgame; - } +/// 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))); } -void MovePicker::score_noncaptures() { +template<> +void MovePicker::score() { - Move m; - Square from; + const HistoryStats& history = pos.this_thread()->history; + const FromToStats& fromTo = pos.this_thread()->fromTo; - for (MoveStack* cur = moves; cur != lastMove; cur++) - { - m = cur->move; - from = move_from(m); - cur->score = H.value(pos.piece_on(from), move_to(m)); - } -} + const CounterMoveStats* cmh = (ss-1)->counterMoves; + const CounterMoveStats* fmh = (ss-2)->counterMoves; + const CounterMoveStats* fmh2 = (ss-4)->counterMoves; -void MovePicker::score_evasions() { - // Try good captures ordered by MVV/LVA, then non-captures if - // destination square is not under attack, ordered by history - // value, and at the end bad-captures and non-captures with a - // negative SEE. This last group is ordered by the SEE score. - Move m; - int seeScore; + Color c = pos.side_to_move(); - // Skip if we don't have at least two moves to order - if (lastMove < moves + 2) - return; + for (auto& m : *this) + m.value = history[pos.moved_piece(m)][to_sq(m)] + + (cmh ? (*cmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + + (fmh ? (*fmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + + (fmh2 ? (*fmh2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + + fromTo.get(c, m); +} - for (MoveStack* cur = moves; cur != lastMove; cur++) - { - m = cur->move; - if ((seeScore = pos.see_sign(m)) < 0) - cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom - else if (pos.move_is_capture(m)) - cur->score = pos.midgame_value_of_piece_on(move_to(m)) - - pos.type_of_piece_on(move_from(m)) + History::MaxValue; +template<> +void MovePicker::score() { + // Try captures ordered by MVV/LVA, then non-captures ordered by history value + const HistoryStats& history = pos.this_thread()->history; + const FromToStats& fromTo = pos.this_thread()->fromTo; + Color c = pos.side_to_move(); + + 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 - cur->score = H.value(pos.piece_on(move_from(m)), move_to(m)); - } + m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m); } -/// MovePicker::get_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 score from a list -/// of generated moves taking care not to return the tt move if has already been -/// searched previously. Note that this function is not thread safe so should be -/// lock protected by caller when accessed through a shared MovePicker object. -Move MovePicker::get_next_move() { +/// 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. + +Move MovePicker::next_move() { Move move; - while (true) - { - while (curMove == lastMove) - go_next_phase(); + switch (stage) { - switch (phase) { + case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS: + case QSEARCH_NO_CHECKS: case PROBCUT: + ++stage; + return ttMove; - case PH_TT_MOVE: - curMove++; - return ttMove; - break; + case CAPTURES_INIT: + endBadCaptures = cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; - case PH_GOOD_CAPTURES: - move = pick_best(curMove++, lastMove).move; + case GOOD_CAPTURES: + while (cur < endMoves) + { + move = pick_best(cur++, endMoves); if (move != ttMove) { - assert(captureThreshold <= 0); // Otherwise we must use see instead of see_sign - - // Check for a non negative SEE now - int seeValue = pos.see_sign(move); - if (seeValue >= captureThreshold) + if (pos.see_ge(move, VALUE_ZERO)) return move; - // Losing capture, move it to the tail of the array, note - // that move has now been already checked for pseudo legality. - (--badCaptures)->move = move; - badCaptures->score = seeValue; + // Losing capture, move it to the beginning of the array + *endBadCaptures++ = move; } - break; + } - case PH_GOOD_PROBCUT: - move = pick_best(curMove++, lastMove).move; + ++stage; + move = ss->killers[0]; // First killer move + if ( move != MOVE_NONE + && move != ttMove + && pos.pseudo_legal(move) + && !pos.capture(move)) + return move; + + case KILLERS: + ++stage; + move = ss->killers[1]; // Second killer move + if ( move != MOVE_NONE + && move != ttMove + && pos.pseudo_legal(move) + && !pos.capture(move)) + return move; + + case COUNTERMOVE: + ++stage; + move = countermove; + if ( move != MOVE_NONE + && move != ttMove + && move != ss->killers[0] + && move != ss->killers[1] + && pos.pseudo_legal(move) + && !pos.capture(move)) + return move; + + case QUIET_INIT: + cur = endBadCaptures; + endMoves = generate(pos, cur); + score(); + if (depth < 3 * ONE_PLY) + { + ExtMove* goodQuiet = std::partition(cur, endMoves, [](const ExtMove& m) + { return m.value > VALUE_ZERO; }); + insertion_sort(cur, goodQuiet); + } else + insertion_sort(cur, endMoves); + ++stage; + + case QUIET: + while (cur < endMoves) + { + move = *cur++; if ( move != ttMove - && pos.see(move) > captureThreshold) + && move != ss->killers[0] + && move != ss->killers[1] + && move != countermove) return move; - break; - - case PH_KILLERS: - move = (curMove++)->move; - if ( move != MOVE_NONE - && pos.move_is_pl(move) - && move != ttMove - && !pos.move_is_capture(move)) + } + ++stage; + cur = moves; // Point to beginning of bad captures + + case BAD_CAPTURES: + if (cur < endBadCaptures) + return *cur++; + break; + + case EVASIONS_INIT: + cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + + case ALL_EVASIONS: + while (cur < endMoves) + { + move = pick_best(cur++, endMoves); + if (move != ttMove) return move; - break; - - case PH_NONCAPTURES_1: - case PH_NONCAPTURES_2: - move = (curMove++)->move; + } + break; + + case PROBCUT_INIT: + cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + + case PROBCUT_CAPTURES: + while (cur < endMoves) + { + move = pick_best(cur++, endMoves); if ( move != ttMove - && move != killers[0].move - && move != killers[1].move) + && pos.see_ge(move, threshold)) return move; - break; - - case PH_BAD_CAPTURES: - move = pick_best(curMove++, lastMove).move; - return move; - - case PH_EVASIONS: - case PH_QCAPTURES: - move = pick_best(curMove++, lastMove).move; + } + break; + + case QCAPTURES_1_INIT: case QCAPTURES_2_INIT: + cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + + 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 PH_QCHECKS: - move = (curMove++)->move; + cur = moves; + endMoves = generate(pos, cur); + ++stage; + + case QCHECKS: + while (cur < endMoves) + { + move = cur++->move; if (move != ttMove) return move; - break; - - case PH_STOP: - return MOVE_NONE; - - default: - assert(false); - break; } + break; + + case QSEARCH_RECAPTURES: + cur = moves; + endMoves = generate(pos, cur); + score(); + ++stage; + + case QRECAPTURES: + while (cur < endMoves) + { + move = pick_best(cur++, endMoves); + if (to_sq(move) == recaptureSquare) + return move; + } + break; + + default: + assert(false); } + + return MOVE_NONE; }