bool thread_is_available(int slave, int master) const;
bool thread_should_stop(int threadID) const;
void wake_sleeping_thread(int threadID);
- void put_threads_to_sleep();
void idle_loop(int threadID, SplitPoint* sp);
template <bool Fake>
int ActiveThreads;
volatile bool AllThreadsShouldExit;
Thread threads[MAX_THREADS];
- Lock MPLock, WaitLock;
+ Lock MPLock;
WaitCondition WaitCond[MAX_THREADS];
};
init_eval(ThreadsMgr.active_threads());
}
- // Wake up needed threads
- for (int i = 1; i < newActiveThreads; i++)
- ThreadsMgr.wake_sleeping_thread(i);
-
// Set thinking time
int myTime = time[pos.side_to_move()];
int myIncrement = increment[pos.side_to_move()];
if (UseLogFile)
LogFile.close();
- ThreadsMgr.put_threads_to_sleep();
-
return !Quit;
}
int64_t nodes;
Move move;
Depth depth, ext, newDepth;
- Value value, alpha, beta;
+ Value value, evalMargin, alpha, beta;
bool isCheck, moveIsCheck, captureOrPromotion, dangerous;
int researchCountFH, researchCountFL;
// Step 5. Evaluate the position statically
// At root we do this only to get reference value for child nodes
- ss->evalMargin = VALUE_NONE;
- ss->eval = isCheck ? VALUE_NONE : evaluate(pos, ss->evalMargin);
+ ss->eval = isCheck ? VALUE_NONE : evaluate(pos, evalMargin);
// Step 6. Razoring (omitted at root)
// Step 7. Static null move pruning (omitted at root)
Key posKey;
Move ttMove, move, excludedMove, threatMove;
Depth ext, newDepth;
- Value bestValue, value, oldAlpha;
+ Value bestValue, value, evalMargin, oldAlpha;
Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific
bool isCheck, singleEvasion, singularExtensionNode, moveIsCheck, captureOrPromotion, dangerous;
bool mateThreat = false;
{
sp = ss->sp;
tte = NULL;
+ evalMargin = VALUE_ZERO;
ttMove = excludedMove = MOVE_NONE;
threatMove = sp->threatMove;
mateThreat = sp->mateThreat;
// Step 5. Evaluate the position statically and
// update gain statistics of parent move.
if (isCheck)
- ss->eval = ss->evalMargin = VALUE_NONE;
+ ss->eval = evalMargin = VALUE_NONE;
else if (tte)
{
assert(tte->static_value() != VALUE_NONE);
ss->eval = tte->static_value();
- ss->evalMargin = tte->static_value_margin();
+ evalMargin = tte->static_value_margin();
refinedValue = refine_eval(tte, ss->eval, ply);
}
else
{
- refinedValue = ss->eval = evaluate(pos, ss->evalMargin);
- TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, ss->evalMargin);
+ refinedValue = ss->eval = evaluate(pos, evalMargin);
+ TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, evalMargin);
}
// Save gain for the parent non-capture move
CheckInfo ci(pos);
ss->bestMove = MOVE_NONE;
singleEvasion = !SpNode && isCheck && mp.number_of_evasions() == 1;
- futilityBase = ss->eval + ss->evalMargin;
+ futilityBase = ss->eval + evalMargin;
singularExtensionNode = !SpNode
&& depth >= SingularExtensionDepth[PvNode]
&& tte
newDepth = depth - ONE_PLY + ext;
// Update current move (this must be done after singular extension search)
- movesSearched[moveCount++] = ss->currentMove = move;
+ movesSearched[moveCount] = ss->currentMove = move;
+
+ if (!SpNode)
+ moveCount++;
// Step 12. Futility pruning (is omitted in PV nodes)
if ( !PvNode
if (value > bestValue && !(SpNode && ThreadsMgr.thread_should_stop(threadID)))
{
bestValue = value;
+
+ if (SpNode)
+ sp->bestValue = value;
+
if (value > alpha)
{
if (SpNode && (!PvNode || value >= beta))
sp->stopRequest = true;
if (PvNode && value < beta) // We want always alpha < beta
+ {
alpha = value;
+ if (SpNode)
+ sp->alpha = value;
+ }
- if (value == value_mate_in(ply + 1))
+ if (!SpNode && value == value_mate_in(ply + 1))
ss->mateKiller = move;
ss->bestMove = move;
- }
- if (SpNode)
- {
- sp->bestValue = bestValue;
- sp->alpha = alpha;
- sp->parentSstack->bestMove = ss->bestMove;
+
+ if (SpNode)
+ sp->parentSstack->bestMove = move;
}
}
ValueType vt = (bestValue <= oldAlpha ? VALUE_TYPE_UPPER : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT);
move = (bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove);
- TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, ss->evalMargin);
+ TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, evalMargin);
// Update killers and history only for non capture moves that fails high
if ( bestValue >= beta
// If we are not thinking, wait for a condition to be signaled
// instead of wasting CPU time polling for work.
while ( threadID >= ActiveThreads
- || threads[threadID].state == THREAD_INITIALIZING)
+ || threads[threadID].state == THREAD_INITIALIZING
+ || (!sp && threads[threadID].state == THREAD_AVAILABLE))
{
assert(!sp);
assert(threadID != 0);
if (AllThreadsShouldExit)
break;
- threads[threadID].state = THREAD_AVAILABLE;
+ lock_grab(&MPLock);
-#if !defined(_MSC_VER)
- lock_grab(&WaitLock);
- if (threadID >= ActiveThreads)
- pthread_cond_wait(&WaitCond[threadID], &WaitLock);
- lock_release(&WaitLock);
-#else
- WaitForSingleObject(WaitCond[threadID], INFINITE);
-#endif
+ // Retest condition under lock protection
+ if (!( threadID >= ActiveThreads
+ || threads[threadID].state == THREAD_INITIALIZING
+ || (!sp && threads[threadID].state == THREAD_AVAILABLE)))
+ {
+ lock_release(&MPLock);
+ continue;
+ }
+
+ // Put thread to sleep
+ threads[threadID].state = THREAD_AVAILABLE;
+ cond_wait(&WaitCond[threadID], &MPLock);
+ lock_release(&MPLock);
}
// If this thread has been assigned work, launch a search
if (tsp->pvNode)
search<PV, true>(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply);
- else
+ else {
search<NonPV, true>(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply);
-
+ }
assert(threads[threadID].state == THREAD_SEARCHING);
threads[threadID].state = THREAD_AVAILABLE;
// Initialize global locks
lock_init(&MPLock);
- lock_init(&WaitLock);
for (i = 0; i < MAX_THREADS; i++)
-#if !defined(_MSC_VER)
- pthread_cond_init(&WaitCond[i], NULL);
-#else
- WaitCond[i] = CreateEvent(0, FALSE, FALSE, 0);
-#endif
+ cond_init(&WaitCond[i]);
// Initialize splitPoints[] locks
for (i = 0; i < MAX_THREADS; i++)
for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
lock_destroy(&(threads[i].splitPoints[j].lock));
- lock_destroy(&WaitLock);
lock_destroy(&MPLock);
// Now we can safely destroy the wait conditions
// split point objects), the function immediately returns. If splitting is
// possible, a SplitPoint object is initialized with all the data that must be
// copied to the helper threads 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(). When all threads have returned from sp_search() then
- // split() returns.
+ // been assigned work. This will cause them to instantly leave their idle loops and
+ // call search().When all threads have returned from search() then split() returns.
template <bool Fake>
void ThreadsManager::split(const Position& p, SearchStack* ss, int ply, Value* alpha,
assert(i == master || threads[i].state == THREAD_BOOKED);
threads[i].state = THREAD_WORKISWAITING; // This makes the slave to exit from idle_loop()
+ if (i != master)
+ wake_sleeping_thread(i);
}
// Everything is set up. The master thread enters the idle loop, from
void ThreadsManager::wake_sleeping_thread(int threadID) {
- assert(threadID > 0);
- assert(threads[threadID].state == THREAD_AVAILABLE);
-
-#if !defined(_MSC_VER)
- pthread_mutex_lock(&WaitLock);
- pthread_cond_signal(&WaitCond[threadID]);
- pthread_mutex_unlock(&WaitLock);
-#else
- SetEvent(WaitCond[threadID]);
-#endif
+ lock_grab(&MPLock);
+ cond_signal(&WaitCond[threadID]);
+ lock_release(&MPLock);
}
- // put_threads_to_sleep() makes all the threads go to sleep just before
- // to leave think(), at the end of the search. Threads should have already
- // finished the job and should be idle.
-
- void ThreadsManager::put_threads_to_sleep() {
-
- // This makes the threads to go to sleep
- ActiveThreads = 1;
- }
-
/// The RootMoveList class
// RootMoveList c'tor
// Initialize search stack
init_ss_array(ss, PLY_MAX_PLUS_2);
- ss[0].eval = ss[0].evalMargin = VALUE_NONE;
+ ss[0].eval = VALUE_NONE;
count = 0;
// Generate all legal moves
projects / stockfish / blobdiff