X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.cpp;h=694b9222fe573945c826e627865e6b4d5565f58c;hb=HEAD;hp=c0809f2805f39c211bb9aba6f70cf7aa051dbf55;hpb=cad300cfab869a4e8dcc6b286f9b2e60d2827bed;p=stockfish
diff --git a/src/movepick.cpp b/src/movepick.cpp
index c0809f28..bdc0e4af 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,8 +1,6 @@
/*
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
+ Copyright (C) 2004-2024 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
@@ -18,270 +16,303 @@
along with this program. If not, see .
*/
+#include "movepick.h"
+
+#include
#include
+#include
-#include "movepick.h"
+#include "bitboard.h"
+#include "position.h"
-namespace {
+namespace Stockfish {
- enum Stages {
- MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLER0, KILLER1, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES,
- EVASION, EVASIONS_INIT, ALL_EVASIONS,
- PROBCUT, PROBCUT_CAPTURES_INIT, PROBCUT_CAPTURES,
- QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS
- };
+namespace {
- // 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) {
+enum Stages {
+ // generate main search moves
+ MAIN_TT,
+ CAPTURE_INIT,
+ GOOD_CAPTURE,
+ QUIET_INIT,
+ GOOD_QUIET,
+ BAD_CAPTURE,
+ BAD_QUIET,
+
+ // generate evasion moves
+ EVASION_TT,
+ EVASION_INIT,
+ EVASION,
+
+ // generate probcut moves
+ PROBCUT_TT,
+ PROBCUT_INIT,
+ PROBCUT,
+
+ // generate qsearch moves
+ QSEARCH_TT,
+ QCAPTURE_INIT,
+ QCAPTURE
+};
+
+// 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;
+ *p = *++sortedEnd;
for (q = sortedEnd; q != begin && *(q - 1) < tmp; --q)
*q = *(q - 1);
*q = tmp;
}
- }
+}
+
+} // namespace
+
+
+// Constructors of the MovePicker class. As arguments, we pass information
+// to decide which class of moves to emit, to help sorting the (presumably)
+// good moves first, and how important move ordering is at the current node.
+
+// MovePicker constructor for the main search and for the 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) {
+
+ if (pos.checkers())
+ stage = EVASION_TT + !(ttm && pos.pseudo_legal(ttm));
+
+ else
+ stage = (depth > 0 ? MAIN_TT : QSEARCH_TT) + !(ttm && pos.pseudo_legal(ttm));
+}
+
+// MovePicker constructor for ProbCut: we generate captures with Static Exchange
+// Evaluation (SEE) greater than or equal to the given threshold.
+MovePicker::MovePicker(const Position& p, Move ttm, int 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));
+}
- // 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) {
+// 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() {
- std::swap(*begin, *std::max_element(begin, end));
- return *begin;
- }
+ static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
-} // namespace
+ [[maybe_unused]] Bitboard threatenedByPawn, threatenedByMinor, threatenedByRook,
+ threatenedPieces;
+ if constexpr (Type == QUIETS)
+ {
+ Color us = pos.side_to_move();
+ threatenedByPawn = pos.attacks_by(~us);
+ threatenedByMinor =
+ pos.attacks_by(~us) | pos.attacks_by(~us) | threatenedByPawn;
+ threatenedByRook = pos.attacks_by(~us) | threatenedByMinor;
-/// 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.
+ // 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);
+ }
-/// 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){
+ for (auto& m : *this)
+ if constexpr (Type == CAPTURES)
+ m.value =
+ 7 * int(PieceValue[pos.piece_on(m.to_sq())])
+ + (*captureHistory)[pos.moved_piece(m)][m.to_sq()][type_of(pos.piece_on(m.to_sq()))];
- assert(d > DEPTH_ZERO);
+ else if constexpr (Type == QUIETS)
+ {
+ Piece pc = pos.moved_piece(m);
+ PieceType pt = type_of(pc);
+ Square from = m.from_sq();
+ Square to = m.to_sq();
+
+ // histories
+ m.value = (*mainHistory)[pos.side_to_move()][m.from_to()];
+ m.value += 2 * (*pawnHistory)[pawn_structure_index(pos)][pc][to];
+ m.value += 2 * (*continuationHistory[0])[pc][to];
+ m.value += (*continuationHistory[1])[pc][to];
+ m.value += (*continuationHistory[2])[pc][to] / 3;
+ 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) ? 51700
+ : pt == ROOK && !(to & threatenedByMinor) ? 25600
+ : !(to & threatenedByPawn) ? 14450
+ : 0)
+ : 0;
+
+ // malus for putting piece en prise
+ m.value -= (pt == QUEEN ? bool(to & threatenedByRook) * 49000
+ : pt == ROOK ? bool(to & threatenedByMinor) * 24335
+ : bool(to & threatenedByPawn) * 14900);
+ }
- stage = pos.checkers() ? EVASION : MAIN_SEARCH;
- ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
+ else // Type == EVASIONS
+ {
+ if (pos.capture_stage(m))
+ m.value =
+ PieceValue[pos.piece_on(m.to_sq())] - type_of(pos.moved_piece(m)) + (1 << 28);
+ else
+ m.value = (*mainHistory)[pos.side_to_move()][m.from_to()]
+ + (*continuationHistory[0])[pos.moved_piece(m)][m.to_sq()]
+ + (*pawnHistory)[pawn_structure_index(pos)][pos.moved_piece(m)][m.to_sq()];
+ }
}
-/// 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), recaptureSquare(s), depth(d) {
+// Returns the next move satisfying a predicate function.
+// This never returns the TT move, as it was emitted before.
+template
+Move MovePicker::select(Pred filter) {
+
+ while (cur < endMoves)
+ {
+ if constexpr (T == Best)
+ std::swap(*cur, *std::max_element(cur, endMoves));
- assert(d <= DEPTH_ZERO);
+ if (*cur != ttMove && filter())
+ return *cur++;
- stage = pos.checkers() ? EVASION : QSEARCH;
- ttMove = ttm
- && pos.pseudo_legal(ttm)
- && (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
+ cur++;
+ }
+ return Move::none();
}
-/// 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) {
+// This is the most important method of the MovePicker class. We emit one
+// new pseudo-legal move on every call 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) {
- assert(!pos.checkers());
+ auto quiet_threshold = [](Depth d) { return -3560 * d; };
+
+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, -cur->value / 18) ? true
+ : (*endBadCaptures++ = *cur, false);
+ }))
+ return *(cur - 1);
+
+ ++stage;
+ [[fallthrough]];
+
+ case QUIET_INIT :
+ if (!skipQuiets)
+ {
+ cur = endBadCaptures;
+ endMoves = beginBadQuiets = endBadQuiets = generate(pos, cur);
- stage = PROBCUT;
- ttMove = ttm
- && pos.pseudo_legal(ttm)
- && pos.capture(ttm)
- && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
-}
+ score();
+ partial_insertion_sort(cur, endMoves, quiet_threshold(depth));
+ }
-/// 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.
-template
-void MovePicker::score() {
+ ++stage;
+ [[fallthrough]];
- static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
-
- for (auto& m : *this)
- if (Type == CAPTURES)
- m.value = PieceValue[MG][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)]
- + (*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);
- }
-}
+ case GOOD_QUIET :
+ if (!skipQuiets && select([]() { return true; }))
+ {
+ if ((cur - 1)->value > -7998 || (cur - 1)->value <= quiet_threshold(depth))
+ return *(cur - 1);
-/// 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.
+ // Remaining quiets are bad
+ beginBadQuiets = cur - 1;
+ }
-Move MovePicker::next_move(bool skipQuiets) {
+ // Prepare the pointers to loop over the bad captures
+ cur = moves;
+ endMoves = endBadCaptures;
+
+ ++stage;
+ [[fallthrough]];
+
+ case BAD_CAPTURE :
+ if (select([]() { return true; }))
+ return *(cur - 1);
+
+ // Prepare the pointers to loop over the bad quiets
+ cur = beginBadQuiets;
+ endMoves = endBadQuiets;
- Move move;
-
- switch (stage) {
-
- case MAIN_SEARCH: case EVASION: case QSEARCH: case PROBCUT:
- ++stage;
- return ttMove;
-
- case CAPTURES_INIT:
- case PROBCUT_CAPTURES_INIT:
- case QCAPTURES_INIT:
- endBadCaptures = cur = moves;
- endMoves = generate(pos, cur);
- score();
- ++stage;
-
- // Rebranch at the top of the switch via a recursive call
- return next_move(skipQuiets);
-
- 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;
- /* fallthrough */
-
- case KILLER0:
- case KILLER1:
- do
- {
- move = killers[++stage - KILLER1];
- if ( move != MOVE_NONE
- && move != ttMove
- && pos.pseudo_legal(move)
- && !pos.capture(move))
- return move;
- } while (stage <= KILLER1);
- /* fallthrough */
-
- 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;
- /* fallthrough */
-
- 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)
- while (cur < endMoves)
- {
- move = *cur++;
- 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 EVASIONS_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 PROBCUT_CAPTURES:
- while (cur < endMoves)
- {
- move = pick_best(cur++, endMoves);
- if ( move != ttMove
- && pos.see_ge(move, threshold))
- return move;
- }
- break;
-
- case QCAPTURES:
- while (cur < endMoves)
- {
- move = pick_best(cur++, endMoves);
- if ( move != ttMove
- && (depth > DEPTH_QS_RECAPTURES || to_sq(move) == recaptureSquare))
- return move;
- }
- if (depth <= DEPTH_QS_NO_CHECKS)
- break;
- cur = moves;
- endMoves = generate(pos, cur);
- ++stage;
- /* fallthrough */
-
- case QCHECKS:
- while (cur < endMoves)
- {
- move = *cur++;
- if (move != ttMove)
- return move;
- }
- break;
-
- default:
- assert(false);
- }
-
- return MOVE_NONE;
+ ++stage;
+ [[fallthrough]];
+
+ case BAD_QUIET :
+ if (!skipQuiets)
+ return select([]() { return true; });
+
+ return Move::none();
+
+ 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 :
+ return select([]() { return true; });
+ }
+
+ assert(false);
+ return Move::none(); // Silence warning
}
+
+} // namespace Stockfish