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

Unroll color loops in get_pawn_info

Browse source 
This allow to resolve a lot of addresses at compile time
instead of an indirect access at runtime.

Speed up on pgo compile is of 1.3%

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-10-09 12:30:43 +01:00
parent 564ed5b38c
commit ccdb634b77
2 changed files with 206 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
src/pawns.cpp
View file

@ -190,43 +190,58 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
pi->clear(); pi->clear();
pi->key = key; pi->key = key;
Value mgValue[2] = {Value(0), Value(0)};
Value egValue[2] = {Value(0), Value(0)};
// Calculate pawn attacks // Calculate pawn attacks
pi->pawnAttacks[WHITE] = ((pos.pieces(PAWN, WHITE) << 9) & ~FileABB) | ((pos.pieces(PAWN, WHITE) << 7) & ~FileHBB); Bitboard whitePawns = pos.pieces(PAWN, WHITE);
pi->pawnAttacks[BLACK] = ((pos.pieces(PAWN, BLACK) >> 7) & ~FileABB) | ((pos.pieces(PAWN, BLACK) >> 9) & ~FileHBB); Bitboard blackPawns = pos.pieces(PAWN, BLACK);
pi->pawnAttacks[WHITE] = ((whitePawns << 9) & ~FileABB) | ((whitePawns << 7) & ~FileHBB);
pi->pawnAttacks[BLACK] = ((blackPawns >> 7) & ~FileABB) | ((blackPawns >> 9) & ~FileHBB);
// Loop through the pawns for both colors // Evaluate pawns for both colors
for (Color us = WHITE; us <= BLACK; us++) Values whiteValues = evaluate_pawns<WHITE>(pos, whitePawns, blackPawns, pi);
{ Values blackValues = evaluate_pawns<BLACK>(pos, blackPawns, whitePawns, pi);
Color them = opposite_color(us);
Bitboard ourPawns = pos.pieces(PAWN, us); pi->mgValue = int16_t(whiteValues.first - blackValues.first);
Bitboard theirPawns = pos.pieces(PAWN, them); pi->egValue = int16_t(whiteValues.second - blackValues.second);
return pi;
}
/// PawnInfoTable::evaluate_pawns() evaluates each pawn of the given color
template<Color Us>
PawnInfoTable::Values PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
Bitboard theirPawns, PawnInfo* pi) {
Square s;
File f;
Rank r;
bool passed, isolated, doubled, chain, backward, candidate;
int bonus;
Value mgValue = Value(0);
Value egValue = Value(0);
Bitboard pawns = ourPawns; Bitboard pawns = ourPawns;
// Initialize pawn storm scores by giving bonuses for open files // Initialize pawn storm scores by giving bonuses for open files
for (File f = FILE_A; f <= FILE_H; f++) for (File f = FILE_A; f <= FILE_H; f++)
if (!(pawns & file_bb(f))) if (!(ourPawns & file_bb(f)))
{ {
pi->ksStormValue[us] += KStormOpenFileBonus[f]; pi->ksStormValue[Us] += KStormOpenFileBonus[f];
pi->qsStormValue[us] += QStormOpenFileBonus[f]; pi->qsStormValue[Us] += QStormOpenFileBonus[f];
pi->halfOpenFiles[us] |= (1 << f); pi->halfOpenFiles[Us] |= (1 << f);
} }
// Loop through all pawns of the current color and score each pawn // Loop through all pawns of the current color and score each pawn
while (pawns) while (pawns)
{ {
Square s = pop_1st_bit(&pawns); s = pop_1st_bit(&pawns);
File f = square_file(s); f = square_file(s);
Rank r = square_rank(s); r = square_rank(s);
assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN)); assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN));
// Passed, isolated or doubled pawn? // Passed, isolated or doubled pawn?
bool passed = Position::pawn_is_passed(theirPawns, us, s); passed = Position::pawn_is_passed(theirPawns, Us, s);
bool isolated = Position::pawn_is_isolated(ourPawns, s); isolated = Position::pawn_is_isolated(ourPawns, s);
bool doubled = Position::pawn_is_doubled(ourPawns, us, s); doubled = Position::pawn_is_doubled(ourPawns, Us, s);
// We calculate kingside and queenside pawn storm // We calculate kingside and queenside pawn storm
// scores for both colors. These are used when evaluating // scores for both colors. These are used when evaluating
@ -238,10 +253,10 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
// enemy pawn on an adjacent file gets an additional bonus. // enemy pawn on an adjacent file gets an additional bonus.
// Kingside pawn storms // Kingside pawn storms
int bonus = KStormTable[relative_square(us, s)]; bonus = KStormTable[relative_square(Us, s)];
if (f >= FILE_F) if (f >= FILE_F)
{ {
Bitboard b = outpost_mask(us, s) & theirPawns & (FileFBB | FileGBB | FileHBB); Bitboard b = outpost_mask(Us, s) & theirPawns & (FileFBB | FileGBB | FileHBB);
while (b) while (b)
{ {
Square s2 = pop_1st_bit(&b); Square s2 = pop_1st_bit(&b);
@ -261,13 +276,13 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
bonus += StormLeverBonus[f] - 2*square_distance(s, s2); bonus += StormLeverBonus[f] - 2*square_distance(s, s2);
} }
} }
pi->ksStormValue[us] += bonus; pi->ksStormValue[Us] += bonus;
// Queenside pawn storms // Queenside pawn storms
bonus = QStormTable[relative_square(us, s)]; bonus = QStormTable[relative_square(Us, s)];
if (f <= FILE_C) if (f <= FILE_C)
{ {
Bitboard b = outpost_mask(us, s) & theirPawns & (FileABB | FileBBB | FileCBB); Bitboard b = outpost_mask(Us, s) & theirPawns & (FileABB | FileBBB | FileCBB);
while (b) while (b)
{ {
Square s2 = pop_1st_bit(&b); Square s2 = pop_1st_bit(&b);
@ -287,15 +302,15 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
bonus += StormLeverBonus[f] - 4*square_distance(s, s2); bonus += StormLeverBonus[f] - 4*square_distance(s, s2);
} }
} }
pi->qsStormValue[us] += bonus; pi->qsStormValue[Us] += bonus;
// Member of a pawn chain (but not the backward one)? We could speed up // Member of a pawn chain (but not the backward one)? We could speed up
// the test a little by introducing an array of masks indexed by color // the test a little by introducing an array of masks indexed by color
// and square for doing the test, but because everything is hashed, // and square for doing the test, but because everything is hashed,
// it probably won't make any noticable difference. // it probably won't make any noticable difference.
bool chain = ourPawns chain = ourPawns
& neighboring_files_bb(f) & neighboring_files_bb(f)
& (rank_bb(r) | rank_bb(r - (us == WHITE ? 1 : -1))); & (rank_bb(r) | rank_bb(r - (Us == WHITE ? 1 : -1)));
// Test for backward pawn // Test for backward pawn
// //
@ -303,11 +318,9 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
// it cannot be backward. If can capture an enemy pawn or if // it cannot be backward. If can capture an enemy pawn or if
// there are friendly pawns behind on neighboring files it cannot // there are friendly pawns behind on neighboring files it cannot
// be backward either. // be backward either.
bool backward;
if ( (passed | isolated | chain) if ( (passed | isolated | chain)
|| (ourPawns & behind_bb(us, r) & neighboring_files_bb(f)) || (ourPawns & behind_bb(Us, r) & neighboring_files_bb(f))
|| (pos.attacks_from<PAWN>(s, us) & theirPawns)) || (pos.attacks_from<PAWN>(s, Us) & theirPawns))
backward = false; backward = false;
else else
{ {
@ -315,31 +328,29 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
// pawn on neighboring files. We now check whether the pawn is // pawn on neighboring files. We now check whether the pawn is
// backward by looking in the forward direction on the neighboring // backward by looking in the forward direction on the neighboring
// files, and seeing whether we meet a friendly or an enemy pawn first. // files, and seeing whether we meet a friendly or an enemy pawn first.
Bitboard b = pos.attacks_from<PAWN>(s, us); Bitboard b = pos.attacks_from<PAWN>(s, Us);
if (us == WHITE)
{ // Note that we are sure to find something because pawn is not passed
for ( ; !(b & (ourPawns | theirPawns)); b <<= 8); // nor isolated, so loop is potentially infinite, but it isn't.
backward = (b | (b << 8)) & theirPawns; while (!(b & (ourPawns | theirPawns)))
} Us == WHITE ? b <<= 8 : b >>= 8;
else
{ // The friendly pawn needs to be at least two ranks closer than the enemy
for ( ; !(b & (ourPawns | theirPawns)); b >>= 8); // pawn in order to help the potentially backward pawn advance.
backward = (b | (b >> 8)) & theirPawns; backward = (b | (Us == WHITE ? b << 8 : b >> 8)) & theirPawns;
}
} }
// Test for candidate passed pawn // Test for candidate passed pawn
bool candidate;
candidate = !passed candidate = !passed
&& !(theirPawns & file_bb(f)) && !(theirPawns & file_bb(f))
&& ( count_1s_max_15(neighboring_files_bb(f) & (behind_bb(us, r) | rank_bb(r)) & ourPawns) && ( count_1s_max_15(neighboring_files_bb(f) & (behind_bb(Us, r) | rank_bb(r)) & ourPawns)
- count_1s_max_15(neighboring_files_bb(f) & in_front_bb(us, r) & theirPawns) - count_1s_max_15(neighboring_files_bb(f) & in_front_bb(Us, r) & theirPawns)
>= 0); >= 0);
// In order to prevent doubled passed pawns from receiving a too big // In order to prevent doubled passed pawns from receiving a too big
// bonus, only the frontmost passed pawn on each file is considered as // bonus, only the frontmost passed pawn on each file is considered as
// a true passed pawn. // a true passed pawn.
if (passed && (ourPawns & squares_in_front_of(us, s))) if (passed && (ourPawns & squares_in_front_of(Us, s)))
passed = false; passed = false;
// Score this pawn // Score this pawn
@ -348,45 +359,42 @@ PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) {
if (isolated) if (isolated)
{ {
mgValue[us] -= IsolatedPawnMidgamePenalty[f]; mgValue -= IsolatedPawnMidgamePenalty[f];
egValue[us] -= IsolatedPawnEndgamePenalty[f]; egValue -= IsolatedPawnEndgamePenalty[f];
if (!(theirPawns & file_bb(f))) if (!(theirPawns & file_bb(f)))
{ {
mgValue[us] -= IsolatedPawnMidgamePenalty[f] / 2; mgValue -= IsolatedPawnMidgamePenalty[f] / 2;
egValue[us] -= IsolatedPawnEndgamePenalty[f] / 2; egValue -= IsolatedPawnEndgamePenalty[f] / 2;
} }
} }
if (doubled) if (doubled)
{ {
mgValue[us] -= DoubledPawnMidgamePenalty[f]; mgValue -= DoubledPawnMidgamePenalty[f];
egValue[us] -= DoubledPawnEndgamePenalty[f]; egValue -= DoubledPawnEndgamePenalty[f];
} }
if (backward) if (backward)
{ {
mgValue[us] -= BackwardPawnMidgamePenalty[f]; mgValue -= BackwardPawnMidgamePenalty[f];
egValue[us] -= BackwardPawnEndgamePenalty[f]; egValue -= BackwardPawnEndgamePenalty[f];
if (!(theirPawns & file_bb(f))) if (!(theirPawns & file_bb(f)))
{ {
mgValue[us] -= BackwardPawnMidgamePenalty[f] / 2; mgValue -= BackwardPawnMidgamePenalty[f] / 2;
egValue[us] -= BackwardPawnEndgamePenalty[f] / 2; egValue -= BackwardPawnEndgamePenalty[f] / 2;
} }
} }
if (chain) if (chain)
{ {
mgValue[us] += ChainMidgameBonus[f]; mgValue += ChainMidgameBonus[f];
egValue[us] += ChainEndgameBonus[f]; egValue += ChainEndgameBonus[f];
} }
if (candidate) if (candidate)
{ {
mgValue[us] += CandidateMidgameBonus[relative_rank(us, s)]; mgValue += CandidateMidgameBonus[relative_rank(Us, s)];
egValue[us] += CandidateEndgameBonus[relative_rank(us, s)]; egValue += CandidateEndgameBonus[relative_rank(Us, s)];
} }
} // while (pawns) } // while (pawns)
} // for(colors)
pi->mgValue = int16_t(mgValue[WHITE] - mgValue[BLACK]); return Values(mgValue, egValue);
pi->egValue = int16_t(egValue[WHITE] - egValue[BLACK]);
return pi;
} }

5
src/pawns.h
View file

@ -85,6 +85,11 @@ public:
PawnInfo* get_pawn_info(const Position& pos); PawnInfo* get_pawn_info(const Position& pos);
private: private:
typedef std::pair<Value, Value> Values;
template<Color Us>
Values evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
unsigned size; unsigned size;
PawnInfo* entries; PawnInfo* entries;
}; };