beta = *betaPtr;
isCheck = pos.is_check();
- // Step 1. Initialize node and poll (omitted at root, but I can see no good reason for this, FIXME)
- // Step 2. Check for aborted search (omitted at root, because we do not initialize root node)
+ // Step 1. Initialize node and poll (omitted at root, init_ss_array() has already initialized root node)
+ // Step 2. Check for aborted search (omitted at root)
// Step 3. Mate distance pruning (omitted at root)
// Step 4. Transposition table lookup (omitted at root)
// At root we do this only to get reference value for child nodes
if (!isCheck)
ss[0].eval = evaluate(pos, ei, 0);
- else
- ss[0].eval = VALUE_NONE; // HACK because we do not initialize root node
// Step 6. Razoring (omitted at root)
// Step 7. Static null move pruning (omitted at root)
alpha = value;
update_pv(ss, ply);
+
if (value == value_mate_in(ply + 1))
ss[ply].mateKiller = move;
}
lock_grab(&(sp->lock));
while ( sp->bestValue < sp->beta
- && !TM.thread_should_stop(threadID)
- && (move = sp->mp->get_next_move()) != MOVE_NONE)
+ && (move = sp->mp->get_next_move()) != MOVE_NONE
+ && !TM.thread_should_stop(threadID))
{
moveCount = ++sp->moves;
lock_release(&(sp->lock));
{
Value localAlpha = sp->alpha;
value = -search<NonPV>(pos, ss, -(localAlpha+1), -localAlpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
- doFullDepthSearch = (value > localAlpha && !TM.thread_should_stop(threadID));
+ doFullDepthSearch = (value > localAlpha);
}
}
Value localAlpha = sp->alpha;
value = -search<NonPV>(pos, ss, -(localAlpha+1), -localAlpha, newDepth, sp->ply+1, true, threadID);
- if (PvNode && value > localAlpha && value < sp->beta && !TM.thread_should_stop(threadID))
+ if (PvNode && value > localAlpha && value < sp->beta)
value = -search<PV>(pos, ss, -sp->beta, -sp->alpha, newDepth, sp->ply+1, false, threadID);
}
sp->alpha = value;
sp_update_pv(sp->parentSstack, ss, sp->ply);
-
- if (PvNode && value == value_mate_in(sp->ply + 1))
- ss[sp->ply].mateKiller = move;
}
}
}
/* Here we have the lock still grabbed */
sp->slaves[threadID] = 0;
- sp->cpus--;
lock_release(&(sp->lock));
}
threads[threadID].state = THREAD_AVAILABLE;
}
- // If this thread is the master of a split point and all threads have
+ // If this thread is the master of a split point and all slaves have
// finished their work at this split point, return from the idle loop.
- if (sp && sp->cpus == 0)
+ int i = 0;
+ for ( ; sp && i < ActiveThreads && !sp->slaves[i]; i++) {}
+
+ if (i == ActiveThreads)
{
- // Because sp->cpus is decremented under lock protection,
- // be sure sp->lock has been released before to proceed.
+ // Because sp->slaves[] is reset under lock protection,
+ // be sure sp->lock has been released before to return.
lock_grab(&(sp->lock));
lock_release(&(sp->lock));
// data that must be copied to the helper threads (the current position and
// search stack, alpha, beta, the search depth, etc.), and we tell our
// helper threads that they have been assigned work. This will cause them
- // to instantly leave their idle loops and call sp_search_pv(). When all
- // threads have returned from sp_search_pv (or, equivalently, when
- // splitPoint->cpus becomes 0), split() returns true.
+ // to instantly leave their idle loops and call sp_search(). When all
+ // threads have returned from sp_search() then split() returns true.
template <bool Fake>
bool ThreadsManager::split(const Position& p, SearchStack* sstck, int ply, Value* alpha,
splitPoint->master = master;
splitPoint->mp = mp;
splitPoint->moves = *moves;
- splitPoint->cpus = 1;
splitPoint->pos = &p;
splitPoint->parentSstack = sstck;
for (int i = 0; i < ActiveThreads; i++)
// If we are here it means we are not available
assert(threads[master].state != THREAD_AVAILABLE);
+ int workersCnt = 1; // At least the master is included
+
// Allocate available threads setting state to THREAD_BOOKED
- for (int i = 0; !Fake && i < ActiveThreads && splitPoint->cpus < MaxThreadsPerSplitPoint; i++)
+ for (int i = 0; !Fake && i < ActiveThreads && workersCnt < MaxThreadsPerSplitPoint; i++)
if (thread_is_available(i, master))
{
threads[i].state = THREAD_BOOKED;
threads[i].splitPoint = splitPoint;
splitPoint->slaves[i] = 1;
- splitPoint->cpus++;
+ workersCnt++;
}
- assert(Fake || splitPoint->cpus > 1);
+ assert(Fake || workersCnt > 1);
// We can release the lock because slave threads are already booked and master is not available
lock_release(&MPLock);
// which it will instantly launch a search, because its state is
// THREAD_WORKISWAITING. We send the split point as a second parameter to the
// idle loop, which means that the main thread will return from the idle
- // loop when all threads have finished their work at this split point
- // (i.e. when splitPoint->cpus == 0).
+ // loop when all threads have finished their work at this split point.
idle_loop(master, splitPoint);
// We have returned from the idle loop, which means that all threads are
projects / stockfish / blobdiff