X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=ea332b7be37b4ae4b73be30ea8fa9277d5660ff2;hp=a9cc245dcb570702d316f4736152d550457fbef2;hb=12d8f74242a0a24ac16cf5ee52447103c5c79900;hpb=9ab84a816539ade23868f0383e39634e6ab88df5 diff --git a/src/movepick.cpp b/src/movepick.cpp index a9cc245d..ea332b7b 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -23,7 +23,6 @@ //// Includes //// -#include #include #include "history.h" @@ -39,13 +38,23 @@ 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_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}; + 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}; } @@ -62,36 +71,33 @@ namespace { /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, Move ttm, Depth d, - const History& h, SearchStack* ss, bool useNullMove) : pos(p), H(h) { + const History& h, SearchStack* ss) : pos(p), H(h) { + int searchTT = ttm; ttMoves[0].move = ttm; - if (ss) + finished = false; + lastBadCapture = badCaptures; + + 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; 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); - pinned = p.pinned_pieces(us); - if (p.is_check()) phasePtr = EvasionsPhaseTable; - else if (d >= Depth(3 * OnePly)) - phasePtr = useNullMove ? MainSearchPhaseTable : MainSearchNoNullPhaseTable; else if (d > Depth(0)) - phasePtr = useNullMove ? LowSearchPhaseTable : MainSearchNoNullPhaseTable; + phasePtr = MainSearchPhaseTable; else if (d == Depth(0)) phasePtr = QsearchWithChecksPhaseTable; else phasePtr = QsearchWithoutChecksPhaseTable; - phasePtr--; + phasePtr += !searchTT - 1; go_next_phase(); } @@ -105,9 +111,6 @@ void MovePicker::go_next_phase() { phase = *(++phasePtr); switch (phase) { - case PH_NULL_MOVE: - return; - case PH_TT_MOVES: curMove = ttMoves; lastMove = curMove + 2; @@ -116,7 +119,6 @@ void MovePicker::go_next_phase() { case PH_GOOD_CAPTURES: lastMove = generate_captures(pos, moves); score_captures(); - std::sort(moves, lastMove); return; case PH_KILLERS: @@ -127,36 +129,34 @@ void MovePicker::go_next_phase() { case PH_NONCAPTURES: lastMove = generate_noncaptures(pos, moves); score_noncaptures(); - std::sort(moves, lastMove); + sort_moves(moves, lastMove); 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); + lastMove = generate_evasions(pos, moves); 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); + lastMove = generate_non_capture_checks(pos, moves); return; case PH_STOP: + lastMove = curMove + 1; // hack to be friendly for get_next_move() return; default: @@ -194,8 +194,8 @@ 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)); } } @@ -221,24 +221,27 @@ void MovePicker::score_noncaptures() { hs += 1000; // pst based scoring - cur->score = hs + pos.pst_delta(piece, from, to); + cur->score = hs + mg_value(pos.pst_delta(piece, from, to)); } } 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; 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; + 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)); } } @@ -247,35 +250,27 @@ void MovePicker::score_evasions() { /// 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) { - - case PH_NULL_MOVE: - go_next_phase(); - return MOVE_NULL; + while (curMove != lastMove) + { + switch (phase) { - case PH_TT_MOVES: - while (curMove != lastMove) - { - Move move = (curMove++)->move; + case PH_TT_MOVES: + move = (curMove++)->move; 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: + move = pick_best(curMove++, lastMove).move; if ( move != ttMoves[0].move && move != ttMoves[1].move && pos.pl_move_is_legal(move, pinned)) @@ -287,63 +282,59 @@ Move MovePicker::get_next_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; + break; - case PH_KILLERS: - while (curMove != lastMove) - { - Move move = (curMove++)->move; + case PH_KILLERS: + 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; + break; - case PH_NONCAPTURES: - while (curMove != lastMove) - { - Move move = (curMove++)->move; + case PH_NONCAPTURES: + 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; - - case PH_QCAPTURES: - case PH_QCHECKS: - while (curMove != lastMove) - { - Move move = (curMove++)->move; - // Maybe postpone the legality check until after futility pruning? + break; + + 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; + break; + + case PH_QCHECKS: + move = (curMove++)->move; + if ( move != ttMoves[0].move + && pos.pl_move_is_legal(move, pinned)) + return move; + break; - case PH_STOP: - return MOVE_NONE; + case PH_STOP: + return MOVE_NONE; - default: - assert(false); - break; + default: + assert(false); + break; + } } go_next_phase(); }