X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=ba99df0d1262fd7edffe0f03d0f68240d47c03bc;hp=a7b1c15c446d01ee4b6245e24e2dc79c1500d6b9;hb=55df3fa2d7631ed67e46f9433aa7f3a71c18e5e7;hpb=97e0b0a01e7cd9eb942b76637b6323d0788202ae diff --git a/src/movepick.cpp b/src/movepick.cpp index a7b1c15c..ba99df0d 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -23,30 +23,31 @@ #include "movegen.h" #include "movepick.h" +#include "thread.h" namespace { enum Sequencer { - MAIN_SEARCH, TT_MOVE_S1, CAPTURES_S1, KILLERS_S1, QUIETS_1_S1, - QUIETS_2_S1, BAD_CAPTURES_S1, STOP_S1, - EVASIONS, TT_MOVE_S2, EVASIONS_S2, STOP_S2, - CAPTURES_AND_CHECKS, TT_MOVE_S3, CAPTURES_S3, QUIET_CHECKS_S3, STOP_S3, - CAPTURES, TT_MOVE_S4, CAPTURES_S4, STOP_S4, - PROBCUT, TT_MOVE_S5, CAPTURES_S5, STOP_S5, - RECAPTURES, CAPTURES_S6, STOP_S6 + MAIN_SEARCH, CAPTURES_S1, KILLERS_S1, QUIETS_1_S1, QUIETS_2_S1, BAD_CAPTURES_S1, + EVASION, EVASIONS_S2, + QSEARCH_0, CAPTURES_S3, QUIET_CHECKS_S3, + QSEARCH_1, CAPTURES_S4, + PROBCUT, CAPTURES_S5, + RECAPTURE, CAPTURES_S6, + STOP }; // Unary predicate used by std::partition to split positive scores from remaining // ones so to sort separately the two sets, and with the second sort delayed. - inline bool has_positive_score(const MoveStack& move) { return move.score > 0; } + inline bool has_positive_score(const MoveStack& ms) { return ms.score > 0; } - // Picks and moves to the front the best move in the range [firstMove, lastMove), + // Picks and moves to the front the best move in the range [begin, end), // it is faster than sorting all the moves in advance when moves are few, as // normally are the possible captures. - inline MoveStack* pick_best(MoveStack* firstMove, MoveStack* lastMove) + inline MoveStack* pick_best(MoveStack* begin, MoveStack* end) { - std::swap(*firstMove, *std::max_element(firstMove, lastMove)); - return firstMove; + std::swap(*begin, *std::max_element(begin, end)); + return begin; } } @@ -58,51 +59,52 @@ namespace { /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - Search::Stack* ss, Value beta) : pos(p), H(h), depth(d) { + Search::Stack* s, Value beta) : pos(p), H(h), depth(d) { assert(d > DEPTH_ZERO); captureThreshold = 0; - curMove = lastMove = 0; - badCaptures = moves + MAX_MOVES; + cur = end = moves; + endBadCaptures = moves + MAX_MOVES - 1; + ss = s; if (p.in_check()) - phase = EVASIONS; + phase = EVASION; else { + phase = MAIN_SEARCH; + killers[0].move = ss->killers[0]; killers[1].move = ss->killers[1]; // Consider sligtly negative captures as good if at low depth and far from beta - if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY) - captureThreshold = -PawnValueMidgame; + if (ss && ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY) + captureThreshold = -PawnValueMg; // Consider negative captures as good if still enough to reach beta - else if (ss && ss->eval > beta) - captureThreshold = beta - ss->eval; - - phase = MAIN_SEARCH; + else if (ss && ss->staticEval > beta) + captureThreshold = beta - ss->staticEval; } ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); - phase += (ttMove == MOVE_NONE); + end += (ttMove != MOVE_NONE); } MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - Square sq) : pos(p), H(h), curMove(0), lastMove(0) { + Square sq) : pos(p), H(h), cur(moves), end(moves) { assert(d <= DEPTH_ZERO); if (p.in_check()) - phase = EVASIONS; + phase = EVASION; else if (d > DEPTH_QS_NO_CHECKS) - phase = CAPTURES_AND_CHECKS; + phase = QSEARCH_0; else if (d > DEPTH_QS_RECAPTURES) { - phase = CAPTURES; + phase = QSEARCH_1; // 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 @@ -112,30 +114,30 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, } else { - phase = RECAPTURES - 1; + phase = RECAPTURE; recaptureSquare = sq; ttm = MOVE_NONE; } ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); - phase += (ttMove == MOVE_NONE); + end += (ttMove != MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, const History& h, - PieceType pt) : pos(p), H(h), curMove(0), lastMove(0) { +MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType pt) + : pos(p), H(h), cur(moves), end(moves) { assert(!pos.in_check()); phase = PROBCUT; // In ProbCut we generate only captures better than parent's captured piece - captureThreshold = PieceValueMidgame[pt]; + captureThreshold = PieceValue[MG][pt]; + ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); - if (ttm && (!pos.is_capture(ttm) || pos.see(ttm) <= captureThreshold)) - ttm = MOVE_NONE; + if (ttMove && (!pos.is_capture(ttMove) || pos.see(ttMove) <= captureThreshold)) + ttMove = MOVE_NONE; - ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); - phase += (ttMove == MOVE_NONE); + end += (ttMove != MOVE_NONE); } @@ -160,27 +162,25 @@ void MovePicker::score_captures() { // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). Move m; - for (MoveStack* cur = moves; cur != lastMove; cur++) + for (MoveStack* it = moves; it != end; ++it) { - m = cur->move; - cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))] - - type_of(pos.piece_moved(m)); + m = it->move; + it->score = PieceValue[MG][pos.piece_on(to_sq(m))] + - type_of(pos.piece_moved(m)); - if (is_promotion(m)) - cur->score += PieceValueMidgame[promotion_piece_type(m)]; + if (type_of(m) == PROMOTION) + it->score += PieceValue[MG][promotion_type(m)]; } } void MovePicker::score_noncaptures() { Move m; - Square from; - for (MoveStack* cur = moves; cur != lastMove; cur++) + for (MoveStack* it = moves; it != end; ++it) { - m = cur->move; - from = from_sq(m); - cur->score = H.value(pos.piece_on(from), to_sq(m)); + m = it->move; + it->score = H.value(pos.piece_moved(m), to_sq(m)); } } @@ -191,78 +191,75 @@ void MovePicker::score_evasions() { Move m; int seeScore; - if (lastMove < moves + 2) + if (end < moves + 2) return; - for (MoveStack* cur = moves; cur != lastMove; cur++) + for (MoveStack* it = moves; it != end; ++it) { - m = cur->move; + m = it->move; if ((seeScore = pos.see_sign(m)) < 0) - cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom + it->score = seeScore - History::MaxValue; // Be sure we are at the bottom else if (pos.is_capture(m)) - cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))] - - type_of(pos.piece_moved(m)) + History::MaxValue; + it->score = PieceValue[MG][pos.piece_on(to_sq(m))] + - type_of(pos.piece_moved(m)) + History::MaxValue; else - cur->score = H.value(pos.piece_moved(m), to_sq(m)); + it->score = H.value(pos.piece_moved(m), to_sq(m)); } } -/// MovePicker::next_phase() generates, scores and sorts the next bunch of moves, +/// MovePicker::generate_next() generates, scores and sorts the next bunch of moves, /// when there are no more moves to try for the current phase. -void MovePicker::next_phase() { +void MovePicker::generate_next() { - curMove = moves; + cur = moves; switch (++phase) { - case TT_MOVE_S1: case TT_MOVE_S2: case TT_MOVE_S3: case TT_MOVE_S4: case TT_MOVE_S5: - lastMove = curMove + 1; - return; - case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: - lastMove = generate(pos, moves); + end = generate(pos, moves); score_captures(); return; case KILLERS_S1: - curMove = killers; - lastMove = curMove + 2; + cur = killers; + end = cur + 2; return; case QUIETS_1_S1: - lastQuiet = lastMove = generate(pos, moves); + endQuiets = end = generate(pos, moves); score_noncaptures(); - lastMove = std::partition(curMove, lastMove, has_positive_score); - sort(curMove, lastMove); + end = std::partition(cur, end, has_positive_score); + sort(cur, end); return; case QUIETS_2_S1: - curMove = lastMove; - lastMove = lastQuiet; + cur = end; + end = endQuiets; if (depth >= 3 * ONE_PLY) - sort(curMove, lastMove); + sort(cur, end); return; case BAD_CAPTURES_S1: - // Bad captures SEE value is already calculated so just pick them in order - // to get SEE move ordering. - curMove = badCaptures; - lastMove = moves + MAX_MOVES; + // Just pick them in reverse order to get MVV/LVA ordering + cur = moves + MAX_MOVES - 1; + end = endBadCaptures; return; case EVASIONS_S2: - lastMove = generate(pos, moves); + end = generate(pos, moves); score_evasions(); return; case QUIET_CHECKS_S3: - lastMove = generate(pos, moves); + end = generate(pos, moves); return; - case STOP_S1: case STOP_S2: case STOP_S3: case STOP_S4: case STOP_S5: case STOP_S6: - lastMove = curMove + 1; // Avoid another next_phase() call + case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: + phase = STOP; + case STOP: + end = cur + 1; // Avoid another next_phase() call return; default: @@ -275,52 +272,48 @@ void MovePicker::next_phase() { /// It returns a new pseudo 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 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::next_move() { +/// searched previously. +template<> +Move MovePicker::next_move() { Move move; while (true) { - while (curMove == lastMove) - next_phase(); + while (cur == end) + generate_next(); switch (phase) { - case TT_MOVE_S1: case TT_MOVE_S2: case TT_MOVE_S3: case TT_MOVE_S4: case TT_MOVE_S5: - curMove++; + case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: + cur++; return ttMove; case CAPTURES_S1: - move = pick_best(curMove++, lastMove)->move; + move = pick_best(cur++, end)->move; if (move != ttMove) { assert(captureThreshold <= 0); // Otherwise we cannot use see_sign() - int seeScore = pos.see_sign(move); - if (seeScore >= captureThreshold) + if (pos.see_sign(move) >= captureThreshold) return move; // Losing capture, move it to the tail of the array - (--badCaptures)->move = move; - badCaptures->score = seeScore; + (endBadCaptures--)->move = move; } break; case KILLERS_S1: - move = (curMove++)->move; - if ( move != MOVE_NONE - && pos.is_pseudo_legal(move) - && move != ttMove + move = (cur++)->move; + if ( move != MOVE_NONE + && pos.is_pseudo_legal(move) + && move != ttMove && !pos.is_capture(move)) return move; break; - case QUIETS_1_S1: - case QUIETS_2_S1: - move = (curMove++)->move; + case QUIETS_1_S1: case QUIETS_2_S1: + move = (cur++)->move; if ( move != ttMove && move != killers[0].move && move != killers[1].move) @@ -328,36 +321,33 @@ Move MovePicker::next_move() { break; case BAD_CAPTURES_S1: - move = pick_best(curMove++, lastMove)->move; - return move; + return (cur--)->move; - case EVASIONS_S2: - case CAPTURES_S3: - case CAPTURES_S4: - move = pick_best(curMove++, lastMove)->move; + case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4: + move = pick_best(cur++, end)->move; if (move != ttMove) return move; break; case CAPTURES_S5: - move = pick_best(curMove++, lastMove)->move; + move = pick_best(cur++, end)->move; if (move != ttMove && pos.see(move) > captureThreshold) return move; break; case CAPTURES_S6: - move = pick_best(curMove++, lastMove)->move; + move = pick_best(cur++, end)->move; if (to_sq(move) == recaptureSquare) return move; break; case QUIET_CHECKS_S3: - move = (curMove++)->move; + move = (cur++)->move; if (move != ttMove) return move; break; - case STOP_S1: case STOP_S2: case STOP_S3: case STOP_S4: case STOP_S5: case STOP_S6: + case STOP: return MOVE_NONE; default: @@ -365,3 +355,10 @@ Move MovePicker::next_move() { } } } + + +/// Version of next_move() to use at split point nodes where the move is grabbed +/// from the split point's shared MovePicker object. This function is not thread +/// safe so should be lock protected by the caller. +template<> +Move MovePicker::next_move() { return ss->sp->mp->next_move(); }