kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Use TT also in Root nodes

Browse source 
And other small stuff ti be tested in SMP

No functional change in single thread.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-06-03 12:34:51 +01:00
parent 5ff6289afd
commit 91b919fd1d
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/search.cpp
View file

@ -685,7 +685,7 @@ namespace {
Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific
bool isPvMove, inCheck, singularExtensionNode, givesCheck, captureOrPromotion, dangerous; bool isPvMove, inCheck, singularExtensionNode, givesCheck, captureOrPromotion, dangerous;
int moveCount = 0, playedMoveCount = 0; int moveCount = 0, playedMoveCount = 0;
int threadID = pos.thread(); Thread& thread = Threads[pos.thread()];
SplitPoint* sp = NULL; SplitPoint* sp = NULL;
refinedValue = bestValue = value = -VALUE_INFINITE; refinedValue = bestValue = value = -VALUE_INFINITE;
@ -694,8 +694,8 @@ namespace {
ss->ply = (ss-1)->ply + 1; ss->ply = (ss-1)->ply + 1;
// Used to send selDepth info to GUI // Used to send selDepth info to GUI
if (PvNode && Threads[threadID].maxPly < ss->ply) if (PvNode && thread.maxPly < ss->ply)
Threads[threadID].maxPly = ss->ply; thread.maxPly = ss->ply;
if (SpNode) if (SpNode)
{ {
@ -713,7 +713,7 @@ namespace {
(ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO; (ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
(ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE; (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
if (threadID == 0 && ++NodesSincePoll > NodesBetweenPolls) if (pos.thread() == 0 && ++NodesSincePoll > NodesBetweenPolls)
{ {
NodesSincePoll = 0; NodesSincePoll = 0;
poll(pos); poll(pos);
@ -721,7 +721,6 @@ namespace {
// Step 2. Check for aborted search and immediate draw // Step 2. Check for aborted search and immediate draw
if (( StopRequest if (( StopRequest
|| Threads[threadID].cutoff_occurred()
|| pos.is_draw() || pos.is_draw()
|| ss->ply > PLY_MAX) && !RootNode) || ss->ply > PLY_MAX) && !RootNode)
return VALUE_DRAW; return VALUE_DRAW;
@ -744,9 +743,7 @@ namespace {
// At PV nodes we check for exact scores, while at non-PV nodes we check for // At PV nodes we check for exact scores, while at non-PV nodes we check for
// a fail high/low. Biggest advantage at probing at PV nodes is to have a // a fail high/low. Biggest advantage at probing at PV nodes is to have a
// smooth experience in analysis mode. // smooth experience in analysis mode.
if ( !RootNode if (tte && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT
&& tte
&& (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT
: ok_to_use_TT(tte, depth, beta, ss->ply))) : ok_to_use_TT(tte, depth, beta, ss->ply)))
{ {
TT.refresh(tte); TT.refresh(tte);
@ -933,7 +930,7 @@ split_point_start: // At split points actual search starts from here
// Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs // Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs
while ( bestValue < beta while ( bestValue < beta
&& (move = mp.get_next_move()) != MOVE_NONE && (move = mp.get_next_move()) != MOVE_NONE
&& !Threads[threadID].cutoff_occurred()) && !thread.cutoff_occurred())
{ {
assert(move_is_ok(move)); assert(move_is_ok(move));
@ -1142,7 +1139,7 @@ split_point_start: // At split points actual search starts from here
alpha = sp->alpha; alpha = sp->alpha;
} }
if (value > bestValue && !(SpNode && Threads[threadID].cutoff_occurred())) if (value > bestValue && !(SpNode && thread.cutoff_occurred()))
{ {
bestValue = value; bestValue = value;
@ -1214,9 +1211,9 @@ split_point_start: // At split points actual search starts from here
&& !SpNode && !SpNode
&& depth >= Threads.min_split_depth() && depth >= Threads.min_split_depth()
&& bestValue < beta && bestValue < beta
&& Threads.available_slave_exists(threadID) && Threads.available_slave_exists(pos.thread())
&& !StopRequest && !StopRequest
&& !Threads[threadID].cutoff_occurred()) && !thread.cutoff_occurred())
Threads.split<FakeSplit>(pos, ss, &alpha, beta, &bestValue, depth, Threads.split<FakeSplit>(pos, ss, &alpha, beta, &bestValue, depth,
threatMove, moveCount, &mp, PvNode); threatMove, moveCount, &mp, PvNode);
} }
@ -1231,7 +1228,7 @@ split_point_start: // At split points actual search starts from here
// Step 21. Update tables // Step 21. Update tables
// If the search is not aborted, update the transposition table, // If the search is not aborted, update the transposition table,
// history counters, and killer moves. // history counters, and killer moves.
if (!SpNode && !StopRequest && !Threads[threadID].cutoff_occurred()) if (!SpNode && !StopRequest && !thread.cutoff_occurred())
{ {
move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove; move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER
@ -1256,7 +1253,7 @@ split_point_start: // At split points actual search starts from here
if (SpNode) if (SpNode)
{ {
// Here we have the lock still grabbed // Here we have the lock still grabbed
sp->is_slave[threadID] = false; sp->is_slave[pos.thread()] = false;
sp->nodes += pos.nodes_searched(); sp->nodes += pos.nodes_searched();
lock_release(&(sp->lock)); lock_release(&(sp->lock));
} }