X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=5706b959f2d9ffeb1e0a121a001a7a44c31b5c3b;hp=1131fae7e01cfe329d2769e615b0bbb879cf2b84;hb=b1768c115cf2bbe7ed6f89dc53a8db85b4442353;hpb=a492a9dd079d95faf136a744ff6d47a3d109ad68 diff --git a/src/search.cpp b/src/search.cpp index 1131fae7..5706b959 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -307,11 +307,7 @@ void Search::think() { << endl; } - for (int i = 0; i < Threads.size(); i++) - { - Threads[i].maxPly = 0; - Threads[i].wake_up(); - } + Threads.set_size(Options["Threads"]); // Set best timer interval to avoid lagging under time pressure. Timer is // used to check for remaining available thinking time. @@ -348,7 +344,7 @@ finalize: // but if we are pondering or in infinite search, we shouldn't print the best // move before we are told to do so. if (!Signals.stop && (Limits.ponder || Limits.infinite)) - Threads.wait_for_stop_or_ponderhit(); + Threads[pos.thread()].wait_for_stop_or_ponderhit(); // Best move could be MOVE_NONE when searching on a stalemate position cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960) @@ -467,7 +463,7 @@ namespace { if (SkillLevelEnabled && depth == 1 + SkillLevel) skillBest = do_skill_level(); - if (Options["Use Search Log"]) + if (!Signals.stop && Options["Use Search Log"]) pv_info_to_log(pos, depth, bestValue, elapsed_time(), &RootMoves[0].pv[0]); // Filter out startup noise when monitoring best move stability @@ -1061,7 +1057,9 @@ split_point_start: // At split points actual search starts from here sp->bestValue = value; sp->ss->bestMove = move; sp->alpha = alpha; - sp->is_betaCutoff = (value >= beta); + + if (value >= beta) + sp->cutoff = true; } } @@ -1282,12 +1280,7 @@ split_point_start: // At split points actual search starts from here && !pos.is_capture_or_promotion(move) && ss->eval + PawnValueMidgame / 4 < beta && !check_is_dangerous(pos, move, futilityBase, beta, &bestValue)) - { - if (ss->eval + PawnValueMidgame / 4 > bestValue) - bestValue = ss->eval + PawnValueMidgame / 4; - continue; - } // Check for legality only before to do the move if (!pos.pl_move_is_legal(move, ci.pinned)) @@ -1869,10 +1862,16 @@ void Thread::idle_loop(SplitPoint* sp_master) { { assert(!do_sleep && !do_exit); - // Copy split point position and search stack and call search() - Stack ss[MAX_PLY_PLUS_2]; + lock_grab(Threads.splitLock); + + assert(is_searching); SplitPoint* sp = splitPoint; + + lock_release(Threads.splitLock); + + Stack ss[MAX_PLY_PLUS_2]; Position pos(*sp->pos, threadID); + int master = sp->master; memcpy(ss, sp->ss - 1, 4 * sizeof(Stack)); (ss+1)->sp = sp; @@ -1890,21 +1889,26 @@ void Thread::idle_loop(SplitPoint* sp_master) { assert(is_searching); - // We return from search with lock held + is_searching = false; sp->slavesMask &= ~(1ULL << threadID); sp->nodes += pos.nodes_searched(); - lock_release(sp->lock); - is_searching = false; + // After releasing the lock we cannot access anymore any SplitPoint + // related data in a reliably way becuase it could have been released + // under our feet by the sp master. + lock_release(sp->lock); // 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 ( Threads.use_sleeping_threads() - && threadID != sp->master - && !Threads[sp->master].is_searching) - Threads[sp->master].wake_up(); + && threadID != master + && !Threads[master].is_searching) + Threads[master].wake_up(); } } + // In helpful master concept a master can help only a sub-tree of its split + // point, and because here is all finished is not possible master is booked. + assert(!is_searching); }