X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=e521b86849facadb45b4abfca262fd2331fb8f82;hb=5b445cdf59d0737befad9750cd49da0ca278c0f7;hp=f955f96d4180e10f6467f0ee29c24a23b81fbb23;hpb=3a564ed5dbe28c32bc933b318e0170e416b7b779;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index f955f96d..e521b868 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -83,7 +83,6 @@ namespace { bool thread_is_available(int slave, int master) const; bool thread_should_stop(int threadID) const; void wake_sleeping_thread(int threadID); - void put_threads_to_sleep(); void idle_loop(int threadID, SplitPoint* sp); template @@ -94,9 +93,9 @@ namespace { friend void poll(); int ActiveThreads; - volatile bool AllThreadsShouldExit, AllThreadsShouldSleep; + volatile bool AllThreadsShouldExit; Thread threads[MAX_THREADS]; - Lock MPLock, WaitLock; + Lock MPLock; WaitCondition WaitCond[MAX_THREADS]; }; @@ -465,10 +464,6 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr init_eval(ThreadsMgr.active_threads()); } - // Wake up needed threads - for (int i = 1; i < newActiveThreads; i++) - ThreadsMgr.wake_sleeping_thread(i); - // Set thinking time int myTime = time[pos.side_to_move()]; int myIncrement = increment[pos.side_to_move()]; @@ -501,8 +496,6 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr if (UseLogFile) LogFile.close(); - ThreadsMgr.put_threads_to_sleep(); - return !Quit; } @@ -1181,7 +1174,7 @@ split_point_start: // At split points actual search starts from here // Initialize a MovePicker object for the current position // FIXME currently MovePicker() c'tor is needless called also in SplitPoint - MovePicker mpBase = MovePicker(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); + MovePicker mpBase(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); MovePicker& mp = SpNode ? *sp->mp : mpBase; CheckInfo ci(pos); ss->bestMove = MOVE_NONE; @@ -1250,7 +1243,10 @@ split_point_start: // At split points actual search starts from here newDepth = depth - ONE_PLY + ext; // Update current move (this must be done after singular extension search) - movesSearched[moveCount++] = ss->currentMove = move; + movesSearched[moveCount] = ss->currentMove = move; + + if (!SpNode) + moveCount++; // Step 12. Futility pruning (is omitted in PV nodes) if ( !PvNode @@ -1371,24 +1367,29 @@ split_point_start: // At split points actual search starts from here if (value > bestValue && !(SpNode && ThreadsMgr.thread_should_stop(threadID))) { bestValue = value; + + if (SpNode) + sp->bestValue = value; + if (value > alpha) { if (SpNode && (!PvNode || value >= beta)) sp->stopRequest = true; if (PvNode && value < beta) // We want always alpha < beta + { alpha = value; + if (SpNode) + sp->alpha = value; + } if (value == value_mate_in(ply + 1)) ss->mateKiller = move; ss->bestMove = move; - } - if (SpNode) - { - sp->bestValue = bestValue; - sp->alpha = alpha; - sp->parentSstack->bestMove = ss->bestMove; + + if (SpNode) + sp->parentSstack->bestMove = move; } } @@ -2224,30 +2225,37 @@ split_point_start: // At split points actual search starts from here // If we are not thinking, wait for a condition to be signaled // instead of wasting CPU time polling for work. - while (AllThreadsShouldSleep || threadID >= ActiveThreads) + while ( threadID >= ActiveThreads + || threads[threadID].state == THREAD_INITIALIZING + || (!sp && threads[threadID].state == THREAD_AVAILABLE)) { assert(!sp); assert(threadID != 0); - threads[threadID].state = THREAD_SLEEPING; -#if !defined(_MSC_VER) - lock_grab(&WaitLock); - if (AllThreadsShouldSleep || threadID >= ActiveThreads) - pthread_cond_wait(&WaitCond[threadID], &WaitLock); - lock_release(&WaitLock); -#else - WaitForSingleObject(WaitCond[threadID], INFINITE); -#endif - } + if (AllThreadsShouldExit) + break; + + lock_grab(&MPLock); - // If thread has just woken up, mark it as available - if (threads[threadID].state == THREAD_SLEEPING) + // Retest condition under lock protection + if (!( threadID >= ActiveThreads + || threads[threadID].state == THREAD_INITIALIZING + || (!sp && threads[threadID].state == THREAD_AVAILABLE))) + { + lock_release(&MPLock); + continue; + } + + // Put thread to sleep threads[threadID].state = THREAD_AVAILABLE; + cond_wait(&WaitCond[threadID], &MPLock); + lock_release(&MPLock); + } // If this thread has been assigned work, launch a search if (threads[threadID].state == THREAD_WORKISWAITING) { - assert(!AllThreadsShouldExit && !AllThreadsShouldSleep); + assert(!AllThreadsShouldExit); threads[threadID].state = THREAD_SEARCHING; @@ -2259,9 +2267,9 @@ split_point_start: // At split points actual search starts from here if (tsp->pvNode) search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); - else + else { search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); - + } assert(threads[threadID].state == THREAD_SEARCHING); threads[threadID].state = THREAD_AVAILABLE; @@ -2301,14 +2309,9 @@ split_point_start: // At split points actual search starts from here // Initialize global locks lock_init(&MPLock); - lock_init(&WaitLock); for (i = 0; i < MAX_THREADS; i++) -#if !defined(_MSC_VER) - pthread_cond_init(&WaitCond[i], NULL); -#else - WaitCond[i] = CreateEvent(0, FALSE, FALSE, 0); -#endif + cond_init(&WaitCond[i]); // Initialize splitPoints[] locks for (i = 0; i < MAX_THREADS; i++) @@ -2318,14 +2321,13 @@ split_point_start: // At split points actual search starts from here // Will be set just before program exits to properly end the threads AllThreadsShouldExit = false; - // Threads will be put to sleep as soon as created - AllThreadsShouldSleep = true; - - // All threads except the main thread should be initialized to THREAD_AVAILABLE + // Threads will be put all threads to sleep as soon as created ActiveThreads = 1; + + // All threads except the main thread should be initialized to THREAD_INITIALIZING threads[0].state = THREAD_SEARCHING; for (i = 1; i < MAX_THREADS; i++) - threads[i].state = THREAD_AVAILABLE; + threads[i].state = THREAD_INITIALIZING; // Launch the helper threads for (i = 1; i < MAX_THREADS; i++) @@ -2345,7 +2347,7 @@ split_point_start: // At split points actual search starts from here } // Wait until the thread has finished launching and is gone to sleep - while (threads[i].state != THREAD_SLEEPING) {} + while (threads[i].state == THREAD_INITIALIZING) {} } } @@ -2356,7 +2358,6 @@ split_point_start: // At split points actual search starts from here void ThreadsManager::exit_threads() { AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop() - ActiveThreads = MAX_THREADS; // Avoid any woken up thread comes back to sleep // Wake up all the threads and waits for termination for (int i = 1; i < MAX_THREADS; i++) @@ -2370,7 +2371,6 @@ split_point_start: // At split points actual search starts from here for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++) lock_destroy(&(threads[i].splitPoints[j].lock)); - lock_destroy(&WaitLock); lock_destroy(&MPLock); // Now we can safely destroy the wait conditions @@ -2451,9 +2451,8 @@ split_point_start: // At split points actual search starts from here // split point objects), the function immediately returns. If splitting is // possible, a SplitPoint object is initialized with all the data that must be // copied to the helper threads and we tell our helper threads that they have - // been assigned work. This will cause them to instantly leave their idle loops - // and call sp_search(). When all threads have returned from sp_search() then - // split() returns. + // been assigned work. This will cause them to instantly leave their idle loops and + // call search().When all threads have returned from search() then split() returns. template void ThreadsManager::split(const Position& p, SearchStack* ss, int ply, Value* alpha, @@ -2536,6 +2535,8 @@ split_point_start: // At split points actual search starts from here assert(i == master || threads[i].state == THREAD_BOOKED); threads[i].state = THREAD_WORKISWAITING; // This makes the slave to exit from idle_loop() + if (i != master) + wake_sleeping_thread(i); } // Everything is set up. The master thread enters the idle loop, from @@ -2563,33 +2564,12 @@ split_point_start: // At split points actual search starts from here void ThreadsManager::wake_sleeping_thread(int threadID) { - assert(threadID > 0); - assert(threads[threadID].state == THREAD_SLEEPING); - - AllThreadsShouldSleep = false; // Avoid the woken up thread comes back to sleep - -#if !defined(_MSC_VER) - pthread_mutex_lock(&WaitLock); - pthread_cond_signal(&WaitCond[threadID]); - pthread_mutex_unlock(&WaitLock); -#else - SetEvent(WaitCond[threadID]); -#endif + lock_grab(&MPLock); + cond_signal(&WaitCond[threadID]); + lock_release(&MPLock); } - // put_threads_to_sleep() makes all the threads go to sleep just before - // to leave think(), at the end of the search. Threads should have already - // finished the job and should be idle. - - void ThreadsManager::put_threads_to_sleep() { - - assert(!AllThreadsShouldSleep || ActiveThreads == 1); - - // This makes the threads to go to sleep - AllThreadsShouldSleep = true; - } - /// The RootMoveList class // RootMoveList c'tor