Micro-optimize do_generate_pawn_checks()

[stockfish] / src / movegen.cpp

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 198a36c5b15dd7b2779d1167430427655a807a70..d4788f1bf38ce1788eeb52068b685b3575e0693b 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -107,7 +107,6 @@ namespace {
 
   template<PieceType>
   MoveStack* generate_piece_checks(const Position&, Bitboard, Bitboard, Square, MoveStack*);
-  MoveStack* generate_piece_checks_king(const Position&, Square, Bitboard, Square, MoveStack*);
 
   template<PieceType>
   MoveStack* generate_piece_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*);
@@ -214,7 +213,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
       mlist = generate_piece_checks<QUEEN>(pos, b, dc, ksq, mlist);
 
   // Hopefully we always have a king ;-)
-  mlist = generate_piece_checks_king(pos, pos.king_square(us), dc, ksq, mlist);
+  mlist = generate_piece_checks<KING>(pos, pos.kings(us), dc, ksq, mlist);
 
   // Castling moves that give check. Very rare but nice to have!
   if (   pos.can_castle_queenside(us)
@@ -784,33 +783,37 @@ namespace {
   template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB, SquareDelta TDELTA_N>
   MoveStack* do_generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
   {
-    // Pawn moves which give 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.
-    Bitboard empty = pos.empty_squares();
-
     // Find all friendly pawns not on the enemy king's file
-    Bitboard b1 = pos.pawns(Us) & ~file_bb(ksq), b2, b3;
+    Bitboard b1, b2, b3;
+    Bitboard empty = pos.empty_squares();
 
-    // Discovered checks, single pawn pushes, no promotions
-    b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB;
-    while (b3)
+    if (dc != EmptyBoardBB)
     {
-        Square to = pop_1st_bit(&b3);
-        (*mlist++).move = make_move(to - TDELTA_N, to);
-    }
+        // 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.
+        b1 = pos.pawns(Us) & ~file_bb(ksq);
+
+        // Discovered checks, single pawn pushes, no promotions
+        b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB;
+        while (b3)
+        {
+            Square to = pop_1st_bit(&b3);
+            (*mlist++).move = make_move(to - TDELTA_N, to);
+        }
 
-    // Discovered checks, double pawn pushes
-    b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty;
-    while (b3)
-    {
-        Square to = pop_1st_bit(&b3);
-        (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
+        // Discovered checks, double pawn pushes
+        b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty;
+        while (b3)
+        {
+            Square to = pop_1st_bit(&b3);
+            (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
+        }
     }
 
     // Direct checks. These are possible only for pawns on neighboring files
-    // of the enemy king
-    b1 &= (~dc & neighboring_files_bb(ksq));
+    // of the enemy king.
+    b1 = pos.pawns(Us) & neighboring_files_bb(ksq) & ~dc;
 
     // Direct checks, single pawn pushes
     b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty;
@@ -825,7 +828,6 @@ namespace {
     b3 =  (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8)
         & empty
         & pos.pawn_attacks(Them, ksq);
-
     while (b3)
     {
         Square to = pop_1st_bit(&b3);
@@ -843,8 +845,15 @@ namespace {
     {
         Square from = pop_1st_bit(&b);
         Bitboard bb = pos.piece_attacks<Piece>(from) & pos.empty_squares();
+        if (Piece == KING)
+            bb &= ~QueenPseudoAttacks[ksq];
+
         SERIALIZE_MOVES(bb);
     }
+
+    if (Piece == KING)
+        return mlist;
+
     // Direct checks
     b = target & ~dc;
     Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
@@ -857,19 +866,6 @@ namespace {
     return mlist;
   }
 
-  MoveStack* generate_piece_checks_king(const Position& pos, Square from, Bitboard dc,
-                                        Square ksq, MoveStack* mlist) {
-    if (bit_is_set(dc, from))
-    {
-        Bitboard b =   pos.piece_attacks<KING>(from)
-                     & pos.empty_squares()
-                     & ~QueenPseudoAttacks[ksq];
-        SERIALIZE_MOVES(b);
-    }
-    return mlist;
-  }
-
-
   template<Color Us, Rank TRANK_8, Bitboard TRank3BB, SquareDelta TDELTA_N>
   MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
                                                 Bitboard blockSquares, MoveStack* mlist) {