X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=3d44721b687059b9f8a284759112f7299732a0f4;hb=dc3508d157118cbda500bb42595575105a4602e5;hp=b20d67105d796f51260660c98e4d61cd7ab1d3b3;hpb=cd1cc39b04f261f74250285d19c5f4916abdc8c9;p=stockfish
diff --git a/src/movepick.cpp b/src/movepick.cpp
index b20d6710..3d44721b 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-2015 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,312 @@
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 "thread.h"
namespace {
- /// Variables
-
- MovePicker::MovegenPhase PhaseTable[32];
- int MainSearchPhaseIndex;
- int EvasionsPhaseIndex;
- int QsearchWithChecksPhaseIndex;
- int QsearchWithoutChecksPhaseIndex;
+ enum Stages {
+ MAIN_SEARCH, GOOD_CAPTURES, KILLERS, GOOD_QUIETS, BAD_QUIETS, BAD_CAPTURES,
+ EVASION, ALL_EVASIONS,
+ QSEARCH_WITH_CHECKS, QCAPTURES_1, CHECKS,
+ QSEARCH_WITHOUT_CHECKS, QCAPTURES_2,
+ PROBCUT, PROBCUT_CAPTURES,
+ RECAPTURE, RECAPTURES,
+ STOP
+ };
+
+ // Our insertion sort, which is guaranteed to be stable, as it should be
+ void insertion_sort(ExtMove* begin, ExtMove* end)
+ {
+ ExtMove tmp, *p, *q;
-}
+ for (p = begin + 1; p < end; ++p)
+ {
+ tmp = *p;
+ for (q = p; q != begin && *(q-1) < tmp; --q)
+ *q = *(q-1);
+ *q = tmp;
+ }
+ }
+ // pick_best() finds 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. the possible captures.
+ Move pick_best(ExtMove* begin, ExtMove* end)
+ {
+ std::swap(*begin, *std::max_element(begin, end));
+ return *begin;
+ }
-////
-//// Functions
-////
+} // namespace
-/// 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
+/// 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 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;
+/// search captures, promotions and some checks) and how important good move
+/// ordering is at the current node.
- Color us = pos.side_to_move();
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ const CounterMovesHistoryStats& cmh, Move cm, Search::Stack* s)
+ : pos(p), history(h), counterMovesHistory(cmh), ss(s), countermove(cm), depth(d) {
- dc = p.discovered_check_candidates(us);
- pinned = p.pinned_pieces(us);
+ assert(d > DEPTH_ZERO);
- finished = false;
+ stage = pos.checkers() ? EVASION : MAIN_SEARCH;
+ ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
+ endMoves += (ttMove != MOVE_NONE);
}
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ const CounterMovesHistoryStats& cmh, Square s)
+ : pos(p), history(h), counterMovesHistory(cmh) {
-/// 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_WITH_CHECKS;
- 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_WITHOUT_CHECKS;
- // 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;
- }
+ else
+ {
+ stage = RECAPTURE;
+ recaptureSquare = s;
+ ttm = MOVE_NONE;
}
+
+ ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
+ endMoves += (ttMove != MOVE_NONE);
}
+MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h,
+ const CounterMovesHistoryStats& cmh, Value th)
+ : pos(p), history(h), counterMovesHistory(cmh), threshold(th) {
-/// 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 captures with SEE higher than the given threshold
+ ttMove = ttm
+ && pos.pseudo_legal(ttm)
+ && pos.capture(ttm)
+ && pos.see(ttm) > threshold ? ttm : MOVE_NONE;
- lock_release(&lock);
- return m;
+ endMoves += (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() {
- // 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
- // capture, capturing a more valuable (but sufficiently defended) piece
- // 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];
- }
- }
+/// score() assigns 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, preferring
+ // captures near our home rank. Suprisingly, this appears to perform slightly
+ // better than SEE based move ordering: exchanging big pieces before capturing
+ // a hanging piece probably helps to reduce the subtree size.
+ // 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, saving some SEE calls in case we get a cutoff.
+ for (auto& m : *this)
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(200 * relative_rank(pos.side_to_move(), to_sq(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;
+template<>
+void MovePicker::score() {
- for (int i = 0; i < numOfMoves; i++)
- {
- m = moves[i].move;
+ Square prevSq = to_sq((ss-1)->currentMove);
+ const HistoryStats& cmh = counterMovesHistory[pos.piece_on(prevSq)][prevSq];
- 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);
+ for (auto& m : *this)
+ m.value = history[pos.moved_piece(m)][to_sq(m)]
+ + cmh[pos.moved_piece(m)][to_sq(m)] * 3;
+}
- // Ensure history is always preferred to pst
- if (hs > 0)
- hs += 1000;
+template<>
+void MovePicker::score() {
+ // Try winning and equal captures captures ordered by MVV/LVA, then non-captures
+ // ordered by history value, then bad-captures and quiet moves with a negative
+ // SEE ordered by SEE value.
+ Value see;
- // pst based scoring
- moves[i].score = hs + pos.mg_pst_delta(m);
- }
+ for (auto& m : *this)
+ if ((see = pos.see_sign(m)) < VALUE_ZERO)
+ m.value = see - HistoryStats::Max; // At the bottom
+
+ else if (pos.capture(m))
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
+ else
+ m.value = history[pos.moved_piece(m)][to_sq(m)];
}
-void MovePicker::score_evasions() {
- 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);
- }
-}
+/// 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::score_qcaptures() {
+void MovePicker::generate_next_stage() {
- // Use MVV/LVA ordering
- for (int i = 0; i < numOfMoves; i++)
- {
- Move m = moves[i].move;
- 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)));
- }
-}
+ assert(stage != STOP);
+ cur = moves;
-/// 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.
+ switch (++stage) {
-Move MovePicker::pick_move_from_list() {
+ case GOOD_CAPTURES: case QCAPTURES_1: case QCAPTURES_2:
+ case PROBCUT_CAPTURES: case RECAPTURES:
+ endMoves = generate(pos, moves);
+ score();
+ break;
- assert(movesPicked >= 0);
- assert(!pos.is_check() || PhaseTable[phaseIndex] == PH_EVASIONS || PhaseTable[phaseIndex] == PH_STOP);
- assert( pos.is_check() || PhaseTable[phaseIndex] != PH_EVASIONS);
+ case KILLERS:
+ killers[0] = ss->killers[0];
+ killers[1] = ss->killers[1];
+ killers[2] = countermove;
+ cur = killers;
+ endMoves = cur + 2 + (countermove != killers[0] && countermove != killers[1]);
+ break;
- switch (PhaseTable[phaseIndex]) {
+ case GOOD_QUIETS:
+ endQuiets = endMoves = generate(pos, moves);
+ score();
+ endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
+ insertion_sort(cur, endMoves);
+ break;
- case PH_GOOD_CAPTURES:
- case PH_NONCAPTURES:
- while (movesPicked < numOfMoves)
- {
- Move move = moves[movesPicked++].move;
- if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
- return move;
- }
+ case BAD_QUIETS:
+ cur = endMoves;
+ endMoves = endQuiets;
+ if (depth >= 3 * ONE_PLY)
+ insertion_sort(cur, endMoves);
break;
- case PH_EVASIONS:
- if (movesPicked < numOfMoves)
- return moves[movesPicked++].move;
+ case BAD_CAPTURES:
+ // Just pick them in reverse order to get correct ordering
+ cur = moves + MAX_MOVES - 1;
+ endMoves = endBadCaptures;
+ break;
+ case ALL_EVASIONS:
+ endMoves = generate(pos, moves);
+ if (endMoves - moves > 1)
+ score();
break;
- case PH_BAD_CAPTURES:
- while (movesPicked < numOfBadCaptures)
- {
- Move move = badCaptures[movesPicked++].move;
- if ( move != ttMove
- && move != mateKiller
- && pos.pl_move_is_legal(move, pinned))
- return move;
- }
+ case CHECKS:
+ endMoves = generate(pos, moves);
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))
- return move;
- }
+ case EVASION: case QSEARCH_WITH_CHECKS: case QSEARCH_WITHOUT_CHECKS:
+ case PROBCUT: case RECAPTURE: case STOP:
+ stage = STOP;
break;
default:
- break;
+ 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;
+/// 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() {
+
+ Move move;
+
+ while (true)
+ {
+ while (cur == endMoves && stage != STOP)
+ generate_next_stage();
+
+ switch (stage) {
+
+ case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
+ case QSEARCH_WITHOUT_CHECKS: case PROBCUT:
+ ++cur;
+ return ttMove;
+
+ case GOOD_CAPTURES:
+ move = pick_best(cur++, endMoves);
+ if (move != ttMove)
+ {
+ if (pos.see_sign(move) >= VALUE_ZERO)
+ return move;
+
+ // Losing capture, move it to the tail of the array
+ *endBadCaptures-- = move;
+ }
+ break;
+
+ case KILLERS:
+ move = *cur++;
+ if ( move != MOVE_NONE
+ && move != ttMove
+ && pos.pseudo_legal(move)
+ && !pos.capture(move))
+ return move;
+ break;
+
+ case GOOD_QUIETS: case BAD_QUIETS:
+ move = *cur++;
+ if ( move != ttMove
+ && move != killers[0]
+ && move != killers[1]
+ && move != killers[2])
+ return move;
+ break;
+
+ case BAD_CAPTURES:
+ return *cur--;
+
+ case ALL_EVASIONS: case QCAPTURES_1: case QCAPTURES_2:
+ move = pick_best(cur++, endMoves);
+ if (move != ttMove)
+ return move;
+ break;
+
+ case PROBCUT_CAPTURES:
+ move = pick_best(cur++, endMoves);
+ if (move != ttMove && pos.see(move) > threshold)
+ return move;
+ break;
+
+ case RECAPTURES:
+ move = pick_best(cur++, endMoves);
+ if (to_sq(move) == recaptureSquare)
+ return move;
+ break;
+
+ case CHECKS:
+ move = *cur++;
+ if (move != ttMove)
+ return move;
+ break;
+
+ case STOP:
+ return MOVE_NONE;
+
+ default:
+ assert(false);
+ }
+ }
}
+
+
+/// 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(); }