X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=372313b778e688a7333f5fc6815c85c5ff44e8dc;hb=738bf66a2d04d27ce8c5481fef52dc3adc3cafe1;hp=359222811593e621fdd16d9b2320961eeaf13182;hpb=3376c68f4bb83dc9fd874eb9d710dab09609ae54;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 35922281..372313b7 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -268,11 +268,14 @@ namespace { uint8_t BitCount8Bit[256]; // Function prototypes - template + template + Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID); + + template void evaluate_pieces(const Position& p, Color us, EvalInfo& ei); template<> - void evaluate_pieces(const Position& p, Color us, EvalInfo &ei); + void evaluate_pieces(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, @@ -295,11 +298,19 @@ namespace { //// 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(pos, ei, threadID) + : do_evaluate(pos, ei, threadID); +} -Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { +namespace { + +template +Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { assert(pos.is_ok()); assert(threadID >= 0 && threadID < THREAD_MAX); @@ -340,16 +351,16 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { // 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(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; // Evaluate pieces for (Color c = WHITE; c <= BLACK; c++) { - evaluate_pieces(pos, c, ei); - evaluate_pieces(pos, c, ei); - evaluate_pieces(pos, c, ei); - evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); // Sum up all attacked squares ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT] @@ -361,7 +372,7 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { // because we need complete attack information for all pieces when computing // the king safety evaluation. for (Color c = WHITE; c <= BLACK; c++) - evaluate_pieces(pos, c, ei); + evaluate_pieces(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 @@ -437,6 +448,7 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { 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 @@ -482,8 +494,8 @@ void init_eval(int threads) { for (Bitboard b = 0ULL; b < 256ULL; b++) { - assert(count_1s(b) == int(uint8_t(count_1s(b)))); - BitCount8Bit[b] = (uint8_t)count_1s(b); + assert(count_1s(b) == int(uint8_t(count_1s(b)))); + BitCount8Bit[b] = (uint8_t)count_1s(b); } } @@ -528,7 +540,7 @@ namespace { // evaluate_common() computes terms common to all pieces attack - template + template int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) { static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight }; @@ -548,15 +560,15 @@ namespace { 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(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(bb & ~p.pieces_of_color(us)) + : count_1s(bb & ~p.pieces_of_color(us))); ei.mgMobility += Sign[us] * MgBonus[Piece][mob]; ei.egMobility += Sign[us] * EgBonus[Piece][mob]; @@ -588,7 +600,7 @@ namespace { // evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given // color. - template + template void evaluate_pieces(const Position& pos, Color us, EvalInfo& ei) { Bitboard b; @@ -609,7 +621,7 @@ namespace { b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.rooks_and_queens(us)); // Attacks, mobility and outposts - mob = evaluate_common(pos, b, us, ei, s); + mob = evaluate_common(pos, b, us, ei, s); // Special patterns: trapped bishops on a7/h7/a2/h2 // and trapped bishops on a1/h1/a8/h8 in Chess960. @@ -692,7 +704,7 @@ namespace { // color. template<> - void evaluate_pieces(const Position& p, Color us, EvalInfo& ei) { + void evaluate_pieces(const Position& p, Color us, EvalInfo& ei) { int shelter = 0, sign = Sign[us]; Square s = p.king_square(us); @@ -745,7 +757,7 @@ namespace { // 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(undefended)) * 3 + InitKingDanger[relative_square(us, s)] - (shelter >> 5); // Analyse safe queen contact checks @@ -761,7 +773,7 @@ namespace { { // 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(b); attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1); // Is there a mate threat? @@ -801,12 +813,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if( b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(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(b2); } if (QueenCheckBonus > 0 || BishopCheckBonus > 0) { @@ -815,12 +827,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if (b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(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(b2); } if (KnightCheckBonus > 0) { @@ -829,7 +841,7 @@ namespace { // Knight checks b2 = b & ei.attacked_by(them, KNIGHT); if (b2) - attackUnits += KnightCheckBonus * count_1s_max_15(b2); + attackUnits += KnightCheckBonus * count_1s_max_15(b2); } // Analyse discovered checks (only for non-pawns right now, consider @@ -838,7 +850,7 @@ namespace { { 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(b) * (sente? 2 : 1); } // Has a mate threat been found? We don't do anything here if the @@ -921,29 +933,23 @@ namespace { && (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) @@ -973,7 +979,7 @@ namespace { if (d < 0) { int mtg = RANK_8 - relative_rank(us, s); - int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); + int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); mtg += blockerCount; d += blockerCount; if (d < 0) @@ -1134,8 +1140,8 @@ namespace { behindFriendlyPawns |= (behindFriendlyPawns << 16); } - int space = count_1s_max_15(safeSquares) - + count_1s_max_15(behindFriendlyPawns & safeSquares); + int space = count_1s_max_15(safeSquares) + + count_1s_max_15(behindFriendlyPawns & safeSquares); ei.mgValue += Sign[us] * apply_weight(Value(space * ei.mi->space_weight()), WeightSpace); }