X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=a9cc245dcb570702d316f4736152d550457fbef2;hp=e1f8e4e77f944bd5831245b81dd16c467c9935f0;hb=9ab84a816539ade23868f0383e39634e6ab88df5;hpb=5dc23121215039938a9ef4e59ae934312774571c
diff --git a/src/movepick.cpp b/src/movepick.cpp
index e1f8e4e7..a9cc245d 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,18 +1,19 @@
/*
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-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -22,6 +23,7 @@
//// Includes
////
+#include
#include
#include "history.h"
@@ -37,443 +39,331 @@
namespace {
- /// Variables
-
- MovePicker::MovegenPhase PhaseTable[32];
- int MainSearchPhaseIndex;
- int EvasionsPhaseIndex;
- int QsearchWithChecksPhaseIndex;
- int QsearchWithoutChecksPhaseIndex;
-
+ CACHE_LINE_ALIGNMENT
+ const MovegenPhaseT MainSearchPhaseTable[] = { PH_NULL_MOVE, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+ const MovegenPhaseT MainSearchNoNullPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+ const MovegenPhaseT LowSearchPhaseTable[] = { PH_TT_MOVES, PH_NULL_MOVE, 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};
}
-
////
//// Functions
////
-/// Constructor for the MovePicker class. Apart from the position for which
+/// 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 pvnode, Move ttm, Move mk,
- Move k1, Move k2, Depth d) : pos(p) {
- pvNode = pvnode;
- ttMove = ttm;
- mateKiller = (mk == ttm)? MOVE_NONE : mk;
- killer1 = k1;
- killer2 = k2;
- depth = d;
- movesPicked = 0;
- numOfMoves = 0;
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
+ const History& h, SearchStack* ss, bool useNullMove) : pos(p), H(h) {
+ ttMoves[0].move = ttm;
+ if (ss)
+ {
+ ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
+ 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;
- dc = p.discovered_check_candidates(p.side_to_move());
+
+ Color us = pos.side_to_move();
+
+ dc = p.discovered_check_candidates(us);
+ pinned = p.pinned_pieces(us);
if (p.is_check())
- phaseIndex = EvasionsPhaseIndex;
- else if (depth > Depth(0))
- phaseIndex = MainSearchPhaseIndex;
- else if (depth == Depth(0))
- phaseIndex = QsearchWithChecksPhaseIndex;
+ phasePtr = EvasionsPhaseTable;
+ else if (d >= Depth(3 * OnePly))
+ phasePtr = useNullMove ? MainSearchPhaseTable : MainSearchNoNullPhaseTable;
+ else if (d > Depth(0))
+ phasePtr = useNullMove ? LowSearchPhaseTable : MainSearchNoNullPhaseTable;
+ else if (d == Depth(0))
+ phasePtr = QsearchWithChecksPhaseTable;
else
- phaseIndex = QsearchWithoutChecksPhaseIndex;
-
- pinned = p.pinned_pieces(p.side_to_move());
+ phasePtr = QsearchWithoutChecksPhaseTable;
- finished = false;
+ phasePtr--;
+ go_next_phase();
}
-/// 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.
+/// 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.
-Move MovePicker::get_next_move() {
+void MovePicker::go_next_phase() {
- Move move;
+ curMove = moves;
+ phase = *(++phasePtr);
+ switch (phase) {
- 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;
- }
-
- // Next phase
- phaseIndex++;
- switch (PhaseTable[phaseIndex]) {
-
- case PH_TT_MOVE:
- if (ttMove != MOVE_NONE)
- {
- assert(move_is_ok(ttMove));
- if (generate_move_if_legal(pos, ttMove, pinned) != MOVE_NONE)
- return ttMove;
- }
- break;
-
- case PH_MATE_KILLER:
- if (mateKiller != MOVE_NONE)
- {
- assert(move_is_ok(mateKiller));
- if (generate_move_if_legal(pos, mateKiller, pinned) != MOVE_NONE)
- return mateKiller;
- }
- break;
-
- case PH_GOOD_CAPTURES:
- numOfMoves = generate_captures(pos, moves);
- score_captures();
- movesPicked = 0;
- break;
-
- case PH_BAD_CAPTURES:
- badCapturesPicked = 0;
- break;
-
- case PH_NONCAPTURES:
- numOfMoves = generate_noncaptures(pos, moves);
- score_noncaptures();
- movesPicked = 0;
- break;
-
- case PH_EVASIONS:
- assert(pos.is_check());
- numOfMoves = generate_evasions(pos, moves);
- score_evasions();
- movesPicked = 0;
- break;
-
- case PH_QCAPTURES:
- numOfMoves = generate_captures(pos, moves);
- score_qcaptures();
- movesPicked = 0;
- break;
-
- case PH_QCHECKS:
- numOfMoves = generate_checks(pos, moves, dc);
- movesPicked = 0;
- break;
-
- case PH_STOP:
- return MOVE_NONE;
-
- default:
- assert(false);
- return MOVE_NONE;
- }
- }
- assert(false);
+ case PH_NULL_MOVE:
+ return;
- return MOVE_NONE;
-}
+ case PH_TT_MOVES:
+ curMove = ttMoves;
+ lastMove = curMove + 2;
+ return;
+ case PH_GOOD_CAPTURES:
+ lastMove = generate_captures(pos, moves);
+ score_captures();
+ std::sort(moves, lastMove);
+ return;
-/// 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.
+ case PH_KILLERS:
+ curMove = killers;
+ lastMove = curMove + 2;
+ return;
-Move MovePicker::get_next_move(Lock &lock) {
+ case PH_NONCAPTURES:
+ lastMove = generate_noncaptures(pos, moves);
+ score_noncaptures();
+ std::sort(moves, lastMove);
+ 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_BAD_CAPTURES:
+ // Bad captures SEE value is already calculated so just sort them
+ // to get SEE move ordering.
+ curMove = badCaptures;
+ lastMove = badCaptures + numOfBadCaptures;
+ std::sort(badCaptures, lastMove);
+ return;
+
+ case PH_EVASIONS:
+ assert(pos.is_check());
+ lastMove = generate_evasions(pos, moves, pinned);
+ score_evasions();
+ std::sort(moves, lastMove);
+ return;
+
+ case PH_QCAPTURES:
+ lastMove = generate_captures(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);
+ return;
- lock_release(&lock);
- return m;
+ case PH_STOP:
+ return;
+
+ 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.
+ // 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
+ // 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.
- for (int i = 0; i < numOfMoves; i++)
+ // 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;
+
+ // Use MVV/LVA ordering
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- Move m = moves[i].move;
- moves[i].score = pos.see(m);
- if (moves[i].score >= 0)
- moves[i].score = move_promotion(m) ? QueenValueMidgame
- : pos.midgame_value_of_piece_on(move_to(m));
+ m = cur->move;
+ 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)));
}
}
void MovePicker::score_noncaptures() {
-
- for (int i = 0; i < numOfMoves; i++)
+ // 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;
+
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- Move m = moves[i].move;
- if (m == killer1)
- moves[i].score = HistoryMax + 2;
- else if (m == killer2)
- moves[i].score = HistoryMax + 1;
- else
- moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
-
- // Ensure moves in history are always sorted as first
- if (moves[i].score > 0)
- moves[i].score += 1000;
-
- moves[i].score += pos.mg_pst_delta(moves[i].move);
+ 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);
}
}
void MovePicker::score_evasions() {
- for (int i = 0; i < numOfMoves; i++)
+ Move m;
+
+ for (MoveStack* cur = moves; cur != lastMove; cur++)
{
- Move m = moves[i].move;
- if (m == ttMove)
- moves[i].score = 2*HistoryMax;
+ m = cur->move;
+ if (m == ttMoves[0].move)
+ cur->score = 2 * HistoryMax;
else if (!pos.square_is_empty(move_to(m)))
{
- moves[i].score = pos.see(m);
- if (moves[i].score >= 0)
- moves[i].score += HistoryMax;
- }
- else
- moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
- }
- // FIXME try psqt also here
-}
-
-void MovePicker::score_qcaptures() {
-
- // Use MVV ordering
- for (int i = 0; i < numOfMoves; i++)
- {
- Move m = moves[i].move;
- moves[i].score = move_promotion(m) ? QueenValueMidgame
- : pos.midgame_value_of_piece_on(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));
}
}
+/// 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.
-/// find_best_index() loops across the moves and returns index of
-/// the highest scored one.
-
-int MovePicker::find_best_index() {
-
- int bestScore = -10000000, bestIndex = -1;
-
- for (int i = movesPicked; i < numOfMoves; i++)
- if (moves[i].score > bestScore)
- {
- bestIndex = i;
- bestScore = moves[i].score;
- }
- return bestIndex;
-}
-
+Move MovePicker::get_next_move() {
-/// 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.
-/// While picking captures in the PH_GOOD_CAPTURES phase (i.e. while picking
-/// non-losing captures in the main search), it moves all captures with
-/// negative SEE values to the badCaptures[] array.
+ assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
+ assert( pos.is_check() || *phasePtr != PH_EVASIONS);
-Move MovePicker::pick_move_from_list() {
+ while (true)
+ {
+ switch (phase) {
- int bestIndex;
- Move move;
+ case PH_NULL_MOVE:
+ go_next_phase();
+ return MOVE_NULL;
- switch (PhaseTable[phaseIndex]) {
+ case PH_TT_MOVES:
+ while (curMove != lastMove)
+ {
+ Move move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && move_is_legal(pos, move, pinned))
+ return move;
+ }
+ break;
- case PH_GOOD_CAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
- while (movesPicked < numOfMoves)
- {
- int bestScore = -10000000;
- bestIndex = -1;
- for (int i = movesPicked; i < numOfMoves; i++)
+ case PH_GOOD_CAPTURES:
+ while (curMove != lastMove)
{
- if (moves[i].score < 0)
+ Move move = (curMove++)->move;
+ if ( move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && pos.pl_move_is_legal(move, pinned))
{
- // Losing capture, move it to the badCaptures[] array
+ // 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++] = moves[i];
- moves[i--] = moves[--numOfMoves];
- }
- else if (moves[i].score > bestScore)
- {
- bestIndex = i;
- bestScore = moves[i].score;
- }
+ badCaptures[numOfBadCaptures].move = move;
+ badCaptures[numOfBadCaptures++].score = seeValue;
+ }
}
- if (bestIndex != -1) // Found a good capture
+ break;
+
+ case PH_KILLERS:
+ while (curMove != lastMove)
{
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- if ( move != ttMove
- && move != mateKiller
- && pos.move_is_legal(move, pinned))
+ 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;
}
- }
- break;
-
- case PH_NONCAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
- while (movesPicked < numOfMoves)
- {
- // If this is a PV node or we have only picked a few moves, scan
- // the entire move list for the best move. If many moves have already
- // been searched and it is not a PV node, we are probably failing low
- // anyway, so we just pick the first move from the list.
- bestIndex = (movesPicked < 12 || pvNode ? find_best_index() : movesPicked);
+ break;
- if (bestIndex != -1)
+ case PH_NONCAPTURES:
+ while (curMove != lastMove)
{
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- if ( move != ttMove
- && move != mateKiller
- && pos.move_is_legal(move, pinned))
+ 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;
- }
- }
- break;
-
- case PH_EVASIONS:
- assert(pos.is_check());
- assert(movesPicked >= 0);
- while (movesPicked < numOfMoves)
- {
- bestIndex = find_best_index();
-
- if (bestIndex != -1)
- {
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- return move;
}
- }
- break;
+ break;
- case PH_BAD_CAPTURES:
- assert(!pos.is_check());
- assert(badCapturesPicked >= 0);
- // It's probably a good idea to use SEE move ordering here, instead
- // of just picking the first move. FIXME
- while (badCapturesPicked < numOfBadCaptures)
- {
- move = badCaptures[badCapturesPicked++].move;
- if ( move != ttMove
- && move != mateKiller
- && pos.move_is_legal(move, pinned))
- return move;
- }
- break;
-
- case PH_QCAPTURES:
- assert(!pos.is_check());
- assert(movesPicked >= 0);
- while (movesPicked < numOfMoves)
- {
- // FIXME makes sens to score qcaps?
- bestIndex = (movesPicked < 4 ? find_best_index() : movesPicked);
+ case PH_EVASIONS:
+ case PH_BAD_CAPTURES:
+ if (curMove != lastMove)
+ return (curMove++)->move;
+ break;
- if (bestIndex != -1)
+ case PH_QCAPTURES:
+ case PH_QCHECKS:
+ while (curMove != lastMove)
{
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- if (move != ttMove && pos.move_is_legal(move, pinned))
+ 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;
}
- }
- break;
+ 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.move_is_legal(move, pinned))
- return move;
- }
- break;
+ case PH_STOP:
+ return MOVE_NONE;
- default:
- break;
+ default:
+ assert(false);
+ break;
+ }
+ go_next_phase();
}
- return MOVE_NONE;
}
+/// 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.
-/// MovePicker::current_move_type() returns the type of the just
-/// picked next move. It can be used in search to further differentiate
-/// according to the current move type: capture, non capture, escape, etc.
-MovePicker::MovegenPhase MovePicker::current_move_type() const {
-
- return PhaseTable[phaseIndex];
-}
-
+Move MovePicker::get_next_move(Lock &lock) {
-/// MovePicker::init_phase_table() initializes the PhaseTable[],
-/// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex
-/// and QsearchWithoutChecksPhaseIndex variables. 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_QCAPTURES;
- PhaseTable[i++] = PH_QCHECKS;
- PhaseTable[i++] = PH_STOP;
-
- // Quiescence search without checks
- QsearchWithoutChecksPhaseIndex = i - 1;
- PhaseTable[i++] = PH_QCAPTURES;
- PhaseTable[i++] = PH_STOP;
+ 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;
}