HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-21 01:27:16 +08:00
Code Issues Packages Projects 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
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
&& ( !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;
}