Skip to content

Commit

Permalink
Simplify away pinnedPieces bitboard in EvalInfo (#975)
Browse files Browse the repository at this point in the history
Results for 20 tests for each version (pgo-builds):

            Base      Test      Diff      
    Mean    2110519   2118116   -7597     
    StDev   8727      4906      10112     

p-value: 0,774
speedup: 0,004

Further verified for no regression:
http://tests.stockfishchess.org/tests/view/5885abd10ebc5915193f79e6
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 21786 W: 3959 L: 3840 D: 13987

No functional change
  • Loading branch information
pb00068 authored and mcostalba committed Jan 28, 2017
1 parent cf4a38e commit 58c181d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/evaluate.cpp
Expand Up @@ -75,7 +75,6 @@ namespace {

Material::Entry* me;
Pawns::Entry* pe;
Bitboard pinnedPieces[COLOR_NB];
Bitboard mobilityArea[COLOR_NB];

// attackedBy[color][piece type] is a bitboard representing all squares
Expand Down Expand Up @@ -230,8 +229,6 @@ namespace {
const Square Down = (Us == WHITE ? SOUTH : NORTH);
const Bitboard LowRanks = (Us == WHITE ? Rank2BB | Rank3BB: Rank7BB | Rank6BB);

ei.pinnedPieces[Us] = pos.pinned_pieces(Us);

// Find our pawns on the first two ranks, and those which are blocked
Bitboard b = pos.pieces(Us, PAWN) & (shift<Down>(pos.pieces()) | LowRanks);

Expand Down Expand Up @@ -283,7 +280,7 @@ namespace {
: Pt == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN))
: pos.attacks_from<Pt>(s);

if (ei.pinnedPieces[Us] & s)
if (pos.pinned_pieces(Us) & s)
b &= LineBB[pos.square<KING>(Us)][s];

ei.attackedBy2[Us] |= ei.attackedBy[Us][ALL_PIECES] & b;
Expand Down Expand Up @@ -429,7 +426,7 @@ namespace {
kingDanger = std::min(807, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
+ 101 * ei.kingAdjacentZoneAttacksCount[Them]
+ 235 * popcount(undefended)
+ 134 * (popcount(b) + !!ei.pinnedPieces[Us])
+ 134 * (popcount(b) + !!pos.pinned_pieces(Us))
- 717 * !pos.count<QUEEN>(Them)
- 7 * mg_value(score) / 5 - 5;

Expand Down

0 comments on commit 58c181d

Please sign in to comment.