X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=dbdb0875b658b3ac197215e6572e22093c9c5117;hp=14705d30df86c733a0519169bae8fb171777bfb9;hb=6c9a64124a37afe82825e2a8ff91fe8418d8f388;hpb=be4ee0729ddc7eddcbb7912143a75769ea20fcd1 diff --git a/src/movegen.cpp b/src/movegen.cpp index 14705d30..dbdb0875 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -24,11 +24,12 @@ #include +#include "bitcount.h" #include "movegen.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. -#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b)) +#define SERIALIZE_MOVES(b, bsf) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b)) //// //// Local definitions @@ -82,22 +83,22 @@ namespace { } // Template generate_piece_checks() with specializations - template + template MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square); template<> - inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { + inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { return (us == WHITE ? generate_pawn_checks(p, dc, ksq, m) : generate_pawn_checks(p, dc, ksq, m)); } // Template generate_piece_moves() with specializations and overloads - template + template MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard); template<> - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); + MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); template inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) { @@ -112,12 +113,12 @@ namespace { : generate_pawn_noncaptures(p, m)); } - template + template MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard); template<> - inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, - Color us, Bitboard t, Bitboard pnd) { + inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, + Color us, Bitboard t, Bitboard pnd) { return (us == WHITE ? generate_pawn_blocking_evasions(p, pnd, t, m) : generate_pawn_blocking_evasions(p, pnd, t, m)); @@ -132,7 +133,7 @@ namespace { /// generate_captures generates() all pseudo-legal captures and queen /// promotions. The return value is the number of moves generated. - +template int generate_captures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); @@ -142,19 +143,25 @@ int generate_captures(const Position& pos, MoveStack* mlist) { Bitboard target = pos.pieces_of_color(opposite_color(us)); MoveStack* mlist_start = mlist; - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); return int(mlist - mlist_start); } +int generate_captures(const Position& pos, MoveStack* mlist) { + + return CpuHasPOPCNT ? generate_captures(pos, mlist) + : generate_captures(pos, mlist); +} + /// generate_noncaptures() generates all pseudo-legal non-captures and /// underpromotions. The return value is the number of moves generated. - +template int generate_noncaptures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); @@ -165,20 +172,26 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { MoveStack* mlist_start = mlist; mlist = generate_piece_moves(pos, mlist, us); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_castle_moves(pos, mlist); mlist = generate_castle_moves(pos, mlist); return int(mlist - mlist_start); } +int generate_noncaptures(const Position& pos, MoveStack* mlist) { + + return CpuHasPOPCNT ? generate_noncaptures(pos, mlist) + : generate_noncaptures(pos, mlist); +} + /// generate_non_capture_checks() generates all pseudo-legal non-capturing, /// non-promoting checks. It returns the number of generated moves. - +template int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { assert(pos.is_ok()); @@ -191,12 +204,12 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); // Pieces moves - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); // Castling moves that give check. Very rare but nice to have! if ( pos.can_castle_queenside(us) @@ -212,11 +225,17 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard return int(mlist - mlist_start); } +int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { + + return CpuHasPOPCNT ? generate_non_capture_checks(pos, mlist, dc) + : generate_non_capture_checks(pos, mlist, dc); +} + /// generate_evasions() generates all check evasions when the side to move is /// in check. Unlike the other move generation functions, this one generates /// only legal moves. It returns the number of generated moves. - +template int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { assert(pos.is_ok()); @@ -312,11 +331,11 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { if (blockSquares != EmptyBoardBB) { - mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); - mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); - mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); - mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); - mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); } } @@ -333,7 +352,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // The checking pawn cannot be a discovered (bishop) check candidate // otherwise we were in check also before last double push move. assert(!bit_is_set(pos.discovered_check_candidates(them), checksq)); - assert(count_1s(b1) == 1 || count_1s(b1) == 2); + assert(count_1s(b1) == 1 || count_1s(b1) == 2); b1 &= ~pinned; while (b1) @@ -349,6 +368,12 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { return int(mlist - mlist_start); } +int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { + + return CpuHasPOPCNT ? generate_evasions(pos, mlist, pinned) + : generate_evasions(pos, mlist, pinned); +} + /// generate_legal_moves() computes a complete list of legal moves in the /// current position. This function is not very fast, and should be used @@ -565,7 +590,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { namespace { - template + template MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Square from; @@ -575,12 +600,12 @@ namespace { { from = pos.piece_list(us, Piece, i); b = pos.piece_attacks(from) & target; - SERIALIZE_MOVES(b); + SERIALIZE_MOVES(b, HasBSF); } return mlist; } - template + template MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target, Bitboard pinned) { Square from; @@ -593,19 +618,19 @@ namespace { continue; b = pos.piece_attacks(from) & target; - SERIALIZE_MOVES(b); + SERIALIZE_MOVES(b, HasBSF); } return mlist; } template<> - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Bitboard b; Square from = pos.king_square(us); b = pos.piece_attacks(from) & target; - SERIALIZE_MOVES(b); + SERIALIZE_MOVES(b, false); return mlist; } @@ -756,13 +781,15 @@ namespace { const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + const SquareDelta TDELTA_S = (Us == WHITE ? DELTA_S : DELTA_N); Bitboard b1, b2, b3; - Bitboard empty = pos.empty_squares(); Bitboard pawns = pos.pawns(Us); if (dc & pawns) { + Bitboard empty = pos.empty_squares(); + // Pawn moves which gives discovered check. This is possible only if the // pawn is not on the same file as the enemy king, because we don't // generate captures. @@ -786,10 +813,15 @@ namespace { } // Direct checks. These are possible only for pawns on neighboring files - // of the enemy king. + // and in the two ranks that, after the push, are in front of the enemy king. b1 = pawns & neighboring_files_bb(ksq) & ~dc; + b2 = rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S); + b1 &= b2; + if (!b1) + return mlist; // Direct checks, single pawn pushes + Bitboard empty = pos.empty_squares(); b2 = move_pawns(b1) & empty; b3 = b2 & pos.pawn_attacks(Them, ksq); while (b3) @@ -808,7 +840,7 @@ namespace { return mlist; } - template + template MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { @@ -823,28 +855,28 @@ namespace { if (Piece == KING) bb &= ~QueenPseudoAttacks[ksq]; - SERIALIZE_MOVES(bb); + SERIALIZE_MOVES(bb, HasBSF); } // Direct checks b = target & ~dc; - if (Piece == KING || !b) - return mlist; - - Bitboard checkSqs = pos.piece_attacks(ksq) & pos.empty_squares(); - if (!checkSqs) - return mlist; - - while (b) + if (Piece != KING || b) { - Square from = pop_1st_bit(&b); - if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) - || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) - || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) - continue; + Bitboard checkSqs = pos.piece_attacks(ksq) & pos.empty_squares(); + if (!checkSqs) + return mlist; - Bitboard bb = pos.piece_attacks(from) & checkSqs; - SERIALIZE_MOVES(bb); + while (b) + { + Square from = pop_1st_bit(&b); + if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) + || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) + || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + continue; + + Bitboard bb = pos.piece_attacks(from) & checkSqs; + SERIALIZE_MOVES(bb, HasBSF); + } } return mlist; }