X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=69d60bade0f5fc93abeb087f1c6463fe1a241abc;hp=6b7483eb99c0a782f529b71cbb950e8aaa7a791a;hb=3ef4fdeaa01f4d41fc723d54c0a17cea712cf035;hpb=e9de96f0e417dc706882b645d14dbf41e7ccc467
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 6b7483eb..69d60bad 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,39 +18,35 @@
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
+ };
+
CACHE_LINE_ALIGNMENT
- const MovegenPhaseT MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
- const MovegenPhaseT EvasionsPhaseTable[] = { PH_EVASIONS, PH_STOP};
- const MovegenPhaseT QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
- const MovegenPhaseT QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
+ const uint8_t MainSearchTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP };
+ const uint8_t EvasionTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP };
+ const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP };
+ const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
}
-
-////
-//// Functions
-////
-
+bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; }
/// Constructor for the MovePicker class. Apart from the position for which
/// it is asked to pick legal moves, MovePicker also wants some information
@@ -59,35 +55,67 @@ namespace {
/// 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) : pos(p), H(h) {
+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;
- if (ss)
+ badCaptureThreshold = 0;
+ badCaptures = moves + MAX_MOVES;
+
+ assert(d > DEPTH_ZERO);
+
+ pinned = p.pinned_pieces(pos.side_to_move());
+
+ if (p.in_check())
{
- ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
+ ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
+ phasePtr = EvasionTable;
+ }
+ 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;
- finished = false;
- numOfBadCaptures = 0;
+ // Consider sligtly negative captures as good if at low
+ // depth and far from beta.
+ if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
+ badCaptureThreshold = -PawnValueMidgame;
- Color us = pos.side_to_move();
+ phasePtr = MainSearchTable;
+ }
+
+ phasePtr += int(!searchTT) - 1;
+ go_next_phase();
+}
+
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
+ : pos(p), H(h) {
+ int searchTT = ttm;
+ ttMoves[0].move = ttm;
+ ttMoves[1].move = MOVE_NONE;
+
+ assert(d <= DEPTH_ZERO);
- dc = p.discovered_check_candidates(us);
- pinned = p.pinned_pieces(us);
+ pinned = p.pinned_pieces(pos.side_to_move());
- if (p.is_check())
- phasePtr = EvasionsPhaseTable;
- else if (d > Depth(0))
- phasePtr = MainSearchPhaseTable;
- else if (d == Depth(0))
- phasePtr = QsearchWithChecksPhaseTable;
+ if (p.in_check())
+ phasePtr = EvasionTable;
+ else if (d >= DEPTH_QS_CHECKS)
+ phasePtr = QsearchWithChecksTable;
else
- phasePtr = QsearchWithoutChecksPhaseTable;
+ {
+ 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))
+ searchTT = ttMoves[0].move = MOVE_NONE;
+ }
- phasePtr--;
+ phasePtr += int(!searchTT) - 1;
go_next_phase();
}
@@ -107,9 +135,8 @@ void MovePicker::go_next_phase() {
return;
case PH_GOOD_CAPTURES:
- lastMove = generate_captures(pos, moves);
+ lastMove = generate(pos, moves);
score_captures();
- std::sort(moves, lastMove);
return;
case PH_KILLERS:
@@ -118,38 +145,35 @@ void MovePicker::go_next_phase() {
return;
case PH_NONCAPTURES:
- lastMove = generate_noncaptures(pos, moves);
+ lastMove = generate(pos, moves);
score_noncaptures();
- std::sort(moves, lastMove);
+ sort_moves(moves, lastMove, &lastGoodNonCapture);
return;
case PH_BAD_CAPTURES:
- // Bad captures SEE value is already calculated so just sort them
- // to get SEE move ordering.
+ // Bad captures SEE value is already calculated so just pick
+ // them in order to get SEE move ordering.
curMove = badCaptures;
- lastMove = badCaptures + numOfBadCaptures;
- std::sort(badCaptures, lastMove);
+ lastMove = moves + MAX_MOVES;
return;
case PH_EVASIONS:
- assert(pos.is_check());
- lastMove = generate_evasions(pos, moves, pinned);
+ assert(pos.in_check());
+ lastMove = generate(pos, moves);
score_evasions();
- std::sort(moves, lastMove);
return;
case PH_QCAPTURES:
- lastMove = generate_captures(pos, moves);
+ lastMove = generate(pos, moves);
score_captures();
- std::sort(moves, lastMove);
return;
case PH_QCHECKS:
- // Perhaps we should order moves move here? FIXME
- lastMove = generate_non_capture_checks(pos, moves, dc);
+ lastMove = generate(pos, moves);
return;
case PH_STOP:
+ lastMove = curMove + 1; // Avoid another go_next_phase() call
return;
default:
@@ -187,144 +211,133 @@ void MovePicker::score_captures() {
if (move_is_promotion(m))
cur->score = QueenValueMidgame;
else
- cur->score = int(pos.midgame_value_of_piece_on(move_to(m)))
- -int(pos.type_of_piece_on(move_from(m)));
+ 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;
- Piece piece;
- Square from, to;
- int hs;
+ 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);
- hs = H.move_ordering_score(piece, to);
-
- // Ensure history is always preferred to pst
- if (hs > 0)
- hs += 1000;
-
- // pst based scoring
- cur->score = hs + pos.pst_delta(piece, from, to);
+ 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;
+
+ // Skip if we don't have at least two moves to order
+ if (lastMove < moves + 2)
+ return;
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- if (m == ttMoves[0].move)
- cur->score = 2 * HistoryMax;
- else if (!pos.square_is_empty(move_to(m)))
- {
- int seeScore = pos.see(m);
- cur->score = seeScore + (seeScore >= 0 ? HistoryMax : 0);
- } else
- cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+ 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
+ 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 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 that has already been serched previously.
+/// 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() {
- assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
- assert( pos.is_check() || *phasePtr != PH_EVASIONS);
+ Move move;
while (true)
{
+ while (curMove == lastMove)
+ go_next_phase();
+
switch (phase) {
case PH_TT_MOVES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned))
- return move;
- }
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_legal(move, pinned))
+ return move;
break;
case PH_GOOD_CAPTURES:
- while (curMove != lastMove)
+ move = pick_best(curMove++, lastMove).move;
+ if ( move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && pos.pl_move_is_legal(move, pinned))
{
- Move move = (curMove++)->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 >= 0)
- return move;
-
- // Losing capture, move it to the badCaptures[] array, note
- // that move has now been already checked for legality.
- assert(numOfBadCaptures < 63);
- badCaptures[numOfBadCaptures].move = move;
- badCaptures[numOfBadCaptures++].score = seeValue;
- }
+ // Check for a non negative SEE now
+ int seeValue = pos.see_sign(move);
+ if (seeValue >= badCaptureThreshold)
+ return move;
+
+ // Losing capture, move it to the tail of the array, note
+ // that move has now been already checked for legality.
+ (--badCaptures)->move = move;
+ badCaptures->score = seeValue;
}
break;
case PH_KILLERS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move != ttMoves[0].move
- && move != ttMoves[1].move
- && move_is_legal(pos, move, pinned)
- && !pos.move_is_capture(move))
- return move;
- }
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_legal(move, pinned)
+ && move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && !pos.move_is_capture(move))
+ return move;
break;
case PH_NONCAPTURES:
- while (curMove != lastMove)
- {
- Move 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;
- }
+ // Sort negative scored moves only when we get there
+ if (curMove == lastGoodNonCapture)
+ insertion_sort(lastGoodNonCapture, lastMove);
+
+ 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 PH_EVASIONS:
case PH_BAD_CAPTURES:
- if (curMove != lastMove)
- return (curMove++)->move;
- break;
+ move = pick_best(curMove++, lastMove).move;
+ return move;
+ 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 PH_QCHECKS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
- // Maybe postpone the legality check until after futility pruning?
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- }
+ move = (curMove++)->move;
+ if ( move != ttMoves[0].move
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
break;
case PH_STOP:
@@ -334,25 +347,5 @@ Move MovePicker::get_next_move() {
assert(false);
break;
}
- 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.
-
-Move MovePicker::get_next_move(Lock &lock) {
-
- lock_grab(&lock);
- if (finished)
- {
- lock_release(&lock);
- return MOVE_NONE;
- }
- Move m = get_next_move();
- if (m == MOVE_NONE)
- finished = true;
-
- lock_release(&lock);
- return m;
-}