kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Micro optimize mobility calculation

Browse source 
Take out of mobility loop a constant expression.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-10-23 11:24:53 +01:00
parent b50921fd5c
commit 73da3a431c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/evaluate.cpp
View file

@ -531,7 +531,7 @@ namespace {
// evaluate_mobility() computes mobility and attacks for every piece // evaluate_mobility() computes mobility and attacks for every piece
template<PieceType Piece, Color Us, bool HasPopCnt> template<PieceType Piece, Color Us, bool HasPopCnt>
int evaluate_mobility(const Position& pos, Bitboard b, EvalInfo& ei) { int evaluate_mobility(const Position& pos, Bitboard b, Bitboard mob_area, EvalInfo& ei) {
const Color Them = (Us == WHITE ? BLACK : WHITE); const Color Them = (Us == WHITE ? BLACK : WHITE);
static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight }; static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight };
@ -552,13 +552,11 @@ namespace {
ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15<HasPopCnt>(bb); ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15<HasPopCnt>(bb);
} }
// Remove squares protected by enemy pawns or occupied by our pieces
b &= ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us));
// The squares occupied by enemy pieces (not defended by pawns) will be // The squares occupied by enemy pieces (not defended by pawns) will be
// counted two times instead of one. The shift (almost) guarantees that // counted two times instead of one. The shift (almost) guarantees that
// intersection of the shifted value with b is zero so that after or-ing // intersection of the shifted value with b is zero so that after or-ing
// the count of 1s bits is increased by the number of affected squares. // the count of 1s bits is increased by the number of affected squares.
b &= mob_area;
b |= Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) b |= Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1)
: ((b & pos.pieces_of_color(Them)) << 1); : ((b & pos.pieces_of_color(Them)) << 1);
@ -614,6 +612,9 @@ namespace {
const Color Them = (Us == WHITE ? BLACK : WHITE); const Color Them = (Us == WHITE ? BLACK : WHITE);
const Square* ptr = pos.piece_list_begin(Us, Piece); const Square* ptr = pos.piece_list_begin(Us, Piece);
// Do not include in mobility squares protected by enemy pawns or occupied by our pieces
const Bitboard mob_area = ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us));
while ((s = *ptr++) != SQ_NONE) while ((s = *ptr++) != SQ_NONE)
{ {
if (Piece == KNIGHT || Piece == QUEEN) if (Piece == KNIGHT || Piece == QUEEN)
@ -626,7 +627,7 @@ namespace {
assert(false); assert(false);
// Attacks and mobility // Attacks and mobility
mob = evaluate_mobility<Piece, Us, HasPopCnt>(pos, b, ei); mob = evaluate_mobility<Piece, Us, HasPopCnt>(pos, b, mob_area, ei);
// Bishop and knight outposts squares // Bishop and knight outposts squares
if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them)) if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them))