X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=20aaabbdde0288a28743ea230706dc2905cc281f;hp=c51fe69f783baaa2385e07212ae374395867aa2f;hb=c6d62b7da5b9bb0e8c987596d1c6a304b337ca32;hpb=940c53c366c3993a024efe458fc0fb4fffd3ad70 diff --git a/src/movepick.cpp b/src/movepick.cpp index c51fe69f..20aaabbd 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -26,6 +26,7 @@ #include #include "history.h" +#include "evaluate.h" #include "movegen.h" #include "movepick.h" #include "search.h" @@ -44,7 +45,9 @@ namespace { int MainSearchPhaseIndex; int EvasionsPhaseIndex; int QsearchWithChecksPhaseIndex; + int QsearchNoCapturesPhaseIndex; int QsearchWithoutChecksPhaseIndex; + int NoMovesPhaseIndex; } @@ -62,28 +65,38 @@ namespace { /// search captures, promotions and some checks) and about how important good /// move ordering is at the current node. -MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, - Move k1, Move k2, Depth d) : pos(p) { - pvNode = pvnode; +MovePicker::MovePicker(const Position& p, bool pv, Move ttm, + const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) { + pvNode = pv; ttMove = ttm; - mateKiller = (mk == ttm)? MOVE_NONE : mk; - killer1 = k1; - killer2 = k2; + mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller; + killer1 = ss.killers[0]; + killer2 = ss.killers[1]; depth = d; movesPicked = 0; numOfMoves = 0; numOfBadCaptures = 0; - dc = p.discovered_check_candidates(p.side_to_move()); + + // With EvalInfo we are able to know how many captures are possible before + // generating them. So avoid generating in case we know are zero. + Color us = pos.side_to_move(); + Color them = opposite_color(us); + bool noCaptures = ei + && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0 + && !ei->mi->specialized_eval_exists() + && (pos.ep_square() == SQ_NONE) + && !pos.has_pawn_on_7th(us); if (p.is_check()) - phaseIndex = EvasionsPhaseIndex; + phaseIndex = EvasionsPhaseIndex; else if (depth > Depth(0)) - phaseIndex = MainSearchPhaseIndex; + phaseIndex = MainSearchPhaseIndex; else if (depth == Depth(0)) - phaseIndex = QsearchWithChecksPhaseIndex; + phaseIndex = (noCaptures ? QsearchNoCapturesPhaseIndex : QsearchWithChecksPhaseIndex); else - phaseIndex = QsearchWithoutChecksPhaseIndex; + phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex); + dc = p.discovered_check_candidates(us); pinned = p.pinned_pieces(p.side_to_move()); finished = false; @@ -134,7 +147,6 @@ Move MovePicker::get_next_move() { case PH_GOOD_CAPTURES: numOfMoves = generate_captures(pos, moves); score_captures(); - capSquares = EmptyBoardBB; movesPicked = 0; break; @@ -212,6 +224,8 @@ void MovePicker::score_captures() { // 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; @@ -226,8 +240,15 @@ void MovePicker::score_captures() { else moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m))) -int(pos.type_of_piece_on(move_from(m))); - } else + } + else + { + // Losing capture, move it to the badCaptures[] array + assert(numOfBadCaptures < 63); moves[i].score = seeValue; + badCaptures[numOfBadCaptures++] = moves[i]; + moves[i--] = moves[--numOfMoves]; + } } } @@ -249,10 +270,11 @@ void MovePicker::score_noncaptures() { else hs = H.move_ordering_score(pos.piece_on(move_from(m)), m); - // Ensure moves in history are always sorted as first + // Ensure history is always preferred to pst if (hs > 0) hs += 1000; + // pst based scoring moves[i].score = hs + pos.mg_pst_delta(m); } } @@ -271,7 +293,6 @@ void MovePicker::score_evasions() { } else moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m); } - // FIXME try psqt also here } void MovePicker::score_qcaptures() { @@ -289,17 +310,19 @@ void MovePicker::score_qcaptures() { } -/// find_best_index() loops across the moves and returns index of -/// the highest scored one. There is also a second version that -/// lowers the priority of moves that attack the same square, -/// so that if the best move that attack a square fails the next +/// find_best_index() loops across the moves and returns index of +/// the highest scored one. There is also a second version that +/// lowers the priority of moves that attack the same square, +/// so that if the best move that attack a square fails the next /// move picked attacks a different square if any, not the same one. int MovePicker::find_best_index() { - int bestScore = -10000000, bestIndex = -1; + assert(movesPicked < numOfMoves); - for (int i = movesPicked; i < numOfMoves; i++) + int bestIndex = movesPicked, bestScore = moves[movesPicked].score; + + for (int i = movesPicked + 1; i < numOfMoves; i++) if (moves[i].score > bestScore) { bestIndex = i; @@ -308,41 +331,43 @@ int MovePicker::find_best_index() { return bestIndex; } -int MovePicker::find_best_index(Bitboard* squares, int values[]) { - - int hs; - Move m; - Square to; - int bestScore = -10000000, bestIndex = -1; - - for (int i = movesPicked; i < numOfMoves; i++) - { - m = moves[i].move; - to = move_to(m); - - if (!bit_is_set(*squares, to)) - { - // Init at first use - set_bit(squares, to); - values[to] = 0; - } - - hs = moves[i].score - values[to]; - if (hs > bestScore) - { - bestIndex = i; - bestScore = hs; - } - } - - if (bestIndex != -1) - { - // Raise value of the picked square, so next attack - // to the same square will get low priority. - to = move_to(moves[bestIndex].move); - values[to] += 0xB00; - } - return bestIndex; +int MovePicker::find_best_index(Bitboard* squares, int values[]) { + + assert(movesPicked < numOfMoves); + + int hs; + Move m; + Square to; + int bestScore = -10000000, bestIndex = -1; + + for (int i = movesPicked; i < numOfMoves; i++) + { + m = moves[i].move; + to = move_to(m); + + if (!bit_is_set(*squares, to)) + { + // Init at first use + set_bit(squares, to); + values[to] = 0; + } + + hs = moves[i].score - values[to]; + if (hs > bestScore) + { + bestIndex = i; + bestScore = hs; + } + } + + if (bestIndex != -1) + { + // Raise value of the picked square, so next attack + // to the same square will get low priority. + to = move_to(moves[bestIndex].move); + values[to] += 0xB00; + } + return bestIndex; } @@ -350,9 +375,6 @@ int MovePicker::find_best_index(Bitboard* squares, int values[]) { /// 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. -/// While picking captures in the PH_GOOD_CAPTURES phase (i.e. while picking -/// non-losing captures in the main search), it moves all captures with -/// negative SEE values to the badCaptures[] array. Move MovePicker::pick_move_from_list() { @@ -360,38 +382,20 @@ Move MovePicker::pick_move_from_list() { Move move; switch (PhaseTable[phaseIndex]) { + case PH_GOOD_CAPTURES: assert(!pos.is_check()); assert(movesPicked >= 0); while (movesPicked < numOfMoves) { - int bestScore = -10000000; - bestIndex = -1; - for (int i = movesPicked; i < numOfMoves; i++) - { - if (moves[i].score < 0) - { - // Losing capture, move it to the badCaptures[] array - assert(numOfBadCaptures < 63); - badCaptures[numOfBadCaptures++] = moves[i]; - moves[i--] = moves[--numOfMoves]; - } - else if (moves[i].score > bestScore) - { - bestIndex = i; - bestScore = moves[i].score; - } - } - if (bestIndex != -1) // Found a good capture - { - move = moves[bestIndex].move; - moves[bestIndex] = moves[movesPicked++]; - if ( move != ttMove - && move != mateKiller - && pos.pl_move_is_legal(move, pinned)) - return move; - } + bestIndex = find_best_index(); + move = moves[bestIndex].move; + moves[bestIndex] = moves[movesPicked++]; + if ( move != ttMove + && move != mateKiller + && pos.pl_move_is_legal(move, pinned)) + return move; } break; @@ -406,16 +410,12 @@ Move MovePicker::pick_move_from_list() { // been searched and it is not a PV node, we are probably failing low // anyway, so we just pick the first move from the list. bestIndex = (pvNode || movesPicked < 12) ? find_best_index() : movesPicked; - - if (bestIndex != -1) - { - move = moves[bestIndex].move; - moves[bestIndex] = moves[movesPicked++]; - if ( move != ttMove - && move != mateKiller - && pos.pl_move_is_legal(move, pinned)) - return move; - } + move = moves[bestIndex].move; + moves[bestIndex] = moves[movesPicked++]; + if ( move != ttMove + && move != mateKiller + && pos.pl_move_is_legal(move, pinned)) + return move; } break; @@ -426,13 +426,9 @@ Move MovePicker::pick_move_from_list() { while (movesPicked < numOfMoves) { bestIndex = find_best_index(); - - if (bestIndex != -1) - { - move = moves[bestIndex].move; - moves[bestIndex] = moves[movesPicked++]; - return move; - } + move = moves[bestIndex].move; + moves[bestIndex] = moves[movesPicked++]; + return move; } break; @@ -457,16 +453,12 @@ Move MovePicker::pick_move_from_list() { while (movesPicked < numOfMoves) { bestIndex = (movesPicked < 4 ? find_best_index() : movesPicked); - - if (bestIndex != -1) - { - move = moves[bestIndex].move; - moves[bestIndex] = moves[movesPicked++]; - // Remember to change the line below if we decide to hash the qsearch! - // Maybe also postpone the legality check until after futility pruning? - if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) - return move; - } + move = moves[bestIndex].move; + moves[bestIndex] = moves[movesPicked++]; + // Remember to change the line below if we decide to hash the qsearch! + // Maybe also postpone the legality check until after futility pruning? + if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) + return move; } break; @@ -502,8 +494,9 @@ MovePicker::MovegenPhase MovePicker::current_move_type() const { /// MovePicker::init_phase_table() initializes the PhaseTable[], /// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex -/// and QsearchWithoutChecksPhaseIndex variables. It is only called once -/// during program startup, and never again while the program is running. +/// QsearchNoCapturesPhaseIndex, QsearchWithoutChecksPhaseIndex and +/// NoMovesPhaseIndex variables. It is only called once during program +/// startup, and never again while the program is running. void MovePicker::init_phase_table() { @@ -532,8 +525,17 @@ void MovePicker::init_phase_table() { PhaseTable[i++] = PH_QCHECKS; PhaseTable[i++] = PH_STOP; + // Quiescence search with checks only and no captures + QsearchNoCapturesPhaseIndex = i - 1; + PhaseTable[i++] = PH_QCHECKS; + PhaseTable[i++] = PH_STOP; + // Quiescence search without checks QsearchWithoutChecksPhaseIndex = i - 1; PhaseTable[i++] = PH_QCAPTURES; PhaseTable[i++] = PH_STOP; + + // Do not generate any move + NoMovesPhaseIndex = i - 1; + PhaseTable[i++] = PH_STOP; }