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

Retire FakeSplit

Browse source 
- Currently broken
    - Never been really useful
    - Does not work well with new splitting model

Verified for no regression at STC with 3 threads:
LLR: 2.96 (-2.94,2.94) [-6.00,0.00]
Total: 81905 W: 12122 L: 12381 D: 57402

No functional change
This commit is contained in:
Joona Kiiski 2014-07-07 20:37:06 +01:00 • committed by lucasart
parent 9b30913996
commit eb50793cff
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/search.cpp
View file

@ -52,9 +52,6 @@ using namespace Search;
namespace { namespace {
// Set to true to force running with one thread. Used for debugging
const bool FakeSplit = false;
// Different node types, used as template parameter // Different node types, used as template parameter
enum NodeType { Root, PV, NonPV }; enum NodeType { Root, PV, NonPV };
@ -987,8 +984,8 @@ moves_loop: // When in check and at SpNode search starts from here
{ {
assert(bestValue > -VALUE_INFINITE && bestValue < beta); assert(bestValue > -VALUE_INFINITE && bestValue < beta);
thisThread->split<FakeSplit>(pos, ss, alpha, beta, &bestValue, &bestMove, thisThread->split(pos, ss, alpha, beta, &bestValue, &bestMove,
depth, moveCount, &mp, NT, cutNode); depth, moveCount, &mp, NT, cutNode);
if (Signals.stop || thisThread->cutoff_occurred()) if (Signals.stop || thisThread->cutoff_occurred())
return VALUE_ZERO; return VALUE_ZERO;

21
src/thread.cpp
View file

@ -255,7 +255,6 @@ Thread* ThreadPool::available_slave(const Thread* master) const {
// leave their idle loops and call search(). When all threads have returned from // leave their idle loops and call search(). When all threads have returned from
// search() then split() returns. // search() then split() returns.
template <bool Fake>
void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Value* bestValue, void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Value* bestValue,
Move* bestMove, Depth depth, int moveCount, Move* bestMove, Depth depth, int moveCount,
MovePicker* movePicker, int nodeType, bool cutNode) { MovePicker* movePicker, int nodeType, bool cutNode) {
@ -297,14 +296,13 @@ void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Valu
activeSplitPoint = &sp; activeSplitPoint = &sp;
activePosition = NULL; activePosition = NULL;
if (!Fake) for (Thread* slave; (slave = Threads.available_slave(this)) != NULL; )
for (Thread* slave; (slave = Threads.available_slave(this)) != NULL; ) {
{ sp.slavesMask.set(slave->idx);
sp.slavesMask.set(slave->idx); 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 }
}
// Everything is set up. The master thread enters the idle loop, from which // Everything is set up. The master thread enters the idle loop, from which
// it will instantly launch a search, because its 'searching' flag is set. // it will instantly launch a search, because its 'searching' flag is set.
@ -339,11 +337,6 @@ void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Valu
Threads.mutex.unlock(); Threads.mutex.unlock();
} }
// Explicit template instantiations
template void Thread::split<false>(Position&, const Stack*, Value, Value, Value*, Move*, Depth, int, MovePicker*, int, bool);
template void Thread::split< true>(Position&, const Stack*, Value, Value, Value*, Move*, Depth, int, MovePicker*, int, bool);
// wait_for_think_finished() waits for main thread to go to sleep then returns // wait_for_think_finished() waits for main thread to go to sleep then returns
void ThreadPool::wait_for_think_finished() { void ThreadPool::wait_for_think_finished() {

1
src/thread.h
View file

@ -117,7 +117,6 @@ struct Thread : public ThreadBase {
bool cutoff_occurred() const; bool cutoff_occurred() const;
bool available_to(const Thread* master) const; bool available_to(const Thread* master) const;
template <bool Fake>
void split(Position& pos, const Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove, void split(Position& pos, const Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode); Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);