X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=8445260b58e612b5185f8fe84a91d41c264fc7a0;hp=a729873677d9385f18159b93aebf45c9b7272e1c;hb=1cc18d8a7af5af3a83b95034edab679942c54e4d;hpb=f7c013edd08a0e2d26491eb087c145e103e0f708 diff --git a/src/movepick.cpp b/src/movepick.cpp index a7298736..8445260b 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,7 +70,7 @@ 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, +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, Move* cm, Search::Stack* s, Value beta) : pos(p), history(h), depth(d) { assert(d > DEPTH_ZERO); @@ -78,27 +78,22 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& captureThreshold = 0; cur = end = moves; 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].first; - killers[3].move = cm[pos.piece_on(prevSq)][prevSq].second; + stage = MAIN_SEARCH; // Consider sligtly negative captures as good if at low depth and far from beta - if (ss && ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY) + if (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) + else if (ss->staticEval > beta) captureThreshold = beta - ss->staticEval; } @@ -112,14 +107,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& assert(d <= DEPTH_ZERO); 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 @@ -129,7 +124,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& } else { - phase = RECAPTURE; + stage = RECAPTURE; recaptureSquare = sq; ttm = MOVE_NONE; } @@ -143,7 +138,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece assert(!pos.checkers()); - phase = PROBCUT; + stage = PROBCUT; // In ProbCut we generate only captures better than parent's captured piece captureThreshold = PieceValue[MG][pt]; @@ -175,7 +170,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))] @@ -194,7 +189,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)]; @@ -209,7 +204,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) @@ -231,7 +226,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); @@ -242,15 +237,18 @@ void MovePicker::generate_next() { cur = killers; end = cur + 2; - if ((cur+3)->move && (cur+3)->move == (cur+2)->move) // Due to a SMP race - (cur+3)->move = MOVE_NONE; + 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 - if ((cur+2)->move != cur->move && (cur+2)->move != (cur+1)->move) - end++; + 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; - if ((cur+3)->move != cur->move && (cur+3)->move != (cur+1)->move) - (end++)->move = (cur+3)->move; return; case QUIETS_1_S1: @@ -284,7 +282,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; @@ -309,7 +307,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++;