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_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};
}
MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
const History& h, SearchStack* ss) : pos(p), H(h) {
+ int searchTT = ttm;
ttMoves[0].move = ttm;
+ finished = false;
+ lastBadCapture = badCaptures;
+
if (ss)
{
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;
-
Color us = pos.side_to_move();
dc = p.discovered_check_candidates(us);
if (p.is_check())
phasePtr = EvasionsPhaseTable;
else if (d > Depth(0))
- phasePtr = MainSearchPhaseTable;
+ phasePtr = MainSearchPhaseTable + !searchTT;
else if (d == Depth(0))
- phasePtr = QsearchWithChecksPhaseTable;
+ phasePtr = QsearchWithChecksPhaseTable + !searchTT;
else
- phasePtr = QsearchWithoutChecksPhaseTable;
+ phasePtr = QsearchWithoutChecksPhaseTable + !searchTT;
phasePtr--;
go_next_phase();
// Bad captures SEE value is already calculated so just sort them
// to get SEE move ordering.
curMove = badCaptures;
- lastMove = badCaptures + numOfBadCaptures;
+ lastMove = lastBadCapture;
std::sort(badCaptures, lastMove);
return;
return;
case PH_STOP:
+ lastMove = curMove + 1; // hack to be friendly for get_next_move()
return;
default:
/// 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.
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)
{
- switch (phase) {
+ while (curMove != lastMove)
+ {
+ move = (curMove++)->move;
+
+ switch (phase) {
- case PH_TT_MOVES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ case PH_TT_MOVES:
if ( move != MOVE_NONE
&& move_is_legal(pos, move, pinned))
return move;
- }
- break;
+ break;
- case PH_GOOD_CAPTURES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ case PH_GOOD_CAPTURES:
if ( move != ttMoves[0].move
&& move != ttMoves[1].move
&& pos.pl_move_is_legal(move, pinned))
// 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;
+ break;
- case PH_KILLERS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ case PH_KILLERS:
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;
+ break;
- case PH_NONCAPTURES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ case PH_NONCAPTURES:
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;
-
- case PH_QCAPTURES:
- case PH_QCHECKS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ break;
+
+ case PH_EVASIONS:
+ case PH_BAD_CAPTURES:
+ return move;
+
+ case PH_QCAPTURES:
+ case PH_QCHECKS:
// 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_STOP:
- return MOVE_NONE;
+ case PH_STOP:
+ return MOVE_NONE;
- default:
- assert(false);
- break;
+ default:
+ assert(false);
+ break;
+ }
}
go_next_phase();
}
projects / stockfish / blobdiff