kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 11:39:15 +00:00
Code Issues Releases Wiki Activity

Further refine SMP code

Browse source 
Backported from C++11 branch:

https://github.com/official-stockfish/Stockfish/commit/7ff965eebfbc17d2b
https://github.com/official-stockfish/Stockfish/commit/e74c2df907d5336d3d2b

Fully verified it is equivalent to master (see log msg
of individual commits for details).

No functional change.
This commit is contained in:
Marco Costalba 2015-02-21 11:33:03 +01:00
parent 41ccc885ec
commit 5fd5453e59
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/search.cpp
View file

@ -1524,9 +1524,9 @@ void Thread::idle_loop() {
// Pointer 'this_sp' is not null only if we are called from split(), and not // Pointer 'this_sp' is not null only if we are called from split(), and not
// at the thread creation. This means we are the split point's master. // at the thread creation. This means we are the split point's master.
SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL; SplitPoint* this_sp = activeSplitPoint;
assert(!this_sp || (this_sp->masterThread == this && searching)); assert(!this_sp || (this_sp->master == this && searching));
while (!exit) while (!exit)
{ {
@ -1536,6 +1536,7 @@ void Thread::idle_loop() {
Threads.mutex.lock(); Threads.mutex.lock();
assert(activeSplitPoint); assert(activeSplitPoint);
SplitPoint* sp = activeSplitPoint; SplitPoint* sp = activeSplitPoint;
Threads.mutex.unlock(); Threads.mutex.unlock();
@ -1574,11 +1575,11 @@ void Thread::idle_loop() {
// Wake up the master thread so to allow it to return from the idle // Wake up the master thread so to allow it to return from the idle
// loop in case we are the last slave of the split point. // loop in case we are the last slave of the split point.
if ( this != sp->masterThread if (this != sp->master && sp->slavesMask.none())
&& sp->slavesMask.none())
{ {
assert(!sp->masterThread->searching); assert(!sp->master->searching);
sp->masterThread->notify_one();
sp->master->notify_one();
} }
// After releasing the lock we can't access any SplitPoint related data // After releasing the lock we can't access any SplitPoint related data
@ -1589,7 +1590,6 @@ void Thread::idle_loop() {
// Try to late join to another split point if none of its slaves has // Try to late join to another split point if none of its slaves has
// already finished. // already finished.
SplitPoint* bestSp = NULL; SplitPoint* bestSp = NULL;
Thread* bestThread = NULL;
int bestScore = INT_MAX; int bestScore = INT_MAX;
for (size_t i = 0; i < Threads.size(); ++i) for (size_t i = 0; i < Threads.size(); ++i)
@ -1617,7 +1617,6 @@ void Thread::idle_loop() {
if (score < bestScore) if (score < bestScore)
{ {
bestSp = sp; bestSp = sp;
bestThread = Threads[i];
bestScore = score; bestScore = score;
} }
} }
@ -1633,7 +1632,7 @@ void Thread::idle_loop() {
if ( sp->allSlavesSearching if ( sp->allSlavesSearching
&& sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(bestThread)) && available_to(sp->master))
{ {
sp->slavesMask.set(idx); sp->slavesMask.set(idx);
activeSplitPoint = sp; activeSplitPoint = sp;
@ -1645,7 +1644,7 @@ void Thread::idle_loop() {
} }
} }
// Grab the lock to avoid races with Thread::notify_one() // Avoid races with notify_one() fired from last slave of the split point
mutex.lock(); mutex.lock();
// If we are master and all slaves have finished then exit idle_loop // If we are master and all slaves have finished then exit idle_loop

2
src/thread.cpp
View file

@ -153,7 +153,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
// Pick and init the next available split point // Pick and init the next available split point
SplitPoint& sp = splitPoints[splitPointsSize]; SplitPoint& sp = splitPoints[splitPointsSize];
sp.masterThread = this; sp.master = this;
sp.parentSplitPoint = activeSplitPoint; sp.parentSplitPoint = activeSplitPoint;
sp.slavesMask = 0, sp.slavesMask.set(idx); sp.slavesMask = 0, sp.slavesMask.set(idx);
sp.depth = depth; sp.depth = depth;

2
src/thread.h
View file

@ -72,7 +72,7 @@ struct SplitPoint {
// Const data after split point has been setup // Const data after split point has been setup
const Position* pos; const Position* pos;
Search::Stack* ss; Search::Stack* ss;
Thread* masterThread; Thread* master;
Depth depth; Depth depth;
Value beta; Value beta;
int nodeType; int nodeType;