Assorted trivial cleanups

- Cleanups by Alain
- Group king attacks and king defenses
- Signature of futility_move_count()
- Use is_discovery_check_on_king()
- Simplify backward definition
- Use static asserts in move generator
- Factor a statement in move generator

No functional change

diff --git a/src/Makefile b/src/Makefile
index 70246f5629337e627e0fb85541a7dca6c0b7c9dc..679eb8d90fcb740c183660ed9eae3682e9a2c6f7 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -290,7 +290,7 @@ ifeq ($(optimize),yes)
                        CXXFLAGS += -fno-gcse -mthumb -march=armv7-a -mfloat-abi=softfp
                endif
        endif
                        CXXFLAGS += -fno-gcse -mthumb -march=armv7-a -mfloat-abi=softfp
                endif
        endif

-       
+

        ifeq ($(comp),$(filter $(comp),gcc clang icc))
                ifeq ($(KERNEL),Darwin)
                        CXXFLAGS += -mdynamic-no-pic
        ifeq ($(comp),$(filter $(comp),gcc clang icc))
                ifeq ($(KERNEL),Darwin)
                        CXXFLAGS += -mdynamic-no-pic

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index a0ad09f084baea61e850e478dc4666d7a097c44b..6bbd72a7cae91eb062ee69e63dd7561d2e852612 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -448,16 +448,16 @@ namespace {
     int kingFlankAttacks = popcount(b1) + popcount(b2);
 
     kingDanger +=        kingAttackersCount[Them] * kingAttackersWeight[Them]
     int kingFlankAttacks = popcount(b1) + popcount(b2);
 
     kingDanger +=        kingAttackersCount[Them] * kingAttackersWeight[Them]

-                 +  69 * kingAttacksCount[Them]

                  + 185 * popcount(kingRing[Us] & weak)
                  + 185 * popcount(kingRing[Us] & weak)

-                 - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING])
-                 -  35 * bool(attackedBy[Us][BISHOP] & attackedBy[Us][KING])

                  + 148 * popcount(unsafeChecks)
                  +  98 * popcount(pos.blockers_for_king(Us))
                  + 148 * popcount(unsafeChecks)
                  +  98 * popcount(pos.blockers_for_king(Us))

+                 +  69 * kingAttacksCount[Them]
+                 +   3 * kingFlankAttacks * kingFlankAttacks / 8
+                 +       mg_value(mobility[Them] - mobility[Us])

                  - 873 * !pos.count<QUEEN>(Them)
                  - 873 * !pos.count<QUEEN>(Them)

+                 - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING])
+                 -  35 * bool(attackedBy[Us][BISHOP] & attackedBy[Us][KING])

                  -   6 * mg_value(score) / 8
                  -   6 * mg_value(score) / 8

-                 +       mg_value(mobility[Them] - mobility[Us])
-                 +   3 * kingFlankAttacks * kingFlankAttacks / 8

                  -   7;
 
     // Transform the kingDanger units into a Score, and subtract it from the evaluation
                  -   7;
 
     // Transform the kingDanger units into a Score, and subtract it from the evaluation


@@ -596,7 +596,6 @@ namespace {
         assert(!(pos.pieces(Them, PAWN) & forward_file_bb(Us, s + Up)));
 
         int r = relative_rank(Us, s);
         assert(!(pos.pieces(Them, PAWN) & forward_file_bb(Us, s + Up)));
 
         int r = relative_rank(Us, s);

-        File f = file_of(s);

 
         Score bonus = PassedRank[r];
 
 
         Score bonus = PassedRank[r];
 


@@ -646,7 +645,7 @@ namespace {
             || (pos.pieces(PAWN) & (s + Up)))
             bonus = bonus / 2;
 
             || (pos.pieces(PAWN) & (s + Up)))
             bonus = bonus / 2;
 

-        score += bonus - PassedFile * map_to_queenside(f);
+        score += bonus - PassedFile * map_to_queenside(file_of(s));

     }
 
     if (T)
     }
 
     if (T)


@@ -755,7 +754,7 @@ namespace {
         else
             sf = std::min(sf, 36 + (pos.opposite_bishops() ? 2 : 7) * pos.count<PAWN>(strongSide));
 
         else
             sf = std::min(sf, 36 + (pos.opposite_bishops() ? 2 : 7) * pos.count<PAWN>(strongSide));
 

-        sf = std::max(0, sf - (pos.rule50_count() - 12) / 4  );
+        sf = std::max(0, sf - (pos.rule50_count() - 12) / 4);

     }
 
     return ScaleFactor(sf);
     }
 
     return ScaleFactor(sf);

diff --git a/src/movegen.cpp b/src/movegen.cpp
index fc99ec26611a53f6701d3d3b6a58461da43c7372..ef7821e001995e130421983c558a671ec1154bdf 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -60,6 +60,7 @@ namespace {
     constexpr Direction UpRight  = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
     constexpr Direction UpLeft   = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
 
     constexpr Direction UpRight  = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
     constexpr Direction UpLeft   = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
 

+    const Square ksq = pos.square<KING>(Them);

     Bitboard emptySquares;
 
     Bitboard pawnsOn7    = pos.pieces(Us, PAWN) &  TRank7BB;
     Bitboard emptySquares;
 
     Bitboard pawnsOn7    = pos.pieces(Us, PAWN) &  TRank7BB;


@@ -84,8 +85,6 @@ namespace {
 
         if (Type == QUIET_CHECKS)
         {
 
         if (Type == QUIET_CHECKS)
         {

-            Square ksq = pos.square<KING>(Them);
-

             b1 &= pos.attacks_from<PAWN>(ksq, Them);
             b2 &= pos.attacks_from<PAWN>(ksq, Them);
 
             b1 &= pos.attacks_from<PAWN>(ksq, Them);
             b2 &= pos.attacks_from<PAWN>(ksq, Them);
 


@@ -130,8 +129,6 @@ namespace {
         Bitboard b2 = shift<UpLeft >(pawnsOn7) & enemies;
         Bitboard b3 = shift<Up     >(pawnsOn7) & emptySquares;
 
         Bitboard b2 = shift<UpLeft >(pawnsOn7) & enemies;
         Bitboard b3 = shift<Up     >(pawnsOn7) & emptySquares;
 

-        Square ksq = pos.square<KING>(Them);
-

         while (b1)
             moveList = make_promotions<Type, UpRight>(moveList, pop_lsb(&b1), ksq);
 
         while (b1)
             moveList = make_promotions<Type, UpRight>(moveList, pop_lsb(&b1), ksq);
 


@@ -187,7 +184,7 @@ namespace {
   ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Color us,
                           Bitboard target) {
 
   ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Color us,
                           Bitboard target) {
 

-    assert(Pt != KING && Pt != PAWN);
+    static_assert(Pt != KING && Pt != PAWN, "Unsupported piece type in generate_moves()");

 
     const Square* pl = pos.squares<Pt>(us);
 
 
     const Square* pl = pos.squares<Pt>(us);
 


@@ -261,7 +258,7 @@ namespace {
 template<GenType Type>
 ExtMove* generate(const Position& pos, ExtMove* moveList) {
 
 template<GenType Type>
 ExtMove* generate(const Position& pos, ExtMove* moveList) {
 

-  assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS);
+  static_assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS, "Unsupported type in generate()");

   assert(!pos.checkers());
 
   Color us = pos.side_to_move();
   assert(!pos.checkers());
 
   Color us = pos.side_to_move();

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 1825b6e286be564edd9f1be685098529d144e949..84f3d97748d4003c62afce8e57773956ed089bfe 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -108,7 +108,7 @@ namespace {
         // A pawn is backward when it is behind all pawns of the same color on
         // the adjacent files and cannot safely advance.
         backward =  !(neighbours & forward_ranks_bb(Them, s + Up))
         // A pawn is backward when it is behind all pawns of the same color on
         // the adjacent files and cannot safely advance.
         backward =  !(neighbours & forward_ranks_bb(Them, s + Up))

-                  && (stoppers & (leverPush | blocked));
+                  && (leverPush | blocked);

 
         // Compute additional span if pawn is not backward nor blocked
         if (!backward && !blocked)
 
         // Compute additional span if pawn is not backward nor blocked
         if (!backward && !blocked)

diff --git a/src/position.h b/src/position.h
index a0a9a306b7aeaf95e52d4f1cd95141396298ade6..e6c901ea2c98793e68ae7a17927a12fdefa65af5 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -286,7 +286,8 @@ inline Square Position::castling_rook_square(CastlingRights cr) const {
 
 template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
 
 template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {

-  assert(Pt != PAWN);
+  static_assert(Pt != PAWN, "Pawn attacks need color");
+

   return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, byTypeBB[ALL_PIECES])
         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
         : PseudoAttacks[Pt][s];
   return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, byTypeBB[ALL_PIECES])
         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
         : PseudoAttacks[Pt][s];

diff --git a/src/search.cpp b/src/search.cpp
index c70fbf60cd6c1efa9b9599d31c898cfd116960d7..e0dcc4d1346a71c1766427f4d9d482db8f7cc9f5 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -75,7 +75,7 @@ namespace {
     return (r + 520) / 1024 + (!i && r > 999);
   }
 
     return (r + 520) / 1024 + (!i && r > 999);
   }
 

-  constexpr int futility_move_count(bool improving, int depth) {
+  constexpr int futility_move_count(bool improving, Depth depth) {

     return (5 + depth * depth) * (1 + improving) / 2;
   }
 
     return (5 + depth * depth) * (1 + improving) / 2;
   }
 


@@ -594,7 +594,7 @@ namespace {
     Move ttMove, move, excludedMove, bestMove;
     Depth extension, newDepth;
     Value bestValue, value, ttValue, eval, maxValue;
     Move ttMove, move, excludedMove, bestMove;
     Depth extension, newDepth;
     Value bestValue, value, ttValue, eval, maxValue;

-    bool ttHit, ttPv, inCheck, givesCheck, improving, doLMR, priorCapture;
+    bool ttHit, ttPv, inCheck, givesCheck, improving, didLMR, priorCapture;

     bool captureOrPromotion, doFullDepthSearch, moveCountPruning, ttCapture, singularLMR;
     Piece movedPiece;
     int moveCount, captureCount, quietCount;
     bool captureOrPromotion, doFullDepthSearch, moveCountPruning, ttCapture, singularLMR;
     Piece movedPiece;
     int moveCount, captureCount, quietCount;


@@ -1151,17 +1151,17 @@ moves_loop: // When in check, search starts from here
 
           value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, true);
 
 
           value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, true);
 

-          doFullDepthSearch = (value > alpha && d != newDepth), doLMR = true;
+          doFullDepthSearch = (value > alpha && d != newDepth), didLMR = true;

       }
       else
       }
       else

-          doFullDepthSearch = !PvNode || moveCount > 1, doLMR = false;
+          doFullDepthSearch = !PvNode || moveCount > 1, didLMR = false;

 
       // Step 17. Full depth search when LMR is skipped or fails high
       if (doFullDepthSearch)
       {
           value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode);
 
 
       // Step 17. Full depth search when LMR is skipped or fails high
       if (doFullDepthSearch)
       {
           value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode);
 

-          if (doLMR && !captureOrPromotion)
+          if (didLMR && !captureOrPromotion)

           {
               int bonus = value > alpha ?  stat_bonus(newDepth)
                                         : -stat_bonus(newDepth);
           {
               int bonus = value > alpha ?  stat_bonus(newDepth)
                                         : -stat_bonus(newDepth);


@@ -1466,7 +1466,7 @@ moves_loop: // When in check, search starts from here
 
       // Don't search moves with negative SEE values
       if (  (!inCheck || evasionPrunable)
 
       // Don't search moves with negative SEE values
       if (  (!inCheck || evasionPrunable)

-          && (!givesCheck || !(pos.blockers_for_king(~pos.side_to_move()) & from_sq(move)))
+          && !(givesCheck && pos.is_discovery_check_on_king(~pos.side_to_move(), move))

           && !pos.see_ge(move))
           continue;
 
           && !pos.see_ge(move))
           continue;
 

diff --git a/src/syzygy/tbprobe.cpp b/src/syzygy/tbprobe.cpp
index c7d2078841d95c7ac1cd595be029957f22d36dd6..a9378b4ba0914ef72a387743f4f53c4063d33b81 100644 (file)
--- a/src/syzygy/tbprobe.cpp
+++ b/src/syzygy/tbprobe.cpp
@@ -706,9 +706,7 @@ Ret do_probe_table(const Position& pos, T* entry, WDLScore wdl, ProbeState* resu
 
         std::swap(squares[0], *std::max_element(squares, squares + leadPawnsCnt, pawns_comp));
 
 
         std::swap(squares[0], *std::max_element(squares, squares + leadPawnsCnt, pawns_comp));
 

-        tbFile = file_of(squares[0]);
-        if (tbFile > FILE_D)
-            tbFile = file_of(squares[0] ^ 7); // Horizontal flip: SQ_H1 -> SQ_A1
+        tbFile = map_to_queenside(file_of(squares[0]));

     }
 
     // DTZ tables are one-sided, i.e. they store positions only for white to
     }
 
     // DTZ tables are one-sided, i.e. they store positions only for white to


@@ -1062,8 +1060,8 @@ void set(T& e, uint8_t* data) {
 
     enum { Split = 1, HasPawns = 2 };
 
 
     enum { Split = 1, HasPawns = 2 };
 

-    assert(e.hasPawns        == !!(*data & HasPawns));
-    assert((e.key != e.key2) == !!(*data & Split));
+    assert(e.hasPawns        == bool(*data & HasPawns));
+    assert((e.key != e.key2) == bool(*data & Split));

 
     data++; // First byte stores flags
 
 
     data++; // First byte stores flags
 

diff --git a/src/thread.cpp b/src/thread.cpp
index 476f1d64d84363b8ec2b452a7e5d990d6d6a7785..680cd3adb8c3dc52bf87c9225f2a08db33e65cd7 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -71,13 +71,13 @@ void Thread::clear() {
   captureHistory.fill(0);
 
   for (bool inCheck : { false, true })
   captureHistory.fill(0);
 
   for (bool inCheck : { false, true })

-         for (StatsType c : { NoCaptures, Captures })
-                 for (auto& to : continuationHistory[inCheck][c])
-                         for (auto& h : to)
-                                 h->fill(0);
+    for (StatsType c : { NoCaptures, Captures })
+      for (auto& to : continuationHistory[inCheck][c])
+        for (auto& h : to)
+          h->fill(0);

 
   for (bool inCheck : { false, true })
 
   for (bool inCheck : { false, true })

-         for (StatsType c : { NoCaptures, Captures })
+    for (StatsType c : { NoCaptures, Captures })

       continuationHistory[inCheck][c][NO_PIECE][0]->fill(Search::CounterMovePruneThreshold - 1);
 }
 
       continuationHistory[inCheck][c][NO_PIECE][0]->fill(Search::CounterMovePruneThreshold - 1);
 }
 

diff --git a/src/types.h b/src/types.h
index cc4008b3e72702fd9220a3dfd5e3fd34d7dee562..5197e9fbbe3b0d50cd57f4a89d52009323b8bc0e 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -341,7 +341,7 @@ inline Score operator*(Score s, int i) {
   return result;
 }
 
   return result;
 }
 

-/// Multiplication of a Score by an boolean
+/// Multiplication of a Score by a boolean

 inline Score operator*(Score s, bool b) {
   return Score(int(s) * int(b));
 }
 inline Score operator*(Score s, bool b) {
   return Score(int(s) * int(b));
 }