mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-25 11:36:51 +08:00
in a some of cases movepicker returned some moves more than once which lead to them being searched more than once. This bug was possible because of how we use queen promotions - they are generated as a captures but are not included in position function which checks if move is a capture. Thus if any refutation (killer or countermove) was a queen promotion it was searched twice - once as a capture and one as a refutation. This patch affects various things, namely stats assignments for queen promotions and other moves if best move is queen promotion, also some heuristics in search and qsearch. With this patch every queen promotion is now considered a capture. After this patch number of found duplicated moves is 0 during normal 13 depth bench run. Passed STC: https://tests.stockfishchess.org/tests/view/63f77e01e74a12625bcd87d7 LLR: 2.95 (-2.94,2.94) <-1.75,0.25> Total: 80920 W: 21455 L: 21289 D: 38176 Ptnml(0-2): 198, 8839, 22241, 8963, 219 Passed LTC: https://tests.stockfishchess.org/tests/view/63f7e020e74a12625bcd9a76 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 89712 W: 23674 L: 23533 D: 42505 Ptnml(0-2): 24, 8737, 27202, 8860, 33 closes https://github.com/official-stockfish/Stockfish/pull/4405 bench 4681731
297 lines
10 KiB
C++
297 lines
10 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2023 The Stockfish developers (see AUTHORS file)
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <cassert>
|
|
|
|
#include "bitboard.h"
|
|
#include "movepick.h"
|
|
|
|
namespace Stockfish {
|
|
|
|
namespace {
|
|
|
|
enum Stages {
|
|
MAIN_TT, CAPTURE_INIT, GOOD_CAPTURE, REFUTATION, QUIET_INIT, QUIET, BAD_CAPTURE,
|
|
EVASION_TT, EVASION_INIT, EVASION,
|
|
PROBCUT_TT, PROBCUT_INIT, PROBCUT,
|
|
QSEARCH_TT, QCAPTURE_INIT, QCAPTURE, QCHECK_INIT, QCHECK
|
|
};
|
|
|
|
// partial_insertion_sort() sorts moves in descending order up to and including
|
|
// a given limit. The order of moves smaller than the limit is left unspecified.
|
|
void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) {
|
|
|
|
for (ExtMove *sortedEnd = begin, *p = begin + 1; p < end; ++p)
|
|
if (p->value >= limit)
|
|
{
|
|
ExtMove tmp = *p, *q;
|
|
*p = *++sortedEnd;
|
|
for (q = sortedEnd; q != begin && *(q - 1) < tmp; --q)
|
|
*q = *(q - 1);
|
|
*q = tmp;
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
/// Constructors of the MovePicker class. As arguments we pass information
|
|
/// to help it to return the (presumably) good moves first, to decide which
|
|
/// moves to return (in the quiescence search, for instance, we only want to
|
|
/// search captures, promotions, and some checks) and how important good move
|
|
/// ordering is at the current node.
|
|
|
|
/// MovePicker constructor for the main search
|
|
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
|
|
const CapturePieceToHistory* cph,
|
|
const PieceToHistory** ch,
|
|
Move cm,
|
|
const Move* killers)
|
|
: pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch),
|
|
ttMove(ttm), refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, depth(d)
|
|
{
|
|
assert(d > 0);
|
|
|
|
stage = (pos.checkers() ? EVASION_TT : MAIN_TT) +
|
|
!(ttm && pos.pseudo_legal(ttm));
|
|
threatenedPieces = 0;
|
|
}
|
|
|
|
/// MovePicker constructor for quiescence search
|
|
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
|
|
const CapturePieceToHistory* cph,
|
|
const PieceToHistory** ch,
|
|
Square rs)
|
|
: pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch), ttMove(ttm), recaptureSquare(rs), depth(d)
|
|
{
|
|
assert(d <= 0);
|
|
|
|
stage = (pos.checkers() ? EVASION_TT : QSEARCH_TT) +
|
|
!( ttm
|
|
&& pos.pseudo_legal(ttm));
|
|
}
|
|
|
|
/// MovePicker constructor for ProbCut: we generate captures with SEE greater
|
|
/// than or equal to the given threshold.
|
|
MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePieceToHistory* cph)
|
|
: pos(p), captureHistory(cph), ttMove(ttm), threshold(th)
|
|
{
|
|
assert(!pos.checkers());
|
|
|
|
stage = PROBCUT_TT + !(ttm && pos.capture_stage(ttm)
|
|
&& pos.pseudo_legal(ttm)
|
|
&& pos.see_ge(ttm, threshold));
|
|
}
|
|
|
|
/// MovePicker::score() assigns a numerical value to each move in a list, used
|
|
/// for sorting. Captures are ordered by Most Valuable Victim (MVV), preferring
|
|
/// captures with a good history. Quiets moves are ordered using the history tables.
|
|
template<GenType Type>
|
|
void MovePicker::score() {
|
|
|
|
static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
|
|
|
|
[[maybe_unused]] Bitboard threatenedByPawn, threatenedByMinor, threatenedByRook;
|
|
if constexpr (Type == QUIETS)
|
|
{
|
|
Color us = pos.side_to_move();
|
|
|
|
threatenedByPawn = pos.attacks_by<PAWN>(~us);
|
|
threatenedByMinor = pos.attacks_by<KNIGHT>(~us) | pos.attacks_by<BISHOP>(~us) | threatenedByPawn;
|
|
threatenedByRook = pos.attacks_by<ROOK>(~us) | threatenedByMinor;
|
|
|
|
// Pieces threatened by pieces of lesser material value
|
|
threatenedPieces = (pos.pieces(us, QUEEN) & threatenedByRook)
|
|
| (pos.pieces(us, ROOK) & threatenedByMinor)
|
|
| (pos.pieces(us, KNIGHT, BISHOP) & threatenedByPawn);
|
|
}
|
|
|
|
for (auto& m : *this)
|
|
if constexpr (Type == CAPTURES)
|
|
m.value = (7 * int(PieceValue[MG][pos.piece_on(to_sq(m))])
|
|
+ (*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))]) / 16;
|
|
|
|
else if constexpr (Type == QUIETS)
|
|
m.value = 2 * (*mainHistory)[pos.side_to_move()][from_to(m)]
|
|
+ 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)]
|
|
+ (*continuationHistory[1])[pos.moved_piece(m)][to_sq(m)]
|
|
+ (*continuationHistory[3])[pos.moved_piece(m)][to_sq(m)]
|
|
+ (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)]
|
|
+ (threatenedPieces & from_sq(m) ?
|
|
(type_of(pos.moved_piece(m)) == QUEEN && !(to_sq(m) & threatenedByRook) ? 50000
|
|
: type_of(pos.moved_piece(m)) == ROOK && !(to_sq(m) & threatenedByMinor) ? 25000
|
|
: !(to_sq(m) & threatenedByPawn) ? 15000
|
|
: 0)
|
|
: 0)
|
|
+ bool(pos.check_squares(type_of(pos.moved_piece(m))) & to_sq(m)) * 16384;
|
|
else // Type == EVASIONS
|
|
{
|
|
if (pos.capture_stage(m))
|
|
m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
|
|
- Value(type_of(pos.moved_piece(m)))
|
|
+ (1 << 28);
|
|
else
|
|
m.value = (*mainHistory)[pos.side_to_move()][from_to(m)]
|
|
+ (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)];
|
|
}
|
|
}
|
|
|
|
/// MovePicker::select() returns the next move satisfying a predicate function.
|
|
/// It never returns the TT move.
|
|
template<MovePicker::PickType T, typename Pred>
|
|
Move MovePicker::select(Pred filter) {
|
|
|
|
while (cur < endMoves)
|
|
{
|
|
if constexpr (T == Best)
|
|
std::swap(*cur, *std::max_element(cur, endMoves));
|
|
|
|
if (*cur != ttMove && filter())
|
|
return *cur++;
|
|
|
|
cur++;
|
|
}
|
|
return MOVE_NONE;
|
|
}
|
|
|
|
/// MovePicker::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, picking the move with the highest score from a list of generated moves.
|
|
Move MovePicker::next_move(bool skipQuiets) {
|
|
|
|
top:
|
|
switch (stage) {
|
|
|
|
case MAIN_TT:
|
|
case EVASION_TT:
|
|
case QSEARCH_TT:
|
|
case PROBCUT_TT:
|
|
++stage;
|
|
return ttMove;
|
|
|
|
case CAPTURE_INIT:
|
|
case PROBCUT_INIT:
|
|
case QCAPTURE_INIT:
|
|
cur = endBadCaptures = moves;
|
|
endMoves = generate<CAPTURES>(pos, cur);
|
|
|
|
score<CAPTURES>();
|
|
partial_insertion_sort(cur, endMoves, std::numeric_limits<int>::min());
|
|
++stage;
|
|
goto top;
|
|
|
|
case GOOD_CAPTURE:
|
|
if (select<Next>([&](){
|
|
return pos.see_ge(*cur, Value(-cur->value)) ?
|
|
// Move losing capture to endBadCaptures to be tried later
|
|
true : (*endBadCaptures++ = *cur, false); }))
|
|
return *(cur - 1);
|
|
|
|
// Prepare the pointers to loop over the refutations array
|
|
cur = std::begin(refutations);
|
|
endMoves = std::end(refutations);
|
|
|
|
// If the countermove is the same as a killer, skip it
|
|
if ( refutations[0].move == refutations[2].move
|
|
|| refutations[1].move == refutations[2].move)
|
|
--endMoves;
|
|
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case REFUTATION:
|
|
if (select<Next>([&](){ return *cur != MOVE_NONE
|
|
&& !pos.capture_stage(*cur)
|
|
&& pos.pseudo_legal(*cur); }))
|
|
return *(cur - 1);
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case QUIET_INIT:
|
|
if (!skipQuiets)
|
|
{
|
|
cur = endBadCaptures;
|
|
endMoves = generate<QUIETS>(pos, cur);
|
|
|
|
score<QUIETS>();
|
|
partial_insertion_sort(cur, endMoves, -3000 * depth);
|
|
}
|
|
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case QUIET:
|
|
if ( !skipQuiets
|
|
&& select<Next>([&](){return *cur != refutations[0].move
|
|
&& *cur != refutations[1].move
|
|
&& *cur != refutations[2].move;}))
|
|
return *(cur - 1);
|
|
|
|
// Prepare the pointers to loop over the bad captures
|
|
cur = moves;
|
|
endMoves = endBadCaptures;
|
|
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case BAD_CAPTURE:
|
|
return select<Next>([](){ return true; });
|
|
|
|
case EVASION_INIT:
|
|
cur = moves;
|
|
endMoves = generate<EVASIONS>(pos, cur);
|
|
|
|
score<EVASIONS>();
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case EVASION:
|
|
return select<Best>([](){ return true; });
|
|
|
|
case PROBCUT:
|
|
return select<Next>([&](){ return pos.see_ge(*cur, threshold); });
|
|
|
|
case QCAPTURE:
|
|
if (select<Next>([&](){ return depth > DEPTH_QS_RECAPTURES
|
|
|| to_sq(*cur) == recaptureSquare; }))
|
|
return *(cur - 1);
|
|
|
|
// If we did not find any move and we do not try checks, we have finished
|
|
if (depth != DEPTH_QS_CHECKS)
|
|
return MOVE_NONE;
|
|
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case QCHECK_INIT:
|
|
cur = moves;
|
|
endMoves = generate<QUIET_CHECKS>(pos, cur);
|
|
|
|
++stage;
|
|
[[fallthrough]];
|
|
|
|
case QCHECK:
|
|
return select<Next>([](){ return true; });
|
|
}
|
|
|
|
assert(false);
|
|
return MOVE_NONE; // Silence warning
|
|
}
|
|
|
|
} // namespace Stockfish
|