Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exact go nodes #5681

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exact go nodes #5681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 64 additions & 19 deletions src/search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,12 @@ Value Search::Worker::search(

// Dive into quiescence search when the depth reaches zero
if (depth <= 0)
return qsearch < PvNode ? PV : NonPV > (pos, ss, alpha, beta);
return qsearch<PvNode ? PV : NonPV>(pos, ss, alpha, beta);

Worker* thisThread = this;
// Check for the available remaining time
if (is_mainthread())
main_manager()->check_time(*thisThread);

// Limit the depth if extensions made it too large
depth = std::min(depth, MAX_PLY - 1);
Expand Down Expand Up @@ -572,17 +577,12 @@ Value Search::Worker::search(
ValueList<Move, 32> quietsSearched;

// Step 1. Initialize node
Worker* thisThread = this;
ss->inCheck = pos.checkers();
priorCapture = pos.captured_piece();
Color us = pos.side_to_move();
ss->moveCount = 0;
bestValue = -VALUE_INFINITE;
maxValue = VALUE_INFINITE;

// Check for the available remaining time
if (is_mainthread())
main_manager()->check_time(*thisThread);
ss->inCheck = pos.checkers();
priorCapture = pos.captured_piece();
Color us = pos.side_to_move();
ss->moveCount = 0;
bestValue = -VALUE_INFINITE;
maxValue = VALUE_INFINITE;

// Used to send selDepth info to GUI (selDepth counts from 1, ply from 0)
if (PvNode && thisThread->selDepth < ss->ply + 1)
Expand Down Expand Up @@ -782,6 +782,12 @@ Value Search::Worker::search(
if (eval < alpha - 469 - 307 * depth * depth)
{
value = qsearch<NonPV>(pos, ss, alpha - 1, alpha);

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

if (value < alpha && std::abs(value) < VALUE_TB_WIN_IN_MAX_PLY)
return value;
}
Expand Down Expand Up @@ -818,6 +824,11 @@ Value Search::Worker::search(

pos.undo_null_move();

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

// Do not return unproven mate or TB scores
if (nullValue >= beta && nullValue < VALUE_TB_WIN_IN_MAX_PLY)
{
Expand All @@ -832,6 +843,11 @@ Value Search::Worker::search(

Value v = search<NonPV>(pos, ss, beta - 1, beta, depth - R, false);

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

thisThread->nmpMinPly = 0;

if (v >= beta)
Expand Down Expand Up @@ -908,6 +924,11 @@ Value Search::Worker::search(

pos.undo_move(move);

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

if (value >= probCutBeta)
{
thisThread->captureHistory[movedPiece][move.to_sq()][type_of(captured)]
Expand Down Expand Up @@ -1087,6 +1108,11 @@ Value Search::Worker::search(
search<NonPV>(pos, ss, singularBeta - 1, singularBeta, singularDepth, cutNode);
ss->excludedMove = Move::none();

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

if (value < singularBeta)
{
int doubleMargin = 249 * PvNode - 194 * !ttCapture;
Expand Down Expand Up @@ -1467,6 +1493,10 @@ Value Search::Worker::qsearch(Position& pos, Stack* ss, Value alpha, Value beta)
assert(alpha >= -VALUE_INFINITE && alpha < beta && beta <= VALUE_INFINITE);
assert(PvNode || (alpha == beta - 1));

Worker* thisThread = this;
if (is_mainthread())
main_manager()->check_time(*thisThread);

// Check if we have an upcoming move that draws by repetition (~1 Elo)
if (alpha < VALUE_DRAW && pos.upcoming_repetition(ss->ply))
{
Expand All @@ -1493,17 +1523,16 @@ Value Search::Worker::qsearch(Position& pos, Stack* ss, Value alpha, Value beta)
ss->pv[0] = Move::none();
}

Worker* thisThread = this;
bestMove = Move::none();
ss->inCheck = pos.checkers();
moveCount = 0;
bestMove = Move::none();
ss->inCheck = pos.checkers();
moveCount = 0;

// Used to send selDepth info to GUI (selDepth counts from 1, ply from 0)
if (PvNode && thisThread->selDepth < ss->ply + 1)
thisThread->selDepth = ss->ply + 1;

// Step 2. Check for an immediate draw or maximum ply reached
if (pos.is_draw(ss->ply) || ss->ply >= MAX_PLY)
// Step 2. Check for aborted search, an immediate draw, or maximum ply reached
if (threads.stop.load(std::memory_order_relaxed) || pos.is_draw(ss->ply) || ss->ply >= MAX_PLY)
return (ss->ply >= MAX_PLY && !ss->inCheck)
? evaluate(networks[numaAccessToken], pos, refreshTable, thisThread->optimism[us])
: VALUE_DRAW;
Expand Down Expand Up @@ -1660,6 +1689,11 @@ Value Search::Worker::qsearch(Position& pos, Stack* ss, Value alpha, Value beta)
value = -qsearch<nodeType>(pos, ss + 1, -beta, -alpha);
pos.undo_move(move);

// If a stop occurred, the return value of the search cannot be trusted, and we
// must return immediately without updating any histories nor the transposition table.
if (threads.stop.load(std::memory_order_relaxed))
return VALUE_ZERO;

assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);

// Step 8. Check for a new best move
Expand Down Expand Up @@ -1907,7 +1941,18 @@ void SearchManager::check_time(Search::Worker& worker) {
return;

// When using nodes, ensure checking rate is not lower than 0.1% of nodes
callsCnt = worker.limits.nodes ? std::min(512, int(worker.limits.nodes / 1024)) : 512;
if (worker.limits.nodes)
{
callsCnt = std::min(512, int(worker.limits.nodes / 1024));

if (worker.threads.nodes_searched() + 1024 >= worker.limits.nodes)
{
callsCnt = 1;
}
}

else
callsCnt = 512;

static TimePoint lastInfoTime = now();

Expand Down
Loading