X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e8548ac1a451bdb4c4204ec5a4e0df315397c4ed;hp=5eb1b1f0f632c5fcc50681c85b79c4108bd33dfd;hb=HEAD;hpb=4455f354f7b3ea7446c6c26dcb2837ca2b7be06f diff --git a/src/main.cpp b/src/main.cpp index 5eb1b1f0..fbd6a7c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,6 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2004-2023 The Stockfish developers (see AUTHORS file) Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,23 +17,27 @@ */ #include +#include #include #include #include #include "bitboard.h" +#include "evaluate.h" +#include "misc.h" #include "position.h" #include "search.h" #include "thread.h" -#include "tt.h" +#include "tune.h" +#include "types.h" #include "uci.h" -#include "syzygy/tbprobe.h" #include #include #include #include "hashprobe.h" #include "hashprobe.grpc.pb.h" +#include "tt.h" using grpc::Server; using grpc::ServerBuilder; @@ -43,6 +45,7 @@ using grpc::ServerContext; using grpc::Status; using grpc::StatusCode; using namespace hashprobe; +using namespace Stockfish; Status HashProbeImpl::Probe(ServerContext* context, const HashProbeRequest* request, @@ -64,7 +67,7 @@ Status HashProbeImpl::Probe(ServerContext* context, HashProbeLine *line = response->add_line(); FillMove(&pos, em->move, line->mutable_move()); setup_states->push_back(StateInfo()); - pos.do_move(em->move, setup_states->back(), pos.gives_check(em->move)); + pos.do_move(em->move, setup_states->back()); ProbeMove(&pos, setup_states.get(), !invert, line); pos.undo_move(em->move); } @@ -81,13 +84,6 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) { if (type_of(move) == CASTLING) { to = make_square(to > from ? FILE_G : FILE_C, rank_of(from)); } - - decoded->set_from_sq(UCI::square(from)); - decoded->set_to_sq(UCI::square(to)); - - if (type_of(move) == PROMOTION) { - decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]); - } Piece moved_piece = pos->moved_piece(move); std::string pretty; @@ -98,7 +94,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) { pretty = "O-O-O"; } } else if (type_of(moved_piece) == PAWN) { - if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) { + if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) { // Capture. pretty = char('a' + file_of(from)); pretty += "x"; @@ -115,10 +111,10 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) { // Remove all illegal moves to disambiguate. Bitboard att_copy = attackers; while (att_copy) { - Square s = pop_lsb(&att_copy); + Square s = pop_lsb(att_copy); Move m = make_move(s, to); if (!pos->pseudo_legal(m) || !pos->legal(m)) { - attackers &= ~SquareBB[s]; + attackers &= ~square_bb(s); } } } @@ -135,7 +131,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) { } } - if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) { + if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) { pretty += "x"; } @@ -162,9 +158,10 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states TTEntry *entry = TT.probe(pos->key(), found); response->set_found(found); if (found) { - Value value = entry->value(); - Value eval = entry->eval(); - Bound bound = entry->bound(); + TTEntry entry_copy = *entry; + Value value = entry_copy.value(); + Value eval = entry_copy.eval(); + Bound bound = entry_copy.bound(); if (invert) { value = -value; @@ -176,9 +173,9 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states } } - response->set_depth(entry->depth()); + response->set_depth(entry_copy.depth()); FillValue(eval, response->mutable_eval()); - if (entry->depth() > DEPTH_NONE) { + if (entry_copy.depth() > DEPTH_NONE) { FillValue(value, response->mutable_value()); } response->set_bound(HashProbeLine::ValueBound(bound)); @@ -186,16 +183,20 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states // Follow the PV until we hit an illegal move. std::stack pv; std::set seen; - while (found && is_ok(entry->move()) && - pos->pseudo_legal(entry->move()) && - pos->legal(entry->move())) { - FillMove(pos, entry->move(), response->add_pv()); + while (is_ok(entry_copy.move()) && + pos->pseudo_legal(entry_copy.move()) && + pos->legal(entry_copy.move())) { + FillMove(pos, entry_copy.move(), response->add_pv()); if (seen.count(pos->key())) break; - pv.push(entry->move()); + pv.push(entry_copy.move()); seen.insert(pos->key()); setup_states->push_back(StateInfo()); - pos->do_move(entry->move(), setup_states->back(), pos->gives_check(entry->move())); + pos->do_move(entry_copy.move(), setup_states->back()); entry = TT.probe(pos->key(), found); + if (!found) { + break; + } + entry_copy = *entry; } // Unroll the PV back again, so the Position object remains unchanged. @@ -209,7 +210,7 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states void HashProbeImpl::FillValue(Value value, HashProbeScore* score) { if (abs(value) < VALUE_MATE - MAX_PLY) { score->set_score_type(HashProbeScore::SCORE_CP); - score->set_score_cp(value * 100 / PawnValueEg); + score->set_score_cp(value * 100 / UCI::NormalizeToPawnValue); } else { score->set_score_type(HashProbeScore::SCORE_MATE); score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2); @@ -228,26 +229,21 @@ void HashProbeThread::Shutdown() { server->Shutdown(); } -namespace PSQT { - void init(); -} - int main(int argc, char* argv[]) { - std::cout << engine_info() << std::endl; + std::cout << engine_info() << std::endl; - UCI::init(Options); - PSQT::init(); - Bitboards::init(); - Position::init(); - Bitbases::init(); - Search::init(); - Pawns::init(); - Threads.set(Options["Threads"]); - Search::clear(); // After threads are up + CommandLine::init(argc, argv); + UCI::init(Options); + Tune::init(); + Bitboards::init(); + Position::init(); + Threads.set(size_t(Options["Threads"])); + Search::clear(); // After threads are up + Eval::NNUE::init(); - UCI::loop(argc, argv); + UCI::loop(argc, argv); - Threads.set(0); - return 0; + Threads.set(0); + return 0; }