X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=61e5527f42c61d638132201f0b2f2efd18bc999a;hp=d6031bda073cce1711ecb843d07798b36baaf16d;hb=8647fbd6ed11c60282e84e4b486a7e8258c88483;hpb=5c81602d14539f8259a715477315e28b5de7cb54
diff --git a/src/movepick.cpp b/src/movepick.cpp
index d6031bda..61e5527f 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-2009 Marco Costalba
+ Copyright (C) 2008-2010 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,391 +18,347 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
#include
-#include "history.h"
-#include "evaluate.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
-#include "value.h"
-
-
-////
-//// Local definitions
-////
+#include "types.h"
namespace {
- /// Variables
-
- MovePicker::MovegenPhase PhaseTable[32];
- int MainSearchPhaseIndex;
- int EvasionsPhaseIndex;
- int QsearchWithChecksPhaseIndex;
- int QsearchWithoutChecksPhaseIndex;
-
+ 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
+ };
+
+ 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 };
}
-
-////
-//// Functions
-////
-
-
-/// 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, bool pv, Move ttm,
- const SearchStack& ss, Depth d) : pos(p) {
- pvNode = pv;
- ttMove = ttm;
- mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
- killer1 = ss.killers[0];
- killer2 = ss.killers[1];
- depth = d;
- movesPicked = 0;
- numOfMoves = 0;
- numOfBadCaptures = 0;
-
- if (p.is_check())
- phaseIndex = EvasionsPhaseIndex;
- else if (depth > Depth(0))
- phaseIndex = MainSearchPhaseIndex;
- else if (depth == Depth(0))
- phaseIndex = QsearchWithChecksPhaseIndex;
- else
- phaseIndex = QsearchWithoutChecksPhaseIndex;
+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;
- Color us = pos.side_to_move();
+ assert(d > DEPTH_ZERO);
- dc = p.discovered_check_candidates(us);
- pinned = p.pinned_pieces(us);
+ if (p.in_check())
+ {
+ killers[0].move = killers[1].move = MOVE_NONE;
+ phasePtr = EvasionTable;
+ }
+ else
+ {
+ killers[0].move = ss->killers[0];
+ killers[1].move = ss->killers[1];
- finished = false;
-}
+ // 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;
+ }
-/// 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 of the types we are interested in.
+ ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ phasePtr += int(ttMove == MOVE_NONE) - 1;
+ go_next_phase();
+}
-Move MovePicker::get_next_move() {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
+ : pos(p), H(h) {
- Move move;
+ assert(d <= DEPTH_ZERO);
- while (true)
+ if (p.in_check())
+ phasePtr = EvasionTable;
+ else if (d >= DEPTH_QS_CHECKS)
+ phasePtr = QsearchWithChecksTable;
+ else
{
- // If we already have a list of generated moves, pick the best move from
- // the list, and return it.
- move = pick_move_from_list();
- if (move != MOVE_NONE)
- {
- assert(move_is_ok(move));
- return move;
- }
-
- // Next phase
- phaseIndex++;
- switch (PhaseTable[phaseIndex]) {
-
- case PH_TT_MOVE:
- if (ttMove != MOVE_NONE)
- {
- assert(move_is_ok(ttMove));
- if (move_is_legal(pos, ttMove, pinned))
- return ttMove;
- }
- break;
-
- case PH_MATE_KILLER:
- if (mateKiller != MOVE_NONE)
- {
- assert(move_is_ok(mateKiller));
- if (move_is_legal(pos, mateKiller, pinned))
- return mateKiller;
- }
- break;
-
- case PH_GOOD_CAPTURES:
- numOfMoves = generate_captures(pos, moves);
- score_captures();
- std::sort(moves, moves + numOfMoves);
- movesPicked = 0;
- break;
-
- case PH_BAD_CAPTURES:
- // It's probably a good idea to use SEE move ordering here. FIXME
- movesPicked = 0;
- break;
-
- case PH_NONCAPTURES:
- numOfMoves = generate_noncaptures(pos, moves);
- score_noncaptures();
- std::sort(moves, moves + numOfMoves);
- movesPicked = 0;
- break;
-
- case PH_EVASIONS:
- assert(pos.is_check());
- numOfMoves = generate_evasions(pos, moves, pinned);
- score_evasions();
- std::sort(moves, moves + numOfMoves);
- movesPicked = 0;
- break;
-
- case PH_QCAPTURES:
- numOfMoves = generate_captures(pos, moves);
- score_qcaptures();
- std::sort(moves, moves + numOfMoves);
- movesPicked = 0;
- break;
-
- case PH_QCHECKS:
- // Perhaps we should order moves move here? FIXME
- numOfMoves = generate_non_capture_checks(pos, moves, dc);
- movesPicked = 0;
- break;
-
- case PH_STOP:
- return MOVE_NONE;
-
- default:
- assert(false);
- return MOVE_NONE;
- }
+ 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;
}
+
+ 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());
+
+ // 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;
+
+ ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ phasePtr += int(ttMove == MOVE_NONE) - 1;
+ go_next_phase();
+}
+
+
+/// 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.
+
+void MovePicker::go_next_phase() {
-/// A variant of get_next_move() which takes a lock as a parameter, used to
-/// prevent multiple threads from picking the same move at a split point.
+ curMove = moves;
+ phase = *(++phasePtr);
+ switch (phase) {
-Move MovePicker::get_next_move(Lock &lock) {
+ case PH_TT_MOVE:
+ lastMove = curMove + 1;
+ return;
+
+ case PH_GOOD_CAPTURES:
+ case PH_GOOD_PROBCUT:
+ lastMove = generate(pos, moves);
+ score_captures();
+ return;
+
+ case PH_KILLERS:
+ curMove = killers;
+ lastMove = curMove + 2;
+ return;
+
+ case PH_NONCAPTURES_1:
+ lastNonCapture = lastMove = generate(pos, moves);
+ score_noncaptures();
+ sort_moves(moves, lastNonCapture, &lastMove);
+ return;
+
+ case PH_NONCAPTURES_2:
+ curMove = lastMove;
+ lastMove = lastNonCapture;
+ if (depth >= 3 * ONE_PLY)
+ insertion_sort(curMove, lastMove);
+ 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;
+
+ case PH_EVASIONS:
+ assert(pos.in_check());
+ lastMove = generate(pos, moves);
+ score_evasions();
+ return;
+
+ case PH_QCAPTURES:
+ lastMove = generate(pos, moves);
+ score_captures();
+ return;
+
+ case PH_QCHECKS:
+ lastMove = generate(pos, moves);
+ return;
- lock_grab(&lock);
- if (finished)
- {
- lock_release(&lock);
- return MOVE_NONE;
- }
- Move m = get_next_move();
- if (m == MOVE_NONE)
- finished = true;
+ case PH_STOP:
+ lastMove = curMove + 1; // Avoid another go_next_phase() call
+ return;
- lock_release(&lock);
- return m;
+ default:
+ assert(false);
+ return;
+ }
}
-/// MovePicker::score_captures(), MovePicker::score_noncaptures(),
-/// MovePicker::score_evasions() and MovePicker::score_qcaptures() assign a
-/// numerical move ordering score to each move in a move list. The moves
-/// with highest scores will be picked first by pick_move_from_list().
+/// 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
+ // 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
+ // 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.
- // While scoring captures it moves all captures with negative SEE values
- // to the badCaptures[] array.
+ // 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;
- int seeValue;
- for (int i = 0; i < numOfMoves; i++)
+ // Use MVV/LVA ordering
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- m = moves[i].move;
- seeValue = pos.see(m);
- if (seeValue >= 0)
- {
- if (move_promotion(m))
- moves[i].score = QueenValueMidgame;
- else
- moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
- -int(pos.type_of_piece_on(move_from(m)));
- }
+ m = cur->move;
+ if (move_is_promotion(m))
+ cur->score = QueenValueMidgame;
else
- {
- // Losing capture, move it to the badCaptures[] array
- assert(numOfBadCaptures < 63);
- moves[i].score = seeValue;
- badCaptures[numOfBadCaptures++] = moves[i];
- moves[i--] = moves[--numOfMoves];
- }
+ cur->score = pos.midgame_value_of_piece_on(move_to(m))
+ - pos.type_of_piece_on(move_from(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;
- int hs;
+ Square from;
- for (int i = 0; i < numOfMoves; i++)
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- m = moves[i].move;
-
- if (m == killer1)
- hs = HistoryMax + 2;
- else if (m == killer2)
- hs = HistoryMax + 1;
- else
- hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
-
- // Ensure history is always preferred to pst
- if (hs > 0)
- hs += 1000;
-
- // pst based scoring
- moves[i].score = hs + pos.mg_pst_delta(m);
+ m = cur->move;
+ from = move_from(m);
+ cur->score = H.value(pos.piece_on(from), move_to(m));
}
}
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;
- for (int i = 0; i < numOfMoves; i++)
- {
- Move m = moves[i].move;
- if (m == ttMove)
- moves[i].score = 2*HistoryMax;
- else if (!pos.square_is_empty(move_to(m)))
- {
- int seeScore = pos.see(m);
- moves[i].score = (seeScore >= 0)? seeScore + HistoryMax : seeScore;
- } else
- moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
- }
-}
-
-void MovePicker::score_qcaptures() {
+ // Skip if we don't have at least two moves to order
+ if (lastMove < moves + 2)
+ return;
- // Use MVV/LVA ordering
- for (int i = 0; i < numOfMoves; i++)
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- Move m = moves[i].move;
- if (move_promotion(m))
- moves[i].score = QueenValueMidgame;
+ 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;
else
- moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
- -int(pos.type_of_piece_on(move_from(m)));
+ cur->score = H.value(pos.piece_on(move_from(m)), move_to(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.
-/// MovePicker::pick_move_from_list() picks the move with the biggest score
-/// from a list of generated moves (moves[] or badCaptures[], depending on
-/// the current move generation phase). It takes care not to return the
-/// transposition table move if that has already been serched previously.
-
-Move MovePicker::pick_move_from_list() {
-
- assert(movesPicked >= 0);
- assert(!pos.is_check() || PhaseTable[phaseIndex] == PH_EVASIONS || PhaseTable[phaseIndex] == PH_STOP);
- assert( pos.is_check() || PhaseTable[phaseIndex] != PH_EVASIONS);
+Move MovePicker::get_next_move() {
- switch (PhaseTable[phaseIndex]) {
+ Move move;
- case PH_GOOD_CAPTURES:
- case PH_NONCAPTURES:
- while (movesPicked < numOfMoves)
- {
- Move move = moves[movesPicked++].move;
+ while (true)
+ {
+ while (curMove == lastMove)
+ go_next_phase();
+
+ switch (phase) {
+
+ case PH_TT_MOVE:
+ curMove++;
+ return ttMove;
+ break;
+
+ case PH_GOOD_CAPTURES:
+ 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;
+
+ // 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;
+ }
+ break;
+
+ case PH_GOOD_PROBCUT:
+ move = pick_best(curMove++, lastMove).move;
if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
+ && pos.see(move) > captureThreshold)
return move;
- }
- break;
-
- case PH_EVASIONS:
- if (movesPicked < numOfMoves)
- return moves[movesPicked++].move;
-
- break;
+ break;
+
+ case PH_KILLERS:
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_pl(move)
+ && move != ttMove
+ && !pos.move_is_capture(move))
+ return move;
+ break;
- case PH_BAD_CAPTURES:
- while (movesPicked < numOfBadCaptures)
- {
- Move move = badCaptures[movesPicked++].move;
+ case PH_NONCAPTURES_1:
+ case PH_NONCAPTURES_2:
+ move = (curMove++)->move;
if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
+ && move != killers[0].move
+ && move != killers[1].move)
return move;
- }
- break;
+ break;
- case PH_QCAPTURES:
- case PH_QCHECKS:
- while (movesPicked < numOfMoves)
- {
- Move move = moves[movesPicked++].move;
- // Maybe postpone the legality check until after futility pruning?
- if ( move != ttMove
- && pos.pl_move_is_legal(move, pinned))
+ case PH_BAD_CAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ return move;
+
+ case PH_EVASIONS:
+ case PH_QCAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ if (move != ttMove)
return move;
- }
- break;
+ break;
- default:
- break;
- }
- return MOVE_NONE;
-}
+ case PH_QCHECKS:
+ move = (curMove++)->move;
+ if (move != ttMove)
+ return move;
+ break;
+ case PH_STOP:
+ return MOVE_NONE;
-/// MovePicker::init_phase_table() initializes the PhaseTable[],
-/// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex
-/// and QsearchWithoutChecksPhaseIndex. It is only called once during
-/// program startup, and never again while the program is running.
-
-void MovePicker::init_phase_table() {
-
- int i = 0;
-
- // Main search
- MainSearchPhaseIndex = i - 1;
- PhaseTable[i++] = PH_TT_MOVE;
- PhaseTable[i++] = PH_MATE_KILLER;
- PhaseTable[i++] = PH_GOOD_CAPTURES;
- // PH_KILLER_1 and PH_KILLER_2 are not yet used.
- // PhaseTable[i++] = PH_KILLER_1;
- // PhaseTable[i++] = PH_KILLER_2;
- PhaseTable[i++] = PH_NONCAPTURES;
- PhaseTable[i++] = PH_BAD_CAPTURES;
- PhaseTable[i++] = PH_STOP;
-
- // Check evasions
- EvasionsPhaseIndex = i - 1;
- PhaseTable[i++] = PH_EVASIONS;
- PhaseTable[i++] = PH_STOP;
-
- // Quiescence search with checks
- QsearchWithChecksPhaseIndex = i - 1;
- PhaseTable[i++] = PH_TT_MOVE;
- PhaseTable[i++] = PH_QCAPTURES;
- PhaseTable[i++] = PH_QCHECKS;
- PhaseTable[i++] = PH_STOP;
-
- // Quiescence search without checks
- QsearchWithoutChecksPhaseIndex = i - 1;
- PhaseTable[i++] = PH_TT_MOVE;
- PhaseTable[i++] = PH_QCAPTURES;
- PhaseTable[i++] = PH_STOP;
+ default:
+ assert(false);
+ break;
+ }
+ }
}