From: Stéphane Nicolet Date: Thu, 15 Apr 2021 09:18:38 +0000 (+0200) Subject: Revert previous patch X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=4889cf22bb2985d6d0babb8da93698e5d7641304 Revert previous patch Revert the previous patch about move generation, as it unexpectedly changed the bench. Better to take the time to understand the issue. Bench: 4191632 --- diff --git a/src/movegen.cpp b/src/movegen.cpp index c3c149b7..50496136 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -175,19 +175,19 @@ namespace { } - template - ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Bitboard target) { + template + ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Bitboard piecesToMove, Bitboard target) { static_assert(Pt != KING && Pt != PAWN, "Unsupported piece type in generate_moves()"); - Bitboard bb = pos.pieces(Us, Pt); + Bitboard bb = piecesToMove & pos.pieces(Pt); while (bb) { Square from = pop_lsb(bb); Bitboard b = attacks_bb(from, pos.pieces()) & target; - if (Checks && (Pt == QUEEN || !(pos.blockers_for_king(~Us) & from))) + if constexpr (Checks) b &= pos.check_squares(Pt); while (b) @@ -204,11 +204,10 @@ namespace { static_assert(Type != LEGAL, "Unsupported type in generate_all()"); constexpr bool Checks = Type == QUIET_CHECKS; // Reduce template instantiations - const Square ksq = pos.square(Us); - Bitboard target; - - if (Type == EVASIONS && more_than_one(pos.checkers())) - goto kingMoves; // Double check, only a king move can save the day + Bitboard target, piecesToMove = pos.pieces(Us); + + if(Type == QUIET_CHECKS) + piecesToMove &= ~pos.blockers_for_king(~Us); switch (Type) { @@ -220,7 +219,7 @@ namespace { target = ~pos.pieces(); break; case EVASIONS: - target = between_bb(ksq, lsb(pos.checkers())); + target = between_bb(pos.square(Us), lsb(pos.checkers())); break; case NON_EVASIONS: target = ~pos.pieces(Us); @@ -228,22 +227,19 @@ namespace { } moveList = generate_pawn_moves(pos, moveList, target); - moveList = generate_moves(pos, moveList, target); - moveList = generate_moves(pos, moveList, target); - moveList = generate_moves(pos, moveList, target); - moveList = generate_moves(pos, moveList, target); + moveList = generate_moves(pos, moveList, piecesToMove, target); + moveList = generate_moves(pos, moveList, piecesToMove, target); + moveList = generate_moves< ROOK, Checks>(pos, moveList, piecesToMove, target); + moveList = generate_moves< QUEEN, Checks>(pos, moveList, piecesToMove, target); -kingMoves: - if (!Checks || pos.blockers_for_king(~Us) & ksq) + if (Type != QUIET_CHECKS && Type != EVASIONS) { - Bitboard b = attacks_bb(ksq) & (Type == EVASIONS ? ~pos.pieces(Us) : target); - if (Checks) - b &= ~attacks_bb(pos.square(~Us)); - + Square ksq = pos.square(Us); + Bitboard b = attacks_bb(ksq) & target; while (b) *moveList++ = make_move(ksq, pop_lsb(b)); - if ((Type == QUIETS || Type == NON_EVASIONS) && pos.can_castle(Us & ANY_CASTLING)) + if ((Type != CAPTURES) && pos.can_castle(Us & ANY_CASTLING)) for (CastlingRights cr : { Us & KING_SIDE, Us & QUEEN_SIDE } ) if (!pos.castling_impeded(cr) && pos.can_castle(cr)) *moveList++ = make(ksq, pos.castling_rook_square(cr)); @@ -257,8 +253,6 @@ kingMoves: /// Generates all pseudo-legal captures plus queen and checking knight promotions /// Generates all pseudo-legal non-captures and underpromotions (except checking knight) -/// Generates all pseudo-legal check evasions when the side to move is in check -/// Generates all pseudo-legal non-captures giving check, except castling /// Generates all pseudo-legal captures and non-captures /// /// Returns a pointer to the end of the move list. @@ -266,8 +260,8 @@ kingMoves: template ExtMove* generate(const Position& pos, ExtMove* moveList) { - static_assert(Type != LEGAL, "Unsupported type in generate()"); - assert((Type == EVASIONS) == (bool)pos.checkers()); + static_assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS, "Unsupported type in generate()"); + assert(!pos.checkers()); Color us = pos.side_to_move(); @@ -278,11 +272,62 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { // Explicit template instantiations template ExtMove* generate(const Position&, ExtMove*); template ExtMove* generate(const Position&, ExtMove*); -template ExtMove* generate(const Position&, ExtMove*); -template ExtMove* generate(const Position&, ExtMove*); template ExtMove* generate(const Position&, ExtMove*); +/// generate generates all pseudo-legal non-captures giving check, +/// except castling. Returns a pointer to the end of the move list. +template<> +ExtMove* generate(const Position& pos, ExtMove* moveList) { + + assert(!pos.checkers()); + + Color us = pos.side_to_move(); + Bitboard dc = pos.blockers_for_king(~us) & pos.pieces(us) & ~pos.pieces(PAWN); + + while (dc) + { + Square from = pop_lsb(dc); + PieceType pt = type_of(pos.piece_on(from)); + + Bitboard b = attacks_bb(pt, from, pos.pieces()) & ~pos.pieces(); + + if (pt == KING) + b &= ~attacks_bb(pos.square(~us)); + + while (b) + *moveList++ = make_move(from, pop_lsb(b)); + } + + return us == WHITE ? generate_all(pos, moveList) + : generate_all(pos, moveList); +} + + +/// generate generates all pseudo-legal check evasions when the side +/// to move is in check. Returns a pointer to the end of the move list. +template<> +ExtMove* generate(const Position& pos, ExtMove* moveList) { + + assert(pos.checkers()); + + Color us = pos.side_to_move(); + Square ksq = pos.square(us); + + // Generate evasions for king + Bitboard b = attacks_bb(ksq) & ~pos.pieces(us); + while (b) + *moveList++ = make_move(ksq, pop_lsb(b)); + + if (more_than_one(pos.checkers())) + return moveList; // Double check, only a king move can save the day + + // Generate blocking interpositions or captures of the checking piece + return us == WHITE ? generate_all(pos, moveList) + : generate_all(pos, moveList); +} + + /// generate generates all the legal moves in the given position template<>