kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Retire redundant sp->slavesCount field

Browse source 
It should be used slavesMask.count() instead.

Verified 100% equivalent when sp->allSlavesSearching:

dbg_hit_on(sp->allSlavesSearching, sp->slavesCount != sp->slavesMask.count());

No functional change.
This commit is contained in:
Marco Costalba 2015-02-19 10:27:24 +01:00
parent b9d4e6f7fd
commit 8d47caa16e
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/search.cpp
View file

@ -1043,8 +1043,8 @@ moves_loop: // When in check and at SpNode search starts from here
&& depth >= Threads.minimumSplitDepth && depth >= Threads.minimumSplitDepth
&& ( !thisThread->activeSplitPoint && ( !thisThread->activeSplitPoint
|| !thisThread->activeSplitPoint->allSlavesSearching || !thisThread->activeSplitPoint->allSlavesSearching
|| ( int(Threads.size()) > MAX_SLAVES_PER_SPLITPOINT || ( Threads.size() > MAX_SLAVES_PER_SPLITPOINT
&& thisThread->activeSplitPoint->slavesCount == MAX_SLAVES_PER_SPLITPOINT)) && thisThread->activeSplitPoint->slavesMask.count() == MAX_SLAVES_PER_SPLITPOINT))
&& thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD) && thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
{ {
assert(bestValue > -VALUE_INFINITE && bestValue < beta); assert(bestValue > -VALUE_INFINITE && bestValue < beta);
@ -1599,7 +1599,7 @@ void Thread::idle_loop() {
if ( sp if ( sp
&& sp->allSlavesSearching && sp->allSlavesSearching
&& sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(Threads[i])) && available_to(Threads[i]))
{ {
assert(this != Threads[i]); assert(this != Threads[i]);
@ -1610,7 +1610,7 @@ void Thread::idle_loop() {
for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint) for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
level++; level++;
int score = level * 256 * 256 + sp->slavesCount * 256 - sp->depth * 1; int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
if (score < bestScore) if (score < bestScore)
{ {
@ -1630,11 +1630,10 @@ void Thread::idle_loop() {
sp->mutex.lock(); sp->mutex.lock();
if ( sp->allSlavesSearching if ( sp->allSlavesSearching
&& sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(bestThread)) && available_to(bestThread))
{ {
sp->slavesMask.set(idx); sp->slavesMask.set(idx);
sp->slavesCount++;
activeSplitPoint = sp; activeSplitPoint = sp;
searching = true; searching = true;
} }

4
src/thread.cpp
View file

@ -155,7 +155,6 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
sp.masterThread = this; sp.masterThread = this;
sp.parentSplitPoint = activeSplitPoint; sp.parentSplitPoint = activeSplitPoint;
sp.slavesMask = 0, sp.slavesMask.set(idx); sp.slavesMask = 0, sp.slavesMask.set(idx);
sp.slavesCount = 1;
sp.depth = depth; sp.depth = depth;
sp.bestValue = *bestValue; sp.bestValue = *bestValue;
sp.bestMove = *bestMove; sp.bestMove = *bestMove;
@ -183,11 +182,10 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
Thread* slave; Thread* slave;
while ( sp.slavesCount < MAX_SLAVES_PER_SPLITPOINT while ( sp.slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& (slave = Threads.available_slave(this)) != NULL) && (slave = Threads.available_slave(this)) != NULL)
{ {
sp.slavesMask.set(slave->idx); sp.slavesMask.set(slave->idx);
sp.slavesCount++;
slave->activeSplitPoint = &sp; slave->activeSplitPoint = &sp;
slave->searching = true; // Slave leaves idle_loop() slave->searching = true; // Slave leaves idle_loop()
slave->notify_one(); // Could be sleeping slave->notify_one(); // Could be sleeping

3
src/thread.h
View file

@ -33,7 +33,7 @@ struct Thread;
const int MAX_THREADS = 128; const int MAX_THREADS = 128;
const int MAX_SPLITPOINTS_PER_THREAD = 8; const int MAX_SPLITPOINTS_PER_THREAD = 8;
const int MAX_SLAVES_PER_SPLITPOINT = 4; const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
/// Mutex and ConditionVariable struct are wrappers of the low level locking /// Mutex and ConditionVariable struct are wrappers of the low level locking
/// machinery and are modeled after the corresponding C++11 classes. /// machinery and are modeled after the corresponding C++11 classes.
@ -85,7 +85,6 @@ struct SplitPoint {
// Shared variable data // Shared variable data
Mutex mutex; Mutex mutex;
std::bitset<MAX_THREADS> slavesMask; std::bitset<MAX_THREADS> slavesMask;
int slavesCount;
volatile bool allSlavesSearching; volatile bool allSlavesSearching;
volatile uint64_t nodes; volatile uint64_t nodes;
volatile Value alpha; volatile Value alpha;