X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=7fbe9af5092a92f04e2c5f6a7053cfa46f30ba84;hp=7a4176b78af7834a92eb2a90d0b5d2f2b1e42637;hb=9f28d8a854d05c6c6edcd6f8911b352477f82c91;hpb=b8326edea3081e9e00bce7bb0929005f4be45cbf diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 7a4176b7..7fbe9af5 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -266,9 +266,6 @@ namespace { const int PawnTableSize = 16384; const int MaterialTableSize = 1024; - // Array which gives the number of nonzero bits in an 8-bit integer - uint8_t BitCount8Bit[256]; - // Function prototypes template Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID); @@ -326,8 +323,8 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Probe the material hash table ei.mi = MaterialTable[threadID]->get_material_info(pos); - ei.mgValue += ei.mi->mg_value(); - ei.egValue += ei.mi->eg_value(); + ei.mgValue += ei.mi->material_value(); + ei.egValue += ei.mi->material_value(); // If we have a specialized evaluation function for the current material // configuration, call it and return @@ -351,10 +348,15 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { ei.kingZone[BLACK] = ei.attackedBy[WHITE][KING] | (ei.attackedBy[WHITE][KING] << 8); // 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.attackedBy[WHITE][PAWN] = ((pos.pieces(PAWN, WHITE) << 9) & ~FileABB) | ((pos.pieces(PAWN, WHITE) << 7) & ~FileHBB); + ei.attackedBy[BLACK][PAWN] = ((pos.pieces(PAWN, BLACK) >> 7) & ~FileABB) | ((pos.pieces(PAWN, BLACK) >> 9) & ~FileHBB); + Bitboard b1 = ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING]; + Bitboard b2 = ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING]; + if (b1) + ei.kingAttackersCount[WHITE] = count_1s_max_15(b1)/2; + + if (b2) + ei.kingAttackersCount[BLACK] = count_1s_max_15(b2)/2; // Evaluate pieces for (Color c = WHITE; c <= BLACK; c++) @@ -493,12 +495,6 @@ void init_eval(int threads) { if (!MaterialTable[i]) MaterialTable[i] = new MaterialInfoTable(MaterialTableSize); } - - for (Bitboard b = 0ULL; b < 256ULL; b++) - { - assert(count_1s(b) == int(uint8_t(count_1s(b)))); - BitCount8Bit[b] = (uint8_t)count_1s(b); - } } @@ -594,10 +590,10 @@ namespace { // 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 (bonus && (p.pawn_attacks(them, s) & p.pieces(PAWN, us))) { - if ( p.knights(them) == EmptyBoardBB - && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) + if ( p.pieces(KNIGHT, them) == EmptyBoardBB + && (SquaresByColorBB[square_color(s)] & p.pieces(BISHOP, them)) == EmptyBoardBB) bonus += bonus + bonus / 2; else bonus += bonus / 2; @@ -626,9 +622,9 @@ namespace { if (Piece == KNIGHT || Piece == QUEEN) b = pos.piece_attacks(s); else if (Piece == BISHOP) - b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.queens(us)); + b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.pieces(QUEEN, us)); else if (Piece == ROOK) - b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.rooks_and_queens(us)); + b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.pieces(ROOK, QUEEN, us)); else assert(false); @@ -709,10 +705,6 @@ namespace { } } - inline Bitboard shiftRowsDown(const Bitboard& b, int num) { - - return b >> (num << 3); - } // evaluate_king<>() assigns bonuses and penalties to a king of a given color. @@ -725,19 +717,7 @@ namespace { // King shelter if (relative_rank(us, s) <= RANK_4) { - // Shelter cache lookup - shelter = ei.pi->kingShelter(us, s); - if (shelter == -1) - { - shelter = 0; - Bitboard pawns = p.pawns(us) & this_and_neighboring_files_bb(s); - Rank r = square_rank(s); - for (int i = 1; i < 4; i++) - shelter += BitCount8Bit[shiftRowsDown(pawns, r+i*sign) & 0xFF] * (128 >> i); - - // Cache shelter value in pawn info - ei.pi->setKingShelter(us, s, shelter); - } + shelter = ei.pi->get_king_shelter(p, us, s); ei.mgValue += sign * Value(shelter); } @@ -807,8 +787,8 @@ namespace { from = p.piece_list(them, QUEEN, i); if ( bit_is_set(p.piece_attacks(from), to) && !bit_is_set(p.pinned_pieces(them), from) - && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us)) - && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & p.bishops_and_queens(us))) + && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.pieces(ROOK, QUEEN, us)) + && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & p.pieces(BISHOP, QUEEN, us))) ei.mateThreat[them] = make_move(from, to); } @@ -861,7 +841,7 @@ namespace { // adding pawns later). if (DiscoveredCheckBonus) { - b = p.discovered_check_candidates(them) & ~p.pawns(); + b = p.discovered_check_candidates(them) & ~p.pieces(PAWN); if (b) attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1); } @@ -909,7 +889,7 @@ namespace { Color them = opposite_color(us); Square ourKingSq = pos.king_square(us); Square theirKingSq = pos.king_square(them); - Bitboard b = ei.pi->passed_pawns() & pos.pawns(us), b2, b3, b4; + Bitboard b = ei.pi->passed_pawns() & pos.pieces(PAWN, us), b2, b3, b4; while (b) { @@ -943,14 +923,14 @@ namespace { // If there is an enemy rook or queen attacking the pawn from behind, // add all X-ray attacks by the rook or queen. if ( bit_is_set(ei.attacked_by(them,ROOK) | ei.attacked_by(them,QUEEN),s) - && (squares_behind(us, s) & pos.rooks_and_queens(them))) + && (squares_behind(us, s) & pos.pieces(ROOK, QUEEN, them))) b3 = b2; // 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); + assert((b2 & pos.pieces(PAWN, them)) == EmptyBoardBB); // Are any of the squares in the pawn's path attacked or occupied by the enemy? if (b3 == EmptyBoardBB) @@ -971,7 +951,7 @@ namespace { } // If the pawn is supported by a friendly pawn, increase bonus - b2 = pos.pawns(us) & neighboring_files_bb(s); + b2 = pos.pieces(PAWN, us) & neighboring_files_bb(s); if (b2 & rank_bb(s)) ebonus += Value(r * 20); else if (pos.pawn_attacks(them, s) & b2) @@ -1013,7 +993,7 @@ namespace { 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.pieces(ROOK, QUEEN, them)) ebonus -= ebonus / 4; } @@ -1135,13 +1115,13 @@ namespace { // pawn, or if it is undefended and attacked by an enemy piece. Bitboard safeSquares = SpaceMask[us] - & ~pos.pawns(us) + & ~pos.pieces(PAWN, us) & ~ei.attacked_by(them, PAWN) & ~(~ei.attacked_by(us) & ei.attacked_by(them)); // Find all squares which are at most three squares behind some friendly // pawn. - Bitboard behindFriendlyPawns = pos.pawns(us); + Bitboard behindFriendlyPawns = pos.pieces(PAWN, us); if (us == WHITE) { behindFriendlyPawns |= (behindFriendlyPawns >> 8);