Simplify popcnt

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 6b329bb0def455471fcf6302f6ce5722de69215a..da4b9c30b41c3e9d3f4ac17641e7a8fcb3f28233 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -24,7 +24,7 @@
 #include <iomanip>
 #include <sstream>
 
 #include <iomanip>
 #include <sstream>
 

-#include "bitcount.h"
+#include "bitboard.h"

 #include "evaluate.h"
 #include "material.h"
 #include "pawns.h"
 #include "evaluate.h"
 #include "material.h"
 #include "pawns.h"


@@ -234,7 +234,7 @@ namespace {
     {
         ei.kingRing[Them] = b | shift_bb<Down>(b);
         b &= ei.attackedBy[Us][PAWN];
     {
         ei.kingRing[Them] = b | shift_bb<Down>(b);
         b &= ei.attackedBy[Us][PAWN];

-        ei.kingAttackersCount[Us] = b ? popcount<Max15>(b) : 0;
+        ei.kingAttackersCount[Us] = b ? popcount(b) : 0;

         ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0;
     }
     else
         ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0;
     }
     else


@@ -278,7 +278,7 @@ namespace {
             ei.kingAttackersWeight[Us] += KingAttackWeights[Pt];
             bb = b & ei.attackedBy[Them][KING];
             if (bb)
             ei.kingAttackersWeight[Us] += KingAttackWeights[Pt];
             bb = b & ei.attackedBy[Them][KING];
             if (bb)

-                ei.kingAdjacentZoneAttacksCount[Us] += popcount<Max15>(bb);
+                ei.kingAdjacentZoneAttacksCount[Us] += popcount(bb);

         }
 
         if (Pt == QUEEN)
         }
 
         if (Pt == QUEEN)


@@ -286,7 +286,7 @@ namespace {
                    | ei.attackedBy[Them][BISHOP]
                    | ei.attackedBy[Them][ROOK]);
 
                    | ei.attackedBy[Them][BISHOP]
                    | ei.attackedBy[Them][ROOK]);
 

-        int mob = popcount<Pt == QUEEN ? Full : Max15>(b & mobilityArea[Us]);
+        int mob = popcount(b & mobilityArea[Us]);

 
         mobility[Us] += MobilityBonus[Pt][mob];
 
 
         mobility[Us] += MobilityBonus[Pt][mob];
 


@@ -334,7 +334,7 @@ namespace {
             {
                 Bitboard alignedPawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s];
                 if (alignedPawns)
             {
                 Bitboard alignedPawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s];
                 if (alignedPawns)

-                    score += RookOnPawn * popcount<Max15>(alignedPawns);
+                    score += RookOnPawn * popcount(alignedPawns);

             }
 
             // Bonus when on an open or semi-open file
             }
 
             // Bonus when on an open or semi-open file


@@ -399,7 +399,7 @@ namespace {
         // the pawn shelter (current 'score' value).
         attackUnits =  std::min(72, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
                      +  9 * ei.kingAdjacentZoneAttacksCount[Them]
         // the pawn shelter (current 'score' value).
         attackUnits =  std::min(72, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
                      +  9 * ei.kingAdjacentZoneAttacksCount[Them]

-                     + 27 * popcount<Max15>(undefended)
+                     + 27 * popcount(undefended)

                      + 11 * !!ei.pinnedPieces[Us]
                      - 64 * !pos.count<QUEEN>(Them)
                      - mg_value(score) / 8;
                      + 11 * !!ei.pinnedPieces[Us]
                      - 64 * !pos.count<QUEEN>(Them)
                      - mg_value(score) / 8;


@@ -415,7 +415,7 @@ namespace {
                 | ei.attackedBy[Them][KING];
 
             if (b)
                 | ei.attackedBy[Them][KING];
 
             if (b)

-                attackUnits += QueenContactCheck * popcount<Max15>(b);
+                attackUnits += QueenContactCheck * popcount(b);

         }
 
         // Analyse the enemy's safe distance checks for sliders and knights
         }
 
         // Analyse the enemy's safe distance checks for sliders and knights


@@ -513,7 +513,7 @@ namespace {
 
         b = weak & ~ei.attackedBy[Them][ALL_PIECES];
         if (b)
 
         b = weak & ~ei.attackedBy[Them][ALL_PIECES];
         if (b)

-            score += Hanging * popcount<Max15>(b);
+            score += Hanging * popcount(b);

 
         b = weak & ei.attackedBy[Us][KING];
         if (b)
 
         b = weak & ei.attackedBy[Us][KING];
         if (b)


@@ -533,7 +533,7 @@ namespace {
        & ~ei.attackedBy[Us][PAWN];
 
     if (b)
        & ~ei.attackedBy[Us][PAWN];
 
     if (b)

-        score += ThreatByPawnPush * popcount<Max15>(b);
+        score += ThreatByPawnPush * popcount(b);

 
     if (DoTrace)
         Trace::add(THREAT, Us, score);
 
     if (DoTrace)
         Trace::add(THREAT, Us, score);


@@ -656,7 +656,7 @@ namespace {
     assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
 
     // ...count safe + (behind & safe) with a single popcount
     assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
 
     // ...count safe + (behind & safe) with a single popcount

-    int bonus = popcount<Full>((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));
+    int bonus = popcount((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));

     int weight =  pos.count<KNIGHT>(Us) + pos.count<BISHOP>(Us)
                 + pos.count<KNIGHT>(Them) + pos.count<BISHOP>(Them);
 
     int weight =  pos.count<KNIGHT>(Us) + pos.count<BISHOP>(Us)
                 + pos.count<KNIGHT>(Them) + pos.count<BISHOP>(Them);