//// Includes
////
-#include <algorithm>
#include <cassert>
#include "history.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 MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+ const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP};
+ const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
+ const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
}
/// 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) {
+ const History& h, SearchStack* ss, Value beta) : pos(p), H(h) {
int searchTT = ttm;
ttMoves[0].move = ttm;
- if (ss)
+ lastBadCapture = badCaptures;
+ badCaptureThreshold = 0;
+
+ pinned = p.pinned_pieces(pos.side_to_move());
+
+ if (ss && !p.is_check())
{
ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
searchTT |= ttMoves[1].move;
} else
ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
- finished = false;
- numOfBadCaptures = 0;
-
- Color us = pos.side_to_move();
-
- dc = p.discovered_check_candidates(us);
- pinned = p.pinned_pieces(us);
-
if (p.is_check())
phasePtr = EvasionsPhaseTable;
else if (d > Depth(0))
- phasePtr = MainSearchPhaseTable + !searchTT;
- else if (d == Depth(0))
- phasePtr = QsearchWithChecksPhaseTable + !searchTT;
+ {
+ // Consider sligtly negative captures as good if at low
+ // depth and far from beta.
+ if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly)
+ badCaptureThreshold = -PawnValueMidgame;
+
+ phasePtr = MainSearchPhaseTable;
+ } else if (d == Depth(0))
+ phasePtr = QsearchWithChecksPhaseTable;
else
- phasePtr = QsearchWithoutChecksPhaseTable + !searchTT;
+ {
+ phasePtr = QsearchWithoutChecksPhaseTable;
- phasePtr--;
+ // 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_or_promotion(ttm))
+ searchTT = ttMoves[0].move = MOVE_NONE;
+ }
+
+ phasePtr += !searchTT - 1;
go_next_phase();
}
case PH_GOOD_CAPTURES:
lastMove = generate_captures(pos, moves);
score_captures();
- std::sort(moves, lastMove);
return;
case PH_KILLERS:
case PH_NONCAPTURES:
lastMove = generate_noncaptures(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.
curMove = badCaptures;
- lastMove = badCaptures + numOfBadCaptures;
- std::sort(badCaptures, lastMove);
+ lastMove = lastBadCapture;
return;
case PH_EVASIONS:
assert(pos.is_check());
- lastMove = generate_evasions(pos, moves, pinned);
- score_evasions();
- std::sort(moves, lastMove);
+ lastMove = generate_evasions(pos, moves);
+ score_evasions_or_checks();
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);
+ lastMove = generate_non_capture_checks(pos, moves);
+ score_evasions_or_checks();
return;
case PH_STOP:
- lastMove = curMove + 1; // hack to be friendly for get_next_move()
+ lastMove = curMove + 1; // Avoids another go_next_phase() call
return;
default:
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));
}
}
piece = pos.piece_on(from);
hs = H.move_ordering_score(piece, to);
- // Ensure history is always preferred to pst
+ // Ensure history has always highest priority
if (hs > 0)
- hs += 1000;
+ hs += 10000;
- // pst based scoring
- cur->score = hs + pos.pst_delta<Position::MidGame>(piece, from, to);
+ // Gain table based scoring
+ cur->score = hs + 16 * H.gain(piece, to);
}
}
-void MovePicker::score_evasions() {
-
+void MovePicker::score_evasions_or_checks() {
+ // 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
+ if ((seeScore = pos.see_sign(m)) < 0)
+ cur->score = seeScore - HistoryMax; // Be sure 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)) + HistoryMax;
+ else
cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
}
}
/// 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.
+/// 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)
{
- move = (curMove++)->move;
-
switch (phase) {
case PH_TT_MOVES:
+ move = (curMove++)->move;
if ( move != MOVE_NONE
&& move_is_legal(pos, move, pinned))
return move;
break;
case PH_GOOD_CAPTURES:
+ move = pick_best(curMove++, lastMove).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)
+ if (seeValue >= badCaptureThreshold)
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;
+ assert(int(lastBadCapture - badCaptures) < 63);
+ lastBadCapture->move = move;
+ lastBadCapture->score = seeValue;
+ lastBadCapture++;
}
break;
case PH_KILLERS:
+ move = (curMove++)->move;
if ( move != MOVE_NONE
&& move != ttMoves[0].move
&& move != ttMoves[1].move
break;
case PH_NONCAPTURES:
+
+ // 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
return move;
break;
- case PH_EVASIONS:
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 != ttMoves[0].move
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
+ break;
+
case PH_QCHECKS:
- // Maybe postpone the legality check until after futility pruning?
+ move = (curMove++)->move;
if ( move != ttMoves[0].move
&& pos.pl_move_is_legal(move, pinned))
return move;
}
}
-/// 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;
-}
projects / stockfish / blobdiff