X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=3da4247a29e3cdff10de95c06838b7ddb173ae1c;hp=20681108c0bd7ca8e3db1c94254dcd3b10d96236;hb=e25de55faca30c2196612fcb208d88802ad29bae;hpb=40ad5194aa08aa8baaa9c6b8625b17fea73a8074
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 20681108..3da4247a 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,7 +1,7 @@
/*
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-2012 Marco Costalba, Joona Kiiski, 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
@@ -18,101 +18,127 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
+#include
#include
-#include "history.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
-#include "value.h"
-
-
-////
-//// Local definitions
-////
+#include "types.h"
namespace {
- enum MovegenPhase {
- PH_TT_MOVES, // Transposition table move and mate killer
- PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_KILLERS, // Killer moves from the current ply
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Non-capture checks in quiescence search
- PH_STOP
+ enum Sequencer {
+ MAIN_SEARCH, TT_MOVE_S1, GOOD_CAPTURES_S1, KILLERS_S1, NONCAPTURES_1_S1,
+ NONCAPTURES_2_S1, BAD_CAPTURES_S1, STOP_S1,
+ EVASIONS, TT_MOVE_S2, EVASIONS_S2, STOP_S2,
+ CAPTURES_AND_CHECKS, TT_MOVE_S3, QCAPTURES_S3, QCHECKS_S3, STOP_S3,
+ CAPTURES, TT_MOVE_S4, QCAPTURES_S4, STOP_S4,
+ RECAPTURES, TT_MOVE_S5, RECAPTURES_S5, STOP_S5,
+ PROBCUT, TT_MOVE_S6, GOOD_CAPTURES_S6, STOP_S6
};
- CACHE_LINE_ALIGNMENT
- const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
- const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP};
- const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
- const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
-}
-
-
-////
-//// Functions
-////
+ // Unary predicate used by std::partition to split positive scores from remaining
+ // ones so to sort separately the two sets, and with the second sort delayed.
+ inline bool has_positive_score(const MoveStack& move) { return move.score > 0; }
+ // Picks and pushes to the front the best move in range [firstMove, lastMove),
+ // it is faster than sorting all the moves in advance when moves are few, as
+ // normally are the possible captures.
+ inline MoveStack* pick_best(MoveStack* firstMove, MoveStack* lastMove)
+ {
+ std::swap(*firstMove, *std::max_element(firstMove, lastMove));
+ return firstMove;
+ }
+}
-/// Constructor for the MovePicker class. Apart from the position for which
-/// it is asked to pick legal moves, MovePicker also wants some information
+/// 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) {
- int searchTT = ttm;
- ttMoves[0].move = ttm;
- badCaptureThreshold = 0;
- lastBadCapture = badCaptures;
+ Search::Stack* ss, Value beta) : pos(p), H(h), depth(d) {
+ captureThreshold = 0;
+ badCaptures = moves + MAX_MOVES;
- pinned = p.pinned_pieces(pos.side_to_move());
+ assert(d > DEPTH_ZERO);
- if (ss && !p.is_check())
+ if (p.in_check())
+ {
+ killers[0].move = killers[1].move = MOVE_NONE;
+ phase = EVASIONS;
+ }
+ else
{
- ttMoves[1].move = (ss->mateKiller == ttm) ? MOVE_NONE : ss->mateKiller;
- searchTT |= ttMoves[1].move;
killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1];
- } else
- ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
- if (p.is_check())
- phasePtr = EvasionsPhaseTable;
- else if (d > Depth(0))
- {
- // Consider sligtly negative captures as good if at low
- // depth and far from beta.
- if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly)
- badCaptureThreshold = -PawnValueMidgame;
+ // 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 = MainSearchPhaseTable;
+ // Consider negative captures as good if still enough to reach beta
+ else if (ss && ss->eval > beta)
+ captureThreshold = beta - ss->eval;
+
+ phase = MAIN_SEARCH;
}
- else if (d == Depth(0))
- phasePtr = QsearchWithChecksPhaseTable;
- else
+
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ phase += int(ttMove == MOVE_NONE);
+ go_next_phase();
+}
+
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, Square recaptureSq)
+ : pos(p), H(h) {
+
+ assert(d <= DEPTH_ZERO);
+
+ if (p.in_check())
+ phase = EVASIONS;
+
+ else if (d >= DEPTH_QS_CHECKS)
+ phase = CAPTURES_AND_CHECKS;
+
+ else if (d >= DEPTH_QS_RECAPTURES)
{
- phasePtr = QsearchWithoutChecksPhaseTable;
+ phase = CAPTURES;
// 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_or_promotion(ttm))
- searchTT = ttMoves[0].move = MOVE_NONE;
+ if (ttm != MOVE_NONE && !pos.is_capture_or_promotion(ttm))
+ ttm = MOVE_NONE;
}
+ else
+ {
+ phase = RECAPTURES;
+ recaptureSquare = recaptureSq;
+ ttm = MOVE_NONE;
+ }
+
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ phase += int(ttMove == MOVE_NONE);
+ go_next_phase();
+}
+
+MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType parentCapture)
+ : pos(p), H(h) {
+
+ assert (!pos.in_check());
- phasePtr += int(!searchTT) - 1;
+ // In ProbCut we consider only captures better than parent's move
+ captureThreshold = PieceValueMidgame[Piece(parentCapture)];
+ phase = PROBCUT;
+
+ if ( ttm != MOVE_NONE
+ && (!pos.is_capture(ttm) || pos.see(ttm) <= captureThreshold))
+ ttm = MOVE_NONE;
+
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ phase += int(ttMove == MOVE_NONE);
go_next_phase();
}
@@ -123,60 +149,73 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
void MovePicker::go_next_phase() {
curMove = moves;
- phase = *(++phasePtr);
- switch (phase) {
- case PH_TT_MOVES:
- curMove = ttMoves;
- lastMove = curMove + 2;
+ switch (++phase) {
+
+ case TT_MOVE_S1: case TT_MOVE_S2: case TT_MOVE_S3:
+ case TT_MOVE_S4: case TT_MOVE_S5: case TT_MOVE_S6:
+ lastMove = curMove + 1;
return;
- case PH_GOOD_CAPTURES:
- lastMove = generate_captures(pos, moves);
+ case GOOD_CAPTURES_S1:
+ case GOOD_CAPTURES_S6:
+ lastMove = generate(pos, moves);
score_captures();
return;
- case PH_KILLERS:
+ case KILLERS_S1:
curMove = killers;
lastMove = curMove + 2;
return;
- case PH_NONCAPTURES:
- lastMove = generate_noncaptures(pos, moves);
+ case NONCAPTURES_1_S1:
+ lastNonCapture = lastMove = generate(pos, moves);
score_noncaptures();
- sort_moves(moves, lastMove, &lastGoodNonCapture);
+ lastMove = std::partition(curMove, lastMove, has_positive_score);
+ sort(curMove, lastMove);
+ return;
+
+ case NONCAPTURES_2_S1:
+ curMove = lastMove;
+ lastMove = lastNonCapture;
+ if (depth >= 3 * ONE_PLY)
+ sort(curMove, lastMove);
return;
- case PH_BAD_CAPTURES:
- // Bad captures SEE value is already calculated so just sort them
- // to get SEE move ordering.
+ case BAD_CAPTURES_S1:
+ // Bad captures SEE value is already calculated so just pick
+ // them in order to get SEE move ordering.
curMove = badCaptures;
- lastMove = lastBadCapture;
+ lastMove = moves + MAX_MOVES;
return;
- case PH_EVASIONS:
- assert(pos.is_check());
- lastMove = generate_evasions(pos, moves);
- score_evasions_or_checks();
+ case EVASIONS_S2:
+ assert(pos.in_check());
+ lastMove = generate(pos, moves);
+ score_evasions();
return;
- case PH_QCAPTURES:
- lastMove = generate_captures(pos, moves);
+ case QCAPTURES_S3:
+ case QCAPTURES_S4:
+ lastMove = generate(pos, moves);
score_captures();
return;
- case PH_QCHECKS:
- lastMove = generate_non_capture_checks(pos, moves);
- score_evasions_or_checks();
+ case RECAPTURES_S5:
+ lastMove = generate(pos, moves);
return;
- case PH_STOP:
- lastMove = curMove + 1; // Avoids another go_next_phase() call
+ case QCHECKS_S3:
+ lastMove = generate(pos, moves);
+ return;
+
+ case STOP_S1: case STOP_S2: case STOP_S3:
+ case STOP_S4: case STOP_S5: case STOP_S6:
+ lastMove = curMove + 1; // Avoid another go_next_phase() call
return;
default:
assert(false);
- return;
}
}
@@ -184,7 +223,7 @@ void MovePicker::go_next_phase() {
/// 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().
+/// picked first by next_move().
void MovePicker::score_captures() {
// Winning and equal captures in the main search are ordered by MVV/LVA.
@@ -206,33 +245,28 @@ void MovePicker::score_captures() {
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- if (move_is_promotion(m))
- cur->score = QueenValueMidgame;
- else
- cur->score = pos.midgame_value_of_piece_on(move_to(m))
- - pos.type_of_piece_on(move_from(m));
+ cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))]
+ - type_of(pos.piece_moved(m));
+
+ if (is_promotion(m))
+ cur->score += PieceValueMidgame[Piece(promotion_piece_type(m))];
}
}
void MovePicker::score_noncaptures() {
- // First score by history, when no history is available then use
- // piece/square tables values. This seems to be better then a
- // random choice when we don't have an history for any move.
+
Move m;
- Piece piece;
- Square from, to;
+ Square from;
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- from = move_from(m);
- to = move_to(m);
- piece = pos.piece_on(from);
- cur->score = H.move_ordering_score(piece, to);
+ from = from_sq(m);
+ cur->score = H.value(pos.piece_on(from), to_sq(m));
}
}
-void MovePicker::score_evasions_or_checks() {
+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
@@ -248,113 +282,111 @@ void MovePicker::score_evasions_or_checks() {
{
m = cur->move;
if ((seeScore = pos.see_sign(m)) < 0)
- cur->score = seeScore - HistoryMax; // Be sure 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)) + HistoryMax;
+ cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
+ else if (pos.is_capture(m))
+ cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))]
+ - type_of(pos.piece_moved(m)) + History::MaxValue;
else
- cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+ cur->score = H.value(pos.piece_moved(m), to_sq(m));
}
}
-/// MovePicker::get_next_move() is the most important method of the MovePicker
-/// class. It returns a new 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.
+/// 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 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() {
+Move MovePicker::next_move() {
Move move;
while (true)
{
- while (curMove != lastMove)
- {
- switch (phase) {
-
- case PH_TT_MOVES:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned))
+ while (curMove == lastMove)
+ go_next_phase();
+
+ switch (phase) {
+
+ case TT_MOVE_S1: case TT_MOVE_S2: case TT_MOVE_S3:
+ case TT_MOVE_S4: case TT_MOVE_S5: case TT_MOVE_S6:
+ curMove++;
+ return ttMove;
+ break;
+
+ case GOOD_CAPTURES_S1:
+ move = pick_best(curMove++, lastMove)->move;
+ 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)
return move;
- break;
-
- case PH_GOOD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && pos.pl_move_is_legal(move, pinned))
- {
- // Check for a non negative SEE now
- int seeValue = pos.see_sign(move);
- if (seeValue >= badCaptureThreshold)
- return move;
-
- // Losing capture, move it to the badCaptures[] array, note
- // that move has now been already checked for legality.
- assert(int(lastBadCapture - badCaptures) < 63);
- lastBadCapture->move = move;
- lastBadCapture->score = seeValue;
- lastBadCapture++;
- }
- break;
-
- case PH_KILLERS:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned)
- && move != ttMoves[0].move
- && move != ttMoves[1].move
- && !pos.move_is_capture(move))
- return move;
- break;
- case PH_NONCAPTURES:
+ // Losing capture, move it to the tail of the array
+ (--badCaptures)->move = move;
+ badCaptures->score = seeValue;
+ }
+ break;
- // Sort negative scored moves only when we get there
- if (curMove == lastGoodNonCapture)
- insertion_sort(lastGoodNonCapture, lastMove);
+ case GOOD_CAPTURES_S6:
+ move = pick_best(curMove++, lastMove)->move;
+ if ( move != ttMove
+ && pos.see(move) > captureThreshold)
+ return move;
+ break;
+
+ case KILLERS_S1:
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.is_pseudo_legal(move)
+ && move != ttMove
+ && !pos.is_capture(move))
+ return move;
+ break;
+
+ case NONCAPTURES_1_S1:
+ case NONCAPTURES_2_S1:
+ move = (curMove++)->move;
+ if ( move != ttMove
+ && move != killers[0].move
+ && move != killers[1].move)
+ return move;
+ break;
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && move != killers[0].move
- && move != killers[1].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case BAD_CAPTURES_S1:
+ move = pick_best(curMove++, lastMove)->move;
+ return move;
- case PH_BAD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ case EVASIONS_S2:
+ case QCAPTURES_S3:
+ case QCAPTURES_S4:
+ move = pick_best(curMove++, lastMove)->move;
+ if (move != ttMove)
return move;
+ break;
- case PH_EVASIONS:
- case PH_QCAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case RECAPTURES_S5:
+ move = (curMove++)->move;
+ if (to_sq(move) == recaptureSquare)
+ return move;
+ break;
- case PH_QCHECKS:
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case QCHECKS_S3:
+ move = (curMove++)->move;
+ if (move != ttMove)
+ return move;
+ break;
- case PH_STOP:
- return MOVE_NONE;
+ case STOP_S1: case STOP_S2: case STOP_S3:
+ case STOP_S4: case STOP_S5: case STOP_S6:
+ return MOVE_NONE;
- default:
- assert(false);
- break;
- }
+ default:
+ assert(false);
}
- go_next_phase();
}
}
-