namespace {
enum Stages {
- MAIN_SEARCH, GOOD_CAPTURES, KILLERS, GOOD_QUIETS, BAD_QUIETS, BAD_CAPTURES,
+ MAIN_SEARCH, GOOD_CAPTURES_INIT, GOOD_CAPTURES, KILLERS, KILLERS_2,
+ QUIET_INIT, QUIET, BAD_CAPTURES,
EVASION, ALL_EVASIONS,
- QSEARCH_WITH_CHECKS, QCAPTURES_1, CHECKS,
- QSEARCH_WITHOUT_CHECKS, QCAPTURES_2,
- PROBCUT, PROBCUT_CAPTURES,
+ QSEARCH_WITH_CHECKS, QCAPTURES_CHECKS_INIT, QCAPTURES_CHECKS, CHECKS,
+ QSEARCH_WITHOUT_CHECKS, QCAPTURES_NO_CHECKS, REMAINING,
RECAPTURE, RECAPTURES,
- STOP
+ PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES
};
// Our insertion sort, which is guaranteed to be stable, as it should be
/// search captures, promotions, and some checks) and how important good move
/// ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- const CounterMoveStats& cmh, Move cm, Search::Stack* s)
- : pos(p), history(h), counterMoveHistory(&cmh), ss(s), countermove(cm), depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s)
+ : pos(p), ss(s), depth(d) {
assert(d > DEPTH_ZERO);
+ Square prevSq = to_sq((ss-1)->currentMove);
+ countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq];
+
stage = pos.checkers() ? EVASION : MAIN_SEARCH;
ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
- endMoves += (ttMove != MOVE_NONE);
+ stage += (ttMove == MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
- const HistoryStats& h, Square s)
- : pos(p), history(h), counterMoveHistory(nullptr) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s)
+ : pos(p) {
assert(d <= DEPTH_ZERO);
{
stage = RECAPTURE;
recaptureSquare = s;
- ttm = MOVE_NONE;
+ return;
}
ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
- endMoves += (ttMove != MOVE_NONE);
+ stage += (ttMove == MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Value th)
- : pos(p), history(h), counterMoveHistory(nullptr), threshold(th) {
+MovePicker::MovePicker(const Position& p, Move ttm, Value th)
+ : pos(p), threshold(th) {
assert(!pos.checkers());
&& pos.capture(ttm)
&& pos.see(ttm) > threshold ? ttm : MOVE_NONE;
- endMoves += (ttMove != MOVE_NONE);
+ stage += (ttMove == MOVE_NONE);
}
template<>
void MovePicker::score<QUIETS>() {
+ const HistoryStats& history = pos.this_thread()->history;
+ const FromToStats& fromTo = pos.this_thread()->fromTo;
+
+ const CounterMoveStats* cm = (ss-1)->counterMoves;
+ const CounterMoveStats* fm = (ss-2)->counterMoves;
+ const CounterMoveStats* f2 = (ss-4)->counterMoves;
+
+ Color c = pos.side_to_move();
+
for (auto& m : *this)
- m.value = history[pos.moved_piece(m)][to_sq(m)]
- + (*counterMoveHistory)[pos.moved_piece(m)][to_sq(m)];
+ m.value = history[pos.moved_piece(m)][to_sq(m)]
+ + (cm ? (*cm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ + (fm ? (*fm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ + (f2 ? (*f2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ + fromTo.get(c, m);
}
template<>
// Try winning and equal captures ordered by MVV/LVA, then non-captures ordered
// by history value, then bad captures and quiet moves with a negative SEE ordered
// by SEE value.
+ const HistoryStats& history = pos.this_thread()->history;
+ const FromToStats& fromTo = pos.this_thread()->fromTo;
+ Color c = pos.side_to_move();
Value see;
for (auto& m : *this)
m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else
- m.value = history[pos.moved_piece(m)][to_sq(m)];
+ m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m);
}
-
-/// generate_next_stage() generates, scores, and sorts the next bunch of moves
-/// when there are no more moves to try for the current stage.
-
-void MovePicker::generate_next_stage() {
-
- assert(stage != STOP);
-
- cur = moves;
-
- switch (++stage) {
-
- case GOOD_CAPTURES: case QCAPTURES_1: case QCAPTURES_2:
- case PROBCUT_CAPTURES: case RECAPTURES:
- endMoves = generate<CAPTURES>(pos, moves);
- score<CAPTURES>();
- break;
-
- case KILLERS:
- killers[0] = ss->killers[0];
- killers[1] = ss->killers[1];
- killers[2] = countermove;
- cur = killers;
- endMoves = cur + 2 + (countermove != killers[0] && countermove != killers[1]);
- break;
-
- case GOOD_QUIETS:
- endQuiets = endMoves = generate<QUIETS>(pos, moves);
- score<QUIETS>();
- endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
- insertion_sort(cur, endMoves);
- break;
-
- case BAD_QUIETS:
- cur = endMoves;
- endMoves = endQuiets;
- if (depth >= 3 * ONE_PLY)
- insertion_sort(cur, endMoves);
- break;
-
- case BAD_CAPTURES:
- // Just pick them in reverse order to get correct ordering
- cur = moves + MAX_MOVES - 1;
- endMoves = endBadCaptures;
- break;
-
- case ALL_EVASIONS:
- endMoves = generate<EVASIONS>(pos, moves);
- if (endMoves - moves > 1)
- score<EVASIONS>();
- break;
-
- case CHECKS:
- endMoves = generate<QUIET_CHECKS>(pos, moves);
- break;
-
- case EVASION: case QSEARCH_WITH_CHECKS: case QSEARCH_WITHOUT_CHECKS:
- case PROBCUT: case RECAPTURE: case STOP:
- stage = STOP;
- break;
-
- default:
- assert(false);
- }
+int MovePicker::see_sign() const
+{
+ return stage == GOOD_CAPTURES ? 1
+ : stage == BAD_CAPTURES ? -1 : 0;
}
-
/// next_move() is the most important method of the MovePicker class. 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 value from a list of generated moves
Move move;
- while (true)
- {
- while (cur == endMoves && stage != STOP)
- generate_next_stage();
+ switch (stage) {
- switch (stage) {
+ case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
+ case QSEARCH_WITHOUT_CHECKS: case PROBCUT:
+ ++stage;
+ return ttMove;
- case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
- case QSEARCH_WITHOUT_CHECKS: case PROBCUT:
- ++cur;
- return ttMove;
+ case GOOD_CAPTURES_INIT:
+ endBadCaptures = cur = moves;
+ endMoves = generate<CAPTURES>(pos, cur);
+ score<CAPTURES>();
+ ++stage;
- case GOOD_CAPTURES:
+ case GOOD_CAPTURES:
+ while (cur < endMoves)
+ {
move = pick_best(cur++, endMoves);
if (move != ttMove)
{
if (pos.see_sign(move) >= VALUE_ZERO)
return move;
- // Losing capture, move it to the tail of the array
- *endBadCaptures-- = move;
+ // Losing capture, move it to the beginning of the array
+ *endBadCaptures++ = move;
}
- break;
+ }
+ ++stage;
- case KILLERS:
- move = *cur++;
- if ( move != MOVE_NONE
- && move != ttMove
- && pos.pseudo_legal(move)
- && !pos.capture(move))
- return move;
- break;
+ // First killer move
+ move = ss->killers[0];
+ if ( move != MOVE_NONE
+ && move != ttMove
+ && pos.pseudo_legal(move)
+ && !pos.capture(move))
+ return move;
- case GOOD_QUIETS: case BAD_QUIETS:
+ case KILLERS:
+ ++stage;
+ move = ss->killers[1]; // Second killer move
+ if ( move != MOVE_NONE
+ && move != ttMove
+ && pos.pseudo_legal(move)
+ && !pos.capture(move))
+ return move;
+
+ case KILLERS_2:
+ ++stage;
+ move = countermove;
+ if ( move != MOVE_NONE
+ && move != ttMove
+ && move != ss->killers[0]
+ && move != ss->killers[1]
+ && pos.pseudo_legal(move)
+ && !pos.capture(move))
+ return move;
+
+ case QUIET_INIT:
+ cur = endBadCaptures;
+ endMoves = generate<QUIETS>(pos, cur);
+ score<QUIETS>();
+ if (depth < 3 * ONE_PLY)
+ {
+ ExtMove* goodQuiet = std::partition(cur, endMoves, [](const ExtMove& m)
+ { return m.value > VALUE_ZERO; });
+ insertion_sort(cur, goodQuiet);
+ } else
+ insertion_sort(cur, endMoves);
+ ++stage;
+
+ case QUIET:
+ while (cur < endMoves)
+ {
move = *cur++;
if ( move != ttMove
- && move != killers[0]
- && move != killers[1]
- && move != killers[2])
+ && move != ss->killers[0]
+ && move != ss->killers[1]
+ && move != countermove)
return move;
- break;
+ }
+ ++stage;
+ cur = moves; // Point to beginning of bad captures
- case BAD_CAPTURES:
- return *cur--;
+ case BAD_CAPTURES:
+ if (cur < endBadCaptures)
+ return *cur++;
+ break;
- case ALL_EVASIONS: case QCAPTURES_1: case QCAPTURES_2:
+ case ALL_EVASIONS:
+ cur = moves;
+ endMoves = generate<EVASIONS>(pos, cur);
+ if (endMoves - cur > 1)
+ score<EVASIONS>();
+ stage = REMAINING;
+ goto remaining;
+
+ case QCAPTURES_CHECKS_INIT:
+ case QCAPTURES_NO_CHECKS:
+ cur = moves;
+ endMoves = generate<CAPTURES>(pos, cur);
+ score<CAPTURES>();
+ ++stage;
+
+remaining:
+ case QCAPTURES_CHECKS:
+ case REMAINING:
+ while (cur < endMoves)
+ {
move = pick_best(cur++, endMoves);
if (move != ttMove)
return move;
+ }
+ if (stage == REMAINING)
break;
+ cur = moves;
+ endMoves = generate<QUIET_CHECKS>(pos, cur);
+ ++stage;
- case PROBCUT_CAPTURES:
- move = pick_best(cur++, endMoves);
- if (move != ttMove && pos.see(move) > threshold)
- return move;
- break;
+ case CHECKS:
+ while (cur < endMoves)
+ {
+ move = cur++->move;
+ if (move != ttMove)
+ return move;
+ }
+ break;
+
+ case RECAPTURE:
+ cur = moves;
+ endMoves = generate<CAPTURES>(pos, cur);
+ score<CAPTURES>();
+ ++stage;
- case RECAPTURES:
+ case RECAPTURES:
+ while (cur < endMoves)
+ {
move = pick_best(cur++, endMoves);
if (to_sq(move) == recaptureSquare)
return move;
- break;
-
- case CHECKS:
- move = *cur++;
- if (move != ttMove)
- return move;
- break;
+ }
+ break;
- case STOP:
- return MOVE_NONE;
+ case PROBCUT_INIT:
+ cur = moves;
+ endMoves = generate<CAPTURES>(pos, cur);
+ score<CAPTURES>();
+ ++stage;
- default:
- assert(false);
+ case PROBCUT_CAPTURES:
+ while (cur < endMoves)
+ {
+ move = pick_best(cur++, endMoves);
+ if ( move != ttMove
+ && pos.see(move) > threshold)
+ return move;
}
+ break;
+
+ default:
+ assert(false);
}
+
+ return MOVE_NONE;
}
projects / stockfish / blobdiff