X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=a54398c0844726394fe4cc4cc32e3ba8222f54a0;hp=c75526cc81b8b4989ca22fad6c54b3b5178a2c18;hb=800410eef1c0811d046ee2332b3afda21284b876;hpb=148490f04cbd21afd9b01431ee7c947ac0bf78a8 diff --git a/src/movepick.cpp b/src/movepick.cpp index c75526cc..a54398c0 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -25,7 +25,7 @@ namespace { - enum Sequencer { + enum Stages { 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, @@ -36,9 +36,9 @@ namespace { }; // Our insertion sort, guaranteed to be stable, as is needed - void insertion_sort(MoveStack* begin, MoveStack* end) + void insertion_sort(ExtMove* begin, ExtMove* end) { - MoveStack tmp, *p, *q; + ExtMove tmp, *p, *q; for (p = begin + 1; p < end; ++p) { @@ -51,12 +51,12 @@ namespace { // 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& ms) { return ms.score > 0; } + inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; } // 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* begin, MoveStack* end) + inline ExtMove* pick_best(ExtMove* begin, ExtMove* end) { std::swap(*begin, *std::max_element(begin, end)); return begin; @@ -70,55 +70,41 @@ namespace { /// search captures, promotions and some checks) and about how important good /// move ordering is at the current node. -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CountermovesStats& cm, - Search::Stack* s, Value beta) : pos(p), history(h), depth(d) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, + Move* cm, Search::Stack* s) : pos(p), history(h), depth(d) { assert(d > DEPTH_ZERO); - captureThreshold = 0; - cur = end = moves; + cur = end = moves = pos.this_thread()->get_moves_array(); endBadCaptures = moves + MAX_MOVES - 1; + countermoves = cm; ss = s; if (p.checkers()) - phase = EVASION; + stage = EVASION; else - { - phase = MAIN_SEARCH; - - killers[0].move = ss->killers[0]; - killers[1].move = ss->killers[1]; - Square prevSq = to_sq((ss-1)->currentMove); - killers[2].move = cm[pos.piece_on(prevSq)][prevSq]; - - // Consider sligtly negative captures as good if at low depth and far from beta - 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->staticEval > beta) - captureThreshold = beta - ss->staticEval; - } + stage = MAIN_SEARCH; ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); end += (ttMove != MOVE_NONE); } MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - Square sq) : pos(p), history(h), cur(moves), end(moves) { + Square sq) : pos(p), history(h) { assert(d <= DEPTH_ZERO); + cur = end = moves = pos.this_thread()->get_moves_array(); if (p.checkers()) - phase = EVASION; + stage = EVASION; else if (d > DEPTH_QS_NO_CHECKS) - phase = QSEARCH_0; + stage = QSEARCH_0; else if (d > DEPTH_QS_RECAPTURES) { - phase = QSEARCH_1; + stage = 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 @@ -128,7 +114,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& } else { - phase = RECAPTURE; + stage = RECAPTURE; recaptureSquare = sq; ttm = MOVE_NONE; } @@ -138,11 +124,12 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& } MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt) - : pos(p), history(h), cur(moves), end(moves) { + : pos(p), history(h) { assert(!pos.checkers()); - phase = PROBCUT; + cur = end = moves = pos.this_thread()->get_moves_array(); + stage = PROBCUT; // In ProbCut we generate only captures better than parent's captured piece captureThreshold = PieceValue[MG][pt]; @@ -154,6 +141,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece end += (ttMove != MOVE_NONE); } +MovePicker::~MovePicker() { pos.this_thread()->free_moves_array(); } /// score() assign a numerical move ordering score to each move in a move list. /// The moves with highest scores will be picked first. @@ -174,7 +162,7 @@ void MovePicker::score() { // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). Move m; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; it->score = PieceValue[MG][pos.piece_on(to_sq(m))] @@ -193,7 +181,7 @@ void MovePicker::score() { Move m; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; it->score = history[pos.piece_moved(m)][to_sq(m)]; @@ -208,7 +196,7 @@ void MovePicker::score() { Move m; int seeScore; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; if ((seeScore = pos.see_sign(m)) < 0) @@ -230,7 +218,7 @@ void MovePicker::generate_next() { cur = moves; - switch (++phase) { + switch (++stage) { case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: end = generate(pos, moves); @@ -239,7 +227,20 @@ void MovePicker::generate_next() { case KILLERS_S1: cur = killers; - end = cur + 3 - (killers[2].move == killers[0].move || killers[2].move == killers[1].move); + end = cur + 2; + + killers[0].move = ss->killers[0]; + killers[1].move = ss->killers[1]; + killers[2].move = killers[3].move = MOVE_NONE; + + // Be sure countermoves are different from killers + for (int i = 0; i < 2; ++i) + if (countermoves[i] != cur->move && countermoves[i] != (cur+1)->move) + (end++)->move = countermoves[i]; + + if (countermoves[1] && countermoves[1] == countermoves[0]) // Due to SMP races + killers[3].move = MOVE_NONE; + return; case QUIETS_1_S1: @@ -273,7 +274,7 @@ void MovePicker::generate_next() { return; case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: - phase = STOP; + stage = STOP; case STOP: end = cur + 1; // Avoid another next_phase() call return; @@ -298,7 +299,7 @@ Move MovePicker::next_move() { while (cur == end) generate_next(); - switch (phase) { + switch (stage) { case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: cur++; @@ -308,9 +309,7 @@ Move MovePicker::next_move() { move = pick_best(cur++, end)->move; if (move != ttMove) { - assert(captureThreshold <= 0); // Otherwise we cannot use see_sign() - - if (pos.see_sign(move) >= captureThreshold) + if (pos.see_sign(move) >= 0) return move; // Losing capture, move it to the tail of the array @@ -332,7 +331,8 @@ Move MovePicker::next_move() { if ( move != ttMove && move != killers[0].move && move != killers[1].move - && move != killers[2].move) + && move != killers[2].move + && move != killers[3].move) return move; break;