X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=ac870f5bf617aa8d75fbdede2e5e04048eaf970c;hp=997732131408d314efbb913b3ed87f838e6f9a87;hb=4ad03c9bad914b337fb6431c4bcbc1d909a1a841;hpb=a1c02815ccc5824fe8737d1d6fab8aef09874a07 diff --git a/src/search.cpp b/src/search.cpp index 99773213..ac870f5b 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -94,8 +94,8 @@ namespace { int ActiveThreads; volatile bool AllThreadsShouldExit; Thread threads[MAX_THREADS]; - Lock MPLock; - WaitCondition WaitCond[MAX_THREADS]; + Lock MPLock, SleepLock[MAX_THREADS]; + WaitCondition SleepCond[MAX_THREADS]; }; @@ -263,7 +263,7 @@ namespace { // Multi-threads related variables Depth MinimumSplitDepth; int MaxThreadsPerSplitPoint; - bool UseSleepingMaster; + bool UseSleepingThreads; ThreadsManager ThreadsMgr; // Node counters, used only by thread[0] but try to keep in different cache @@ -348,7 +348,7 @@ void init_search() { // Init reductions array for (hd = 1; hd < 64; hd++) for (mc = 1; mc < 64; mc++) { - double pvRed = 0.33 + log(double(hd)) * log(double(mc)) / 4.5; + double pvRed = log(double(hd)) * log(double(mc)) / 3.0; double nonPVRed = 0.33 + log(double(hd)) * log(double(mc)) / 2.25; ReductionMatrix[PV][hd][mc] = (int8_t) ( pvRed >= 1.0 ? floor( pvRed * int(ONE_PLY)) : 0); ReductionMatrix[NonPV][hd][mc] = (int8_t) (nonPVRed >= 1.0 ? floor(nonPVRed * int(ONE_PLY)) : 0); @@ -456,7 +456,7 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ MaxThreadsPerSplitPoint = Options["Maximum Number of Threads per Split Point"].value(); MultiPV = Options["MultiPV"].value(); UseLogFile = Options["Use Search Log"].value(); - UseSleepingMaster = Options["Use Sleeping Master"].value(); + UseSleepingThreads = Options["Use Sleeping Threads"].value(); if (UseLogFile) LogFile.open(Options["Search Log Filename"].value().c_str(), std::ios::out | std::ios::app); @@ -468,9 +468,13 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ if (newActiveThreads != ThreadsMgr.active_threads()) { ThreadsMgr.set_active_threads(newActiveThreads); - init_eval(ThreadsMgr.active_threads()); + init_eval(newActiveThreads); } + // 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()]; @@ -503,6 +507,9 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ if (UseLogFile) LogFile.close(); + // This makes all the threads to go to sleep + ThreadsMgr.set_active_threads(1); + return !Quit; } @@ -656,7 +663,7 @@ namespace { << " time " << current_search_time() << endl; // Print the best move and the ponder move to the standard output - if (pv[0] == MOVE_NONE) + if (pv[0] == MOVE_NONE || MultiPV > 1) { pv[0] = rml.move(0); pv[1] = MOVE_NONE; @@ -1065,7 +1072,6 @@ namespace { && !isCheck && refinedValue < beta - razor_margin(depth) && ttMove == MOVE_NONE - && (ss-1)->currentMove != MOVE_NULL && !value_is_mate(beta) && !pos.has_pawn_on_7th(pos.side_to_move())) { @@ -1282,6 +1288,17 @@ split_point_start: // At split points actual search starts from here continue; } + + // Prune neg. see moves at low depths + if ( predictedDepth < 2 * ONE_PLY + && bestValue > value_mated_in(PLY_MAX) + && pos.see_sign(move) < 0) + { + if (SpNode) + lock_grab(&(sp->lock)); + + continue; + } } // Step 13. Make the move @@ -2200,31 +2217,33 @@ 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 ( threadID >= ActiveThreads - || threads[threadID].state == THREAD_INITIALIZING - || (threads[threadID].state == THREAD_AVAILABLE && (!sp || UseSleepingMaster))) + while ( threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING + || (UseSleepingThreads && threads[threadID].state == THREAD_AVAILABLE)) { - lock_grab(&MPLock); + assert(!sp || UseSleepingThreads); + assert(threadID != 0 || UseSleepingThreads); + + if (threads[threadID].state == THREAD_INITIALIZING) + threads[threadID].state = THREAD_AVAILABLE; + + // Grab the lock to avoid races with wake_sleeping_thread() + lock_grab(&SleepLock[threadID]); - // Test with lock held to avoid races with wake_sleeping_thread() + // If we are master and all slaves have finished do not go to sleep for (i = 0; sp && i < ActiveThreads && !sp->slaves[i]; i++) {} allFinished = (i == ActiveThreads); - // Retest sleep conditions under lock protection - if ( AllThreadsShouldExit - || allFinished - || !( threadID >= ActiveThreads - || threads[threadID].state == THREAD_INITIALIZING - || (threads[threadID].state == THREAD_AVAILABLE && (!sp || UseSleepingMaster)))) + if (allFinished || AllThreadsShouldExit) { - lock_release(&MPLock); + lock_release(&SleepLock[threadID]); break; } - // Put thread to sleep - threads[threadID].state = THREAD_AVAILABLE; - cond_wait(&WaitCond[threadID], &MPLock); - lock_release(&MPLock); + // Do sleep here after retesting sleep conditions + if (threadID >= ActiveThreads || threads[threadID].state == THREAD_AVAILABLE) + cond_wait(&SleepCond[threadID], &SleepLock[threadID]); + + lock_release(&SleepLock[threadID]); } // If this thread has been assigned work, launch a search @@ -2242,16 +2261,16 @@ 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; // Wake up master thread so to allow it to return from the idle loop in // case we are the last slave of the split point. - if (UseSleepingMaster && threadID != tsp->master && threads[tsp->master].state == THREAD_AVAILABLE) + if (UseSleepingThreads && threadID != tsp->master && threads[tsp->master].state == THREAD_AVAILABLE) wake_sleeping_thread(tsp->master); } @@ -2291,7 +2310,10 @@ split_point_start: // At split points actual search starts from here lock_init(&MPLock); for (i = 0; i < MAX_THREADS; i++) - cond_init(&WaitCond[i]); + { + lock_init(&SleepLock[i]); + cond_init(&SleepCond[i]); + } // Initialize splitPoints[] locks for (i = 0; i < MAX_THREADS; i++) @@ -2324,7 +2346,7 @@ split_point_start: // At split points actual search starts from here if (!ok) { cout << "Failed to create thread number " << i << endl; - Application::exit_with_failure(); + exit(EXIT_FAILURE); } // Wait until the thread has finished launching and is gone to sleep @@ -2356,7 +2378,10 @@ split_point_start: // At split points actual search starts from here // Now we can safely destroy the wait conditions for (int i = 0; i < MAX_THREADS; i++) - cond_destroy(&WaitCond[i]); + { + lock_destroy(&SleepLock[i]); + cond_destroy(&SleepCond[i]); + } } @@ -2518,7 +2543,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) + + if (UseSleepingThreads && i != master) wake_sleeping_thread(i); } @@ -2543,14 +2569,14 @@ split_point_start: // At split points actual search starts from here } - // wake_sleeping_thread() wakes up all sleeping threads when it is time - // to start a new search from the root. + // wake_sleeping_thread() wakes up the thread with the given threadID + // when it is time to start a new search. void ThreadsManager::wake_sleeping_thread(int threadID) { - lock_grab(&MPLock); - cond_signal(&WaitCond[threadID]); - lock_release(&MPLock); + lock_grab(&SleepLock[threadID]); + cond_signal(&SleepCond[threadID]); + lock_release(&SleepLock[threadID]); }