X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e80d066dfdad353082fea62dc017b3e9f15be7bf;hp=0d94cd43ff4686726e8f9c167e57dde52934723b;hb=62ae6157a36e926c087b0303973e404a05e6de09;hpb=dace61600a12f3f1ad1abcb2625f4c497e8f15ba diff --git a/src/main.cpp b/src/main.cpp index 0d94cd43..e80d066d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,6 +32,7 @@ #include #include #include +#include "hashprobe.h" #include "hashprobe.grpc.pb.h" using grpc::Server; @@ -41,71 +42,117 @@ using grpc::Status; using grpc::StatusCode; using namespace hashprobe; -class HashProbeImpl final : public HashProbe::Service { -public: - Status Probe(ServerContext* context, - const HashProbeRequest* request, - HashProbeResponse *response) { - Position pos(request->fen(), /*isChess960=*/false, Threads.main()); - if (!pos.pos_is_ok()) { - return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN"); - } +Status HashProbeImpl::Probe(ServerContext* context, + const HashProbeRequest* request, + HashProbeResponse *response) { + Position pos(request->fen(), /*isChess960=*/false, Threads.main()); + if (!pos.pos_is_ok()) { + return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN"); + } - bool invert = (pos.side_to_move() == BLACK); + bool invert = (pos.side_to_move() == BLACK); + Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack); - HashProbeMove *root_move = response->add_move(); - root_move->set_move(MOVE_NONE); - ProbeMove(pos.key(), invert, root_move); + ProbeMove(&pos, setup_states.get(), invert, response->mutable_root()); - MoveList moves(pos); - for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) { - HashProbeMove *move = response->add_move(); - move->set_move(em->move); - ProbeMove(pos.key_after(em->move), !invert, move); - } + MoveList moves(pos); + for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) { + HashProbeLine *line = response->add_line(); + FillMove(em->move, line->mutable_move()); + setup_states->push(StateInfo()); + pos.do_move(em->move, setup_states->top(), pos.gives_check(em->move, CheckInfo(pos))); + ProbeMove(&pos, setup_states.get(), !invert, line); + pos.undo_move(em->move); + } + + return Status::OK; +} - return Status::OK; +void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) { + if (!is_ok(move)) return; + + Square from = from_sq(move); + Square to = to_sq(move); + + 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)]); + } +} - void ProbeMove(const int64_t key, bool invert, HashProbeMove* response) { - bool found; - TTEntry *entry = TT.probe(key, found); - response->set_found(found); - if (found) { - Value value = entry->value(); - Value eval = entry->eval(); - Bound bound = entry->bound(); - - if (invert) { - value = -value; - eval = -eval; - if (bound == BOUND_UPPER) { - bound = BOUND_LOWER; - } else if (bound == BOUND_LOWER) { - bound = BOUND_UPPER; - } +void HashProbeImpl::ProbeMove(Position* pos, std::stack* setup_states, bool invert, HashProbeLine* response) { + bool found; + 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(); + + if (invert) { + value = -value; + eval = -eval; + if (bound == BOUND_UPPER) { + bound = BOUND_LOWER; + } else if (bound == BOUND_LOWER) { + bound = BOUND_UPPER; } + } + + response->set_depth(entry->depth()); + FillValue(eval, response->mutable_eval()); + if (entry->depth() > DEPTH_NONE) { + FillValue(value, response->mutable_value()); + } + response->set_bound(HashProbeLine::ValueBound(bound)); + + // Follow the PV until we hit an illegal move. + std::stack pv; + std::set seen; + while (found && is_ok(entry->move())) { + FillMove(entry->move(), response->add_pv()); + if (seen.count(pos->key())) break; + pv.push(entry->move()); + seen.insert(pos->key()); + setup_states->push(StateInfo()); + pos->do_move(entry->move(), setup_states->top(), pos->gives_check(entry->move(), CheckInfo(*pos))); + entry = TT.probe(pos->key(), found); + } - response->set_pv_move(entry->move()); - response->set_depth(entry->depth()); - response->set_eval(eval); - response->set_value(value); - response->set_bound(HashProbeMove::ValueBound(bound)); + // Unroll the PV back again, so the Position object remains unchanged. + while (!pv.empty()) { + pos->undo_move(pv.top()); + pv.pop(); } } -}; - -void rpc_thread() -{ - std::string server_address("0.0.0.0:50051"); - HashProbeImpl service; - - ServerBuilder builder; +} + +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); + } else { + score->set_score_type(HashProbeScore::SCORE_MATE); + score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2); + } +} + +HashProbeThread::HashProbeThread(const std::string &server_address) { builder.AddListeningPort(server_address, grpc::InsecureServerCredentials()); builder.RegisterService(&service); - std::unique_ptr server(builder.BuildAndStart()); + server = std::move(builder.BuildAndStart()); std::cout << "Server listening on " << server_address << std::endl; - server->Wait(); + std::thread([this]{ server->Wait(); }).detach(); +} + +void HashProbeThread::Shutdown() { + server->Shutdown(); } namespace PSQT { @@ -126,7 +173,7 @@ int main(int argc, char* argv[]) { Threads.set(Options["Threads"]); Search::clear(); // After threads are up - std::thread(&rpc_thread).detach(); + HashProbeThread thr("0.0.0.0:50051"); UCI::loop(argc, argv);