X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=8d8060b55571f9b4420ba29a674e791ce48f58e9;hp=7120ba0c37feeffb4c83bbde8a9aca0c2c26b3aa;hb=54b3d44194fb0d36a2b4c3cd6d473ec50a4c1ef1;hpb=607ac0687a53c764ad548932d35e651c540f4764 diff --git a/src/movepick.cpp b/src/movepick.cpp index 7120ba0c..8d8060b5 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -23,7 +23,6 @@ //// Includes //// -#include #include #include "history.h" @@ -39,11 +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_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}; } @@ -61,23 +72,21 @@ namespace { 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; - if (ss) + 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(0)) @@ -87,7 +96,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, else phasePtr = QsearchWithoutChecksPhaseTable; - phasePtr--; + phasePtr += !searchTT - 1; go_next_phase(); } @@ -109,7 +118,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: @@ -120,37 +128,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); - 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: @@ -188,8 +193,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)); } } @@ -215,24 +220,31 @@ 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() { - +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; + 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)); } } @@ -241,30 +253,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) { 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)) @@ -276,13 +285,15 @@ 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; case PH_KILLERS: + move = (curMove++)->move; if ( move != MOVE_NONE && move != ttMoves[0].move && move != ttMoves[1].move @@ -292,6 +303,7 @@ Move MovePicker::get_next_move() { break; case PH_NONCAPTURES: + move = (curMove++)->move; if ( move != ttMoves[0].move && move != ttMoves[1].move && move != killers[0].move @@ -300,13 +312,20 @@ Move MovePicker::get_next_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; @@ -330,14 +349,10 @@ Move MovePicker::get_next_move() { Move MovePicker::get_next_move(Lock &lock) { lock_grab(&lock); - if (finished) - { - lock_release(&lock); - return MOVE_NONE; - } + + // Note that it is safe to call many times + // get_next_move() when phase == PH_STOP Move m = get_next_move(); - if (m == MOVE_NONE) - finished = true; lock_release(&lock); return m;