Retire redundant sp->slavesCount field

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.

diff --git a/src/search.cpp b/src/search.cpp
index 76d0350c9c7284cf2e4ec400166174f63891c7f3..a04766533b953f27798b7665c4a1d99c76bc4f82 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1043,8 +1043,8 @@ moves_loop: // When in check and at SpNode search starts from here
           &&  depth >= Threads.minimumSplitDepth
           &&  (   !thisThread->activeSplitPoint
                || !thisThread->activeSplitPoint->allSlavesSearching
-               || (   int(Threads.size()) > MAX_SLAVES_PER_SPLITPOINT
-                   && thisThread->activeSplitPoint->slavesCount == MAX_SLAVES_PER_SPLITPOINT))
+               || (   Threads.size() > MAX_SLAVES_PER_SPLITPOINT
+                   && thisThread->activeSplitPoint->slavesMask.count() == MAX_SLAVES_PER_SPLITPOINT))
           &&  thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
       {
           assert(bestValue > -VALUE_INFINITE && bestValue < beta);
@@ -1599,7 +1599,7 @@ void Thread::idle_loop() {
 
               if (   sp
                   && sp->allSlavesSearching
-                  && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
+                  && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
                   && available_to(Threads[i]))
               {
                   assert(this != Threads[i]);
@@ -1610,7 +1610,7 @@ void Thread::idle_loop() {
                   for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
                       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)
                   {
@@ -1630,11 +1630,10 @@ void Thread::idle_loop() {
               sp->mutex.lock();
 
               if (   sp->allSlavesSearching
-                  && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
+                  && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
                   && available_to(bestThread))
               {
                   sp->slavesMask.set(idx);
-                  sp->slavesCount++;
                   activeSplitPoint = sp;
                   searching = true;
               }

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

diff --git a/src/thread.h b/src/thread.h
index 0265ee670b2ea9e84765a8b6208f8b1f8ccb2e9c..42c44aa946f06b6fad5c0bb7b1b8f61076738aeb 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -33,7 +33,7 @@ struct Thread;
 
 const int MAX_THREADS = 128;
 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
 /// machinery and are modeled after the corresponding C++11 classes.
@@ -85,7 +85,6 @@ struct SplitPoint {
   // Shared variable data
   Mutex mutex;
   std::bitset<MAX_THREADS> slavesMask;
-  int slavesCount;
   volatile bool allSlavesSearching;
   volatile uint64_t nodes;
   volatile Value alpha;