#include <cassert>
#include <cstring>
+#include "bitcount.h"
#include "evaluate.h"
#include "material.h"
#include "pawns.h"
// Bonus for unstoppable passed pawns
const Value UnstoppablePawnValue = Value(0x500);
- // Rooks and queens on the 7th rank
+ // Rooks and queens on the 7th rank (modified by Joona Kiiski)
const Value MidgameRookOn7thBonus = Value(47);
const Value EndgameRookOn7thBonus = Value(98);
const Value MidgameQueenOn7thBonus = Value(27);
const Value EndgameQueenOn7thBonus = Value(54);
- // Rooks on open files
+ // Rooks on open files (modified by Joona Kiiski)
const Value RookOpenFileBonus = Value(43);
const Value RookHalfOpenFileBonus = Value(19);
uint8_t BitCount8Bit[256];
// Function prototypes
- template<PieceType Piece>
+ template<bool HasPopCnt>
+ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID);
+
+ template<PieceType Piece, bool HasPopCnt>
void evaluate_pieces(const Position& p, Color us, EvalInfo& ei);
- template<>
- void evaluate_pieces<KING>(const Position& p, Color us, EvalInfo &ei);
+ template<bool HasPopCnt>
+ void evaluate_king(const Position& p, Color us, EvalInfo &ei);
void evaluate_passed_pawns(const Position &pos, EvalInfo &ei);
void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us,
inline Value apply_weight(Value v, int w);
Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]);
- int count_1s_8bit(Bitboard b);
-
int compute_weight(int uciWeight, int internalWeight);
int weight_option(const std::string& opt, int weight);
void init_safety();
//// Functions
////
-/// evaluate() is the main evaluation function. It always computes two
+/// evaluate() is the main evaluation function. It always computes two
/// values, an endgame score and a middle game score, and interpolates
/// between them based on the remaining material.
+Value evaluate(const Position& pos, EvalInfo& ei, int threadID) {
+
+ return CpuHasPOPCNT ? do_evaluate<true>(pos, ei, threadID)
+ : do_evaluate<false>(pos, ei, threadID);
+}
-Value evaluate(const Position &pos, EvalInfo &ei, int threadID) {
+namespace {
+
+template<bool HasPopCnt>
+Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) {
assert(pos.is_ok());
assert(threadID >= 0 && threadID < THREAD_MAX);
// Initialize pawn attack bitboards for both sides
ei.attackedBy[WHITE][PAWN] = ((pos.pawns(WHITE) << 9) & ~FileABB) | ((pos.pawns(WHITE) << 7) & ~FileHBB);
ei.attackedBy[BLACK][PAWN] = ((pos.pawns(BLACK) >> 7) & ~FileABB) | ((pos.pawns(BLACK) >> 9) & ~FileHBB);
- ei.kingAttackersCount[WHITE] = count_1s_max_15(ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING])/2;
- ei.kingAttackersCount[BLACK] = count_1s_max_15(ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING])/2;
+ ei.kingAttackersCount[WHITE] = count_1s_max_15<HasPopCnt>(ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING])/2;
+ ei.kingAttackersCount[BLACK] = count_1s_max_15<HasPopCnt>(ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING])/2;
// Evaluate pieces
for (Color c = WHITE; c <= BLACK; c++)
{
- evaluate_pieces<KNIGHT>(pos, c, ei);
- evaluate_pieces<BISHOP>(pos, c, ei);
- evaluate_pieces<ROOK>(pos, c, ei);
- evaluate_pieces<QUEEN>(pos, c, ei);
+ evaluate_pieces<KNIGHT, HasPopCnt>(pos, c, ei);
+ evaluate_pieces<BISHOP, HasPopCnt>(pos, c, ei);
+ evaluate_pieces<ROOK, HasPopCnt>(pos, c, ei);
+ evaluate_pieces<QUEEN, HasPopCnt>(pos, c, ei);
// Sum up all attacked squares
ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT]
| ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING];
}
- // Kings. Kings are evaluated after all other pieces for both sides,
+ // Kings. Kings are evaluated after all other pieces for both sides,
// because we need complete attack information for all pieces when computing
// the king safety evaluation.
for (Color c = WHITE; c <= BLACK; c++)
- evaluate_pieces<KING>(pos, c, ei);
+ evaluate_king<HasPopCnt>(pos, c, ei);
// Evaluate passed pawns. We evaluate passed pawns for both sides at once,
// because we need to know which side promotes first in positions where
return (ei.mateThreat[stm] == MOVE_NONE ? v : 8 * QueenValueMidgame - v);
}
+} // namespace
/// quick_evaluate() does a very approximate evaluation of the current position.
/// It currently considers only material and piece square table scores. Perhaps
namespace {
- // evaluate_common() computes terms common to all pieces attack
+ // evaluate_mobility() computes mobility and attacks for every piece
- template<PieceType Piece>
- int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) {
+ template<PieceType Piece, bool HasPopCnt>
+ int evaluate_mobility(const Position& p, const Bitboard& b, Color us, Color them, EvalInfo& ei) {
static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight };
static const Value* MgBonus[] = { 0, 0, MidgameKnightMobilityBonus, MidgameBishopMobilityBonus, MidgameRookMobilityBonus, MidgameQueenMobilityBonus };
static const Value* EgBonus[] = { 0, 0, EndgameKnightMobilityBonus, EndgameBishopMobilityBonus, EndgameRookMobilityBonus, EndgameQueenMobilityBonus };
- static const Value* OutpostBonus[] = { 0, 0, KnightOutpostBonus, BishopOutpostBonus, 0, 0 };
-
- Color them = opposite_color(us);
// Update attack info
ei.attackedBy[us][Piece] |= b;
- // King attack
+ // King attacks
if (b & ei.kingZone[us])
{
ei.kingAttackersCount[us]++;
ei.kingAttackersWeight[us] += AttackWeight[Piece];
Bitboard bb = (b & ei.attackedBy[them][KING]);
if (bb)
- ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb);
+ ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15<HasPopCnt>(bb);
}
// Remove squares protected by enemy pawns
Bitboard bb = (b & ~ei.attackedBy[them][PAWN]);
// Mobility
- int mob = (Piece != QUEEN ? count_1s_max_15(bb & ~p.pieces_of_color(us))
- : count_1s(bb & ~p.pieces_of_color(us)));
+ int mob = (Piece != QUEEN ? count_1s_max_15<HasPopCnt>(bb & ~p.pieces_of_color(us))
+ : count_1s<HasPopCnt>(bb & ~p.pieces_of_color(us)));
ei.mgMobility += Sign[us] * MgBonus[Piece][mob];
ei.egMobility += Sign[us] * EgBonus[Piece][mob];
+ return mob;
+ }
- // Bishop and Knight outposts
- if ( (Piece == BISHOP || Piece == KNIGHT) // compile time condition
- && p.square_is_weak(s, them))
- {
- // Initial bonus based on square
- Value v, bonus;
- v = bonus = OutpostBonus[Piece][relative_square(us, s)];
- // Increase bonus if supported by pawn, especially if the opponent has
- // no minor piece which can exchange the outpost piece
- if (v && (p.pawn_attacks(them, s) & p.pawns(us)))
- {
- bonus += v / 2;
- if ( p.piece_count(them, KNIGHT) == 0
- && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB)
- bonus += v;
- }
- ei.mgValue += Sign[us] * bonus;
- ei.egValue += Sign[us] * bonus;
+ // evaluate_outposts() evaluates bishop and knight outposts squares
+
+ template<PieceType Piece>
+ void evaluate_outposts(const Position& p, Color us, Color them, EvalInfo& ei, Square s) {
+
+ // Initial bonus based on square
+ Value bonus = (Piece == BISHOP ? BishopOutpostBonus[relative_square(us, s)]
+ : KnightOutpostBonus[relative_square(us, s)]);
+
+ // Increase bonus if supported by pawn, especially if the opponent has
+ // no minor piece which can exchange the outpost piece
+ if (bonus && (p.pawn_attacks(them, s) & p.pawns(us)))
+ {
+ if ( p.knights(them) == EmptyBoardBB
+ && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB)
+ bonus += bonus + bonus / 2;
+ else
+ bonus += bonus / 2;
}
- return mob;
+ ei.mgValue += Sign[us] * bonus;
+ ei.egValue += Sign[us] * bonus;
}
// evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given
// color.
- template<PieceType Piece>
+ template<PieceType Piece, bool HasPopCnt>
void evaluate_pieces(const Position& pos, Color us, EvalInfo& ei) {
Bitboard b;
Square s, ksq;
- Color them;
int mob;
File f;
+ Color them = opposite_color(us);
for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++)
{
b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.queens(us));
else if (Piece == ROOK)
b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.rooks_and_queens(us));
+ else
+ assert(false);
- // Attacks, mobility and outposts
- mob = evaluate_common<Piece>(pos, b, us, ei, s);
+ // Attacks and mobility
+ mob = evaluate_mobility<Piece, HasPopCnt>(pos, b, us, them, ei);
+
+ // Bishop and knight outposts squares
+ if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, them))
+ evaluate_outposts<Piece>(pos, us, them, ei, s);
// Special patterns: trapped bishops on a7/h7/a2/h2
// and trapped bishops on a1/h1/a8/h8 in Chess960.
if (Piece == ROOK || Piece == QUEEN)
{
// Queen or rook on 7th rank
- them = opposite_color(us);
-
if ( relative_rank(us, s) == RANK_7
&& relative_rank(us, pos.king_square(them)) == RANK_8)
{
return b >> (num << 3);
}
- // evaluate_pieces<KING>() assigns bonuses and penalties to a king of a given
- // color.
+ // evaluate_king<>() assigns bonuses and penalties to a king of a given color.
- template<>
- void evaluate_pieces<KING>(const Position& p, Color us, EvalInfo& ei) {
+ template<bool HasPopCnt>
+ void evaluate_king(const Position& p, Color us, EvalInfo& ei) {
int shelter = 0, sign = Sign[us];
Square s = p.king_square(us);
Bitboard pawns = p.pawns(us) & this_and_neighboring_files_bb(s);
Rank r = square_rank(s);
for (int i = 1; i < 4; i++)
- shelter += count_1s_8bit(shiftRowsDown(pawns, r+i*sign)) * (128>>i);
+ shelter += BitCount8Bit[shiftRowsDown(pawns, r+i*sign) & 0xFF] * (128 >> i);
// Cache shelter value in pawn info
ei.pi->setKingShelter(us, s, shelter);
ei.mgValue += sign * Value(shelter);
}
- // King safety. This is quite complicated, and is almost certainly far
+ // King safety. This is quite complicated, and is almost certainly far
// from optimally tuned.
Color them = opposite_color(us);
// quality of the pawn shelter.
int attackUnits =
Min((ei.kingAttackersCount[them] * ei.kingAttackersWeight[them]) / 2, 25)
- + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3
+ + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15<HasPopCnt>(undefended)) * 3
+ InitKingDanger[relative_square(us, s)] - (shelter >> 5);
// Analyse safe queen contact checks
{
// The bitboard b now contains the squares available for safe queen
// contact checks.
- int count = count_1s_max_15(b);
+ int count = count_1s_max_15<HasPopCnt>(b);
attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1);
// Is there a mate threat?
// Queen checks
b2 = b & ei.attacked_by(them, QUEEN);
if( b2)
- attackUnits += QueenCheckBonus * count_1s_max_15(b2);
+ attackUnits += QueenCheckBonus * count_1s_max_15<HasPopCnt>(b2);
// Rook checks
b2 = b & ei.attacked_by(them, ROOK);
if (b2)
- attackUnits += RookCheckBonus * count_1s_max_15(b2);
+ attackUnits += RookCheckBonus * count_1s_max_15<HasPopCnt>(b2);
}
if (QueenCheckBonus > 0 || BishopCheckBonus > 0)
{
// Queen checks
b2 = b & ei.attacked_by(them, QUEEN);
if (b2)
- attackUnits += QueenCheckBonus * count_1s_max_15(b2);
+ attackUnits += QueenCheckBonus * count_1s_max_15<HasPopCnt>(b2);
// Bishop checks
b2 = b & ei.attacked_by(them, BISHOP);
if (b2)
- attackUnits += BishopCheckBonus * count_1s_max_15(b2);
+ attackUnits += BishopCheckBonus * count_1s_max_15<HasPopCnt>(b2);
}
if (KnightCheckBonus > 0)
{
// Knight checks
b2 = b & ei.attacked_by(them, KNIGHT);
if (b2)
- attackUnits += KnightCheckBonus * count_1s_max_15(b2);
+ attackUnits += KnightCheckBonus * count_1s_max_15<HasPopCnt>(b2);
}
// Analyse discovered checks (only for non-pawns right now, consider
{
b = p.discovered_check_candidates(them) & ~p.pawns();
if (b)
- attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1);
+ attackUnits += DiscoveredCheckBonus * count_1s_max_15<HasPopCnt>(b) * (sente? 2 : 1);
}
// Has a mate threat been found? We don't do anything here if the
&& (squares_behind(us, s) & pos.rooks_and_queens(them)))
b3 = b2;
- if ((b2 & pos.pieces_of_color(them)) == EmptyBoardBB)
- {
- // There are no enemy pieces in the pawn's path! Are any of the
- // squares in the pawn's path attacked by the enemy?
- if (b3 == EmptyBoardBB)
- // No enemy attacks, huge bonus!
- ebonus += Value(tr * (b2 == b4 ? 17 : 15));
- else
- // OK, there are enemy attacks. Are those squares which are
- // attacked by the enemy also attacked by us? If yes, big bonus
- // (but smaller than when there are no enemy attacks), if no,
- // somewhat smaller bonus.
- ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8));
- }
+ // Squares attacked or occupied by enemy pieces
+ b3 |= (b2 & pos.pieces_of_color(them));
+
+ // There are no enemy pawns in the pawn's path
+ assert((b2 & pos.pieces_of_color_and_type(them, PAWN)) == EmptyBoardBB);
+
+ // Are any of the squares in the pawn's path attacked or occupied by the enemy?
+ if (b3 == EmptyBoardBB)
+ // No enemy attacks or pieces, huge bonus!
+ ebonus += Value(tr * (b2 == b4 ? 17 : 15));
else
- {
- // There are some enemy pieces in the pawn's path. While this is
- // sad, we still assign a moderate bonus if all squares in the path
- // which are either occupied by or attacked by enemy pieces are
- // also attacked by us.
- if (((b3 | (b2 & pos.pieces_of_color(them))) & ~b4) == EmptyBoardBB)
- ebonus += Value(tr * 6);
- }
+ // OK, there are enemy attacks or pieces (but not pawns). Are those
+ // squares which are attacked by the enemy also attacked by us?
+ // If yes, big bonus (but smaller than when there are no enemy attacks),
+ // if no, somewhat smaller bonus.
+ ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8));
+
// At last, add a small bonus when there are no *friendly* pieces
// in the pawn's path.
if ((b2 & pos.pieces_of_color(us)) == EmptyBoardBB)
}
}
}
- // Rook pawns are a special case: They are sometimes worse, and
+ // Rook pawns are a special case: They are sometimes worse, and
// sometimes better than other passed pawns. It is difficult to find
// good rules for determining whether they are good or bad. For now,
// we try the following: Increase the value for rook pawns if the
// value if the other side has a rook or queen.
if (square_file(s) == FILE_A || square_file(s) == FILE_H)
{
- if( pos.non_pawn_material(them) <= KnightValueMidgame
- && pos.piece_count(them, KNIGHT) <= 1)
+ if ( pos.non_pawn_material(them) <= KnightValueMidgame
+ && pos.piece_count(them, KNIGHT) <= 1)
ebonus += ebonus / 4;
- else if(pos.rooks_and_queens(them))
+ else if (pos.rooks_and_queens(them))
ebonus -= ebonus / 4;
}
// Does either side have an unstoppable passed pawn?
if (hasUnstoppable[WHITE] && !hasUnstoppable[BLACK])
- ei.egValue += UnstoppablePawnValue - Value(0x40 * movesToGo[WHITE]);
+ ei.egValue += UnstoppablePawnValue - Value(0x40 * movesToGo[WHITE]);
else if (hasUnstoppable[BLACK] && !hasUnstoppable[WHITE])
- ei.egValue -= UnstoppablePawnValue - Value(0x40 * movesToGo[BLACK]);
+ ei.egValue -= UnstoppablePawnValue - Value(0x40 * movesToGo[BLACK]);
else if (hasUnstoppable[BLACK] && hasUnstoppable[WHITE])
{
// Both sides have unstoppable pawns! Try to find out who queens
}
- // count_1s_8bit() counts the number of nonzero bits in the 8 least
- // significant bits of a Bitboard. This function is used by the king
- // shield evaluation.
-
- int count_1s_8bit(Bitboard b) {
- return int(BitCount8Bit[b & 0xFF]);
- }
-
-
// compute_weight() computes the value of an evaluation weight, by combining
// an UCI-configurable weight with an internal weight.
projects / stockfish / blobdiff