X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=be6e360af337c5b4e527b99c67a58fc40ee8d659;hp=21d5d786b6ba8be9e558bca2ffb18dfd78c951f1;hb=ef0496ff4095330eaea4b33bb14e0386942fd093;hpb=ce159b16b9483f83b9e96ac6bf3d6e2ba7e5619c diff --git a/src/search.cpp b/src/search.cpp index 21d5d786..be6e360a 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -176,11 +176,11 @@ namespace { } // Test for a capture that triggers a pawn endgame - if ( captureOrPromotion - && type_of(pos.piece_on(to_sq(m))) != PAWN + if ( captureOrPromotion + && type_of(pos.piece_on(to_sq(m))) != PAWN + && !is_special(m) && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) - - PieceValueMidgame[pos.piece_on(to_sq(m))] == VALUE_ZERO) - && !is_special(m)) + - PieceValueMidgame[pos.piece_on(to_sq(m))] == VALUE_ZERO)) return true; return false; @@ -622,10 +622,10 @@ namespace { TT.refresh(tte); ss->currentMove = ttMove; // Can be MOVE_NONE - if ( ttValue >= beta - && ttMove + if ( ttValue >= beta + && ttMove && !pos.is_capture_or_promotion(ttMove) - && ttMove != ss->killers[0]) + && ttMove != ss->killers[0]) { ss->killers[1] = ss->killers[0]; ss->killers[0] = ttMove; @@ -652,9 +652,9 @@ namespace { // Update gain for the parent non-capture move given the static position // evaluation before and after the move. - if ( (move = (ss-1)->currentMove) != MOVE_NULL - && (ss-1)->eval != VALUE_NONE - && ss->eval != VALUE_NONE + if ( (move = (ss-1)->currentMove) != MOVE_NULL + && (ss-1)->eval != VALUE_NONE + && ss->eval != VALUE_NONE && !pos.captured_piece_type() && !is_special(move)) { @@ -806,15 +806,15 @@ split_point_start: // At split points actual search starts from here futilityBase = ss->eval + ss->evalMargin; singularExtensionNode = !RootNode && !SpNode - && depth >= SingularExtensionDepth[PvNode] - && ttMove != MOVE_NONE + && depth >= SingularExtensionDepth[PvNode] + && ttMove != MOVE_NONE && !excludedMove // Recursive singular search is not allowed && (tte->type() & BOUND_LOWER) - && tte->depth() >= depth - 3 * ONE_PLY; + && tte->depth() >= depth - 3 * ONE_PLY; // Step 11. Loop through moves // Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs - while ( bestValue < beta + while ( bestValue < beta && (move = mp.next_move()) != MOVE_NONE && !thisThread->cutoff_occurred() && !Signals.stop) @@ -863,17 +863,17 @@ split_point_start: // At split points actual search starts from here ext = ONE_PLY; else if (givesCheck && pos.see_sign(move) >= 0) - ext = PvNode ? ONE_PLY : ONE_PLY / 2; + ext = ONE_PLY / 2; // Singular extension search. If all moves but one fail low on a search of // (alpha-s, beta-s), and just one fails high on (alpha, beta), then that move // is singular and should be extended. To verify this we do a reduced search // on all the other moves but the ttMove, if result is lower than ttValue minus // a margin then we extend ttMove. - if ( singularExtensionNode + if ( singularExtensionNode && !ext - && move == ttMove - && pos.pl_move_is_legal(move, ci.pinned)) + && move == ttMove + && pos.pl_move_is_legal(move, ci.pinned)) { if (abs(ttValue) < VALUE_KNOWN_WIN) { @@ -952,7 +952,7 @@ split_point_start: // At split points actual search starts from here // Step 15. Reduced depth search (LMR). If the move fails high will be // re-searched at full depth. - if ( depth > 3 * ONE_PLY + if ( depth > 3 * ONE_PLY && !isPvMove && !captureOrPromotion && !dangerous @@ -1051,9 +1051,10 @@ split_point_start: // At split points actual search starts from here // Step 19. Check for split if ( !SpNode - && depth >= Threads.min_split_depth() - && bestValue < beta - && Threads.available_slave_exists(thisThread) + && depth >= Threads.min_split_depth() + && depth - reduction(depth, moveCount) >= Threads.min_split_depth() + && bestValue < beta + && Threads.available_slave_exists(thisThread) && !Signals.stop && !thisThread->cutoff_occurred()) bestValue = Threads.split(pos, ss, alpha, beta, bestValue, &bestMove, @@ -1245,8 +1246,8 @@ split_point_start: // At split points actual search starts from here // Detect non-capture evasions that are candidate to be pruned evasionPrunable = !PvNode - && inCheck - && bestValue > VALUE_MATED_IN_MAX_PLY + && inCheck + && bestValue > VALUE_MATED_IN_MAX_PLY && !pos.is_capture(move) && !pos.can_castle(pos.side_to_move()); @@ -1844,14 +1845,13 @@ void Thread::idle_loop(SplitPoint* sp_master) { assert(is_searching); is_searching = false; - sp->allSlavesRunning = false; sp->slavesMask &= ~(1ULL << idx); sp->nodes += pos.nodes_searched(); // 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() - && this != sp->master + if ( Threads.use_sleeping_threads() + && this != sp->master && !sp->master->is_searching) sp->master->wake_up(); @@ -1860,43 +1860,6 @@ void Thread::idle_loop(SplitPoint* sp_master) { // our feet by the sp master. Also accessing other Thread objects is // unsafe because if we are exiting there is a chance are already freed. lock_release(sp->lock); - - // Try to reparent to the first split point, with still all slaves - // running, where we are available as a possible slave. - for (int i = 0; i < Threads.size(); i++) - { - Thread* th = &Threads[i]; - int spCnt = th->splitPointsCnt; - SplitPoint* latest = &th->splitPoints[spCnt ? spCnt - 1 : 0]; - - if ( this->is_available_to(th) - && spCnt > 0 - && !th->cutoff_occurred() - && latest->allSlavesRunning - && more_than_one(latest->slavesMask)) - { - lock_grab(latest->lock); - lock_grab(Threads.splitLock); - - // Retest all under lock protection, we are in the middle - // of a race storm here ! - if ( this->is_available_to(th) - && spCnt == th->splitPointsCnt - && !th->cutoff_occurred() - && latest->allSlavesRunning - && more_than_one(latest->slavesMask)) - { - latest->slavesMask |= 1ULL << idx; - curSplitPoint = latest; - is_searching = true; - } - - lock_release(Threads.splitLock); - lock_release(latest->lock); - - break; // Exit anyhow, only one try (enough in 99% of cases) - } - } } } }