X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=9411b5a701d34ef4070b64d14213016b45766426;hp=d0c1b587bd5d7b3ef3973b7e92c1ad9983393b76;hb=94dd204c3b10ebe0e6c8df5d7c98de5ba4906cad;hpb=4e151f7e0d70b9a61ac5adba269a80555133cb73
diff --git a/src/movepick.cpp b/src/movepick.cpp
index d0c1b587..9411b5a7 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 Marco Costalba
+ Copyright (C) 2008-2014 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,428 +18,368 @@
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"
+#include "thread.h"
+namespace {
-////
-//// Local definitions
-////
+ 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
+ };
+
+ // Our insertion sort, which is guaranteed (and also needed) to be stable
+ void insertion_sort(ExtMove* begin, ExtMove* end)
+ {
+ ExtMove tmp, *p, *q;
-namespace {
+ for (p = begin + 1; p < end; ++p)
+ {
+ tmp = *p;
+ for (q = p; q != begin && *(q-1) < tmp; --q)
+ *q = *(q-1);
+ *q = tmp;
+ }
+ }
- /// Variables
+ // Unary predicate used by std::partition to split positive values from remaining
+ // ones so as to sort the two sets separately, with the second sort delayed.
+ inline bool has_positive_value(const ExtMove& move) { return move.value > 0; }
- MovePicker::MovegenPhase PhaseTable[32];
- int MainSearchPhaseIndex;
- int EvasionsPhaseIndex;
- int QsearchWithChecksPhaseIndex;
- int QsearchWithoutChecksPhaseIndex;
+ // Picks 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. possible captures.
+ inline ExtMove* pick_best(ExtMove* begin, ExtMove* end)
+ {
+ std::swap(*begin, *std::max_element(begin, end));
+ return begin;
+ }
+} // 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
+/// ordering is at the current node.
-////
-//// Functions
-////
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), depth(d) {
+ assert(d > DEPTH_ZERO);
-/// Constructor for the MovePicker class. Apart from the position for which
-/// it is asked to pick legal moves, MovePicker also wants some 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;
+ cur = end = moves;
+ endBadCaptures = moves + MAX_MOVES - 1;
+ countermoves = cm;
+ followupmoves = fm;
+ ss = s;
- Color us = pos.side_to_move();
+ if (pos.checkers())
+ stage = EVASION;
- dc = p.discovered_check_candidates(us);
- pinned = p.pinned_pieces(us);
+ else
+ stage = MAIN_SEARCH;
- finished = false;
+ ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ end += (ttMove != MOVE_NONE);
}
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ Square s) : pos(p), history(h), cur(moves), end(moves) {
-/// 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.
+ assert(d <= DEPTH_ZERO);
-Move MovePicker::get_next_move() {
+ if (pos.checkers())
+ stage = EVASION;
- Move move;
+ else if (d > DEPTH_QS_NO_CHECKS)
+ stage = QSEARCH_0;
- while (true)
- {
- // 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;
- }
+ else if (d > DEPTH_QS_RECAPTURES)
+ stage = QSEARCH_1;
- // 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:
- 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:
- numOfMoves = generate_non_capture_checks(pos, moves, dc);
- movesPicked = 0;
- break;
-
- case PH_STOP:
- return MOVE_NONE;
-
- default:
- assert(false);
- return MOVE_NONE;
- }
+ else
+ {
+ stage = RECAPTURE;
+ recaptureSquare = s;
+ ttm = MOVE_NONE;
}
+
+ ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ end += (ttMove != MOVE_NONE);
}
+MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
+ : pos(p), history(h), cur(moves), end(moves) {
-/// 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.
+ assert(!pos.checkers());
-Move MovePicker::get_next_move(Lock &lock) {
+ stage = PROBCUT;
- lock_grab(&lock);
- if (finished)
- {
- lock_release(&lock);
- return MOVE_NONE;
- }
- Move m = get_next_move();
- if (m == MOVE_NONE)
- finished = true;
+ // 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);
- lock_release(&lock);
- return m;
-}
+ if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold))
+ ttMove = MOVE_NONE;
+ end += (ttMove != MOVE_NONE);
+}
-/// 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().
-void MovePicker::score_captures() {
+/// 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
+ // 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.
- Move m;
- int seeValue;
-
- for (int i = 0; i < numOfMoves; i++)
- {
- 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)));
- }
- else
- {
- // Losing capture, move it to the badCaptures[] array
- assert(numOfBadCaptures < 63);
- moves[i].score = seeValue;
- badCaptures[numOfBadCaptures++] = moves[i];
- moves[i--] = moves[--numOfMoves];
- }
- }
-}
-
-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.
+ // 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.
Move m;
- int hs;
- for (int i = 0; i < numOfMoves; i++)
+ for (ExtMove* it = moves; it != end; ++it)
{
- 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);
+ m = it->move;
+ it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m)));
- // Ensure history is always preferred to pst
- if (hs > 0)
- hs += 1000;
+ if (type_of(m) == ENPASSANT)
+ it->value += PieceValue[MG][PAWN];
- // pst based scoring
- moves[i].score = hs + pos.mg_pst_delta(m);
+ else if (type_of(m) == PROMOTION)
+ it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
}
}
-void MovePicker::score_evasions() {
+template<>
+void MovePicker::score() {
+
+ Move m;
- for (int i = 0; i < numOfMoves; i++)
+ for (ExtMove* it = moves; it != end; ++it)
{
- 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);
+ m = it->move;
+ it->value = history[pos.moved_piece(m)][to_sq(m)];
}
}
-void MovePicker::score_qcaptures() {
+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.
+ Move m;
+ Value see;
- // Use MVV/LVA ordering
- for (int i = 0; i < numOfMoves; i++)
+ for (ExtMove* it = moves; it != end; ++it)
{
- Move m = moves[i].move;
- if (move_promotion(m))
- moves[i].score = QueenValueMidgame;
+ m = it->move;
+ if ((see = pos.see_sign(m)) < VALUE_ZERO)
+ it->value = see - HistoryStats::Max; // At the bottom
+
+ else if (pos.capture(m))
+ it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else
- moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
- -int(pos.type_of_piece_on(move_from(m)));
+ it->value = history[pos.moved_piece(m)][to_sq(m)];
}
}
-/// 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.
+/// 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:
+ end = generate(pos, moves);
+ score();
+ return;
+
+ case KILLERS_S1:
+ cur = killers;
+ end = cur + 2;
+
+ killers[0].move = ss->killers[0];
+ killers[1].move = ss->killers[1];
+ killers[2].move = killers[3].move = MOVE_NONE;
+ killers[4].move = killers[5].move = MOVE_NONE;
+
+ // Please note that following code is racy and could yield to rare (less
+ // than 1 out of a million) duplicated entries in SMP case. This is harmless.
+
+ // Be sure countermoves are different from killers
+ for (int i = 0; i < 2; ++i)
+ if ( countermoves[i] != (cur+0)->move
+ && countermoves[i] != (cur+1)->move)
+ (end++)->move = countermoves[i];
+
+ // Be sure followupmoves are different from killers and countermoves
+ for (int i = 0; i < 2; ++i)
+ if ( followupmoves[i] != (cur+0)->move
+ && followupmoves[i] != (cur+1)->move
+ && followupmoves[i] != (cur+2)->move
+ && followupmoves[i] != (cur+3)->move)
+ (end++)->move = followupmoves[i];
+ return;
+
+ case QUIETS_1_S1:
+ endQuiets = end = generate(pos, moves);
+ score();
+ end = std::partition(cur, end, has_positive_value);
+ insertion_sort(cur, end);
+ return;
+
+ case QUIETS_2_S1:
+ cur = end;
+ end = endQuiets;
+ if (depth >= 3 * ONE_PLY)
+ insertion_sort(cur, end);
+ return;
+
+ case BAD_CAPTURES_S1:
+ // Just pick them in reverse order to get MVV/LVA ordering
+ cur = moves + MAX_MOVES - 1;
+ end = endBadCaptures;
+ return;
+
+ case EVASIONS_S2:
+ end = generate(pos, moves);
+ if (end > moves + 1)
+ score();
+ return;
+
+ case QUIET_CHECKS_S3:
+ end = generate(pos, moves);
+ return;
+
+ case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
+ stage = STOP;
+ /* Fall through */
+
+ case STOP:
+ end = cur + 1; // Avoid another next_phase() call
+ return;
-Move MovePicker::pick_move_from_list() {
+ default:
+ assert(false);
+ }
+}
- Move move;
- switch (PhaseTable[phaseIndex]) {
+/// 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() {
- case PH_GOOD_CAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
+ Move move;
- while (movesPicked < numOfMoves)
- {
- move = moves[movesPicked++].move;
- if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
+ while (true)
+ {
+ while (cur == end)
+ 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++, end)->move;
+ if (move != ttMove)
+ {
+ if (pos.see_sign(move) >= VALUE_ZERO)
+ return move;
+
+ // Losing capture, move it to the tail of the array
+ (endBadCaptures--)->move = move;
+ }
+ break;
+
+ case KILLERS_S1:
+ move = (cur++)->move;
+ if ( move != MOVE_NONE
+ && move != ttMove
+ && pos.pseudo_legal(move)
+ && !pos.capture(move))
return move;
- }
- break;
+ break;
- case PH_NONCAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
-
- while (movesPicked < numOfMoves)
- {
- move = moves[movesPicked++].move;
+ case QUIETS_1_S1: case QUIETS_2_S1:
+ move = (cur++)->move;
if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
+ && move != killers[0].move
+ && move != killers[1].move
+ && move != killers[2].move
+ && move != killers[3].move
+ && move != killers[4].move
+ && move != killers[5].move)
return move;
- }
- break;
+ break;
- case PH_EVASIONS:
- assert(pos.is_check());
- assert(movesPicked >= 0);
+ case BAD_CAPTURES_S1:
+ return (cur--)->move;
- while (movesPicked < numOfMoves)
- {
- move = moves[movesPicked++].move;
- return move;
- }
- break;
-
- case PH_BAD_CAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
- // It's probably a good idea to use SEE move ordering here, instead
- // of just picking the first move. FIXME
- while (movesPicked < numOfBadCaptures)
- {
- move = badCaptures[movesPicked++].move;
- if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
+ case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4:
+ move = pick_best(cur++, end)->move;
+ if (move != ttMove)
return move;
- }
- break;
+ break;
- case PH_QCAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
+ case CAPTURES_S5:
+ move = pick_best(cur++, end)->move;
+ if (move != ttMove && pos.see(move) > captureThreshold)
+ return move;
+ break;
- while (movesPicked < numOfMoves)
- {
- move = moves[movesPicked++].move;
- // Maybe postpone the legality check until after futility pruning?
- if ( move != ttMove
- && pos.pl_move_is_legal(move, pinned))
+ case CAPTURES_S6:
+ move = pick_best(cur++, end)->move;
+ if (to_sq(move) == recaptureSquare)
return move;
- }
- break;
-
- case PH_QCHECKS:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
- // Perhaps we should do something better than just picking the first
- // move here? FIXME
- while (movesPicked < numOfMoves)
- {
- move = moves[movesPicked++].move;
- if ( move != ttMove
- && pos.pl_move_is_legal(move, pinned))
+ break;
+
+ case QUIET_CHECKS_S3:
+ move = (cur++)->move;
+ if (move != ttMove)
return move;
- }
- break;
+ break;
- default:
- break;
+ case STOP:
+ return MOVE_NONE;
+
+ default:
+ assert(false);
+ }
}
- 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;
-}
+/// 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(); }