X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsearch.cpp;h=ff2e39a4e1d50f22e756d620a66a39fbc76ed90f;hb=5d1b92e8f9836e1d403bcf60653dcf6b059c8720;hp=b0e2c950fe7354c784cd14689ab7c3cbb7bed6b4;hpb=e51965aa57ddc50d04016e3622da49cf9f8e6238;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index b0e2c950..ff2e39a4 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -41,7 +41,6 @@ namespace Search { LimitsType Limits; RootMoveVector RootMoves; Position RootPos; - TimePoint SearchTime; StateStackPtr SetupStates; } @@ -137,7 +136,7 @@ namespace { HistoryStats History; CounterMovesHistoryStats CounterMovesHistory; GainsStats Gains; - MovesStats Countermoves, Followupmoves; + MovesStats Countermoves; template Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode); @@ -219,7 +218,7 @@ template uint64_t Search::perft(Position& pos, Depth depth); void Search::think() { - TimeMgr.init(Limits, RootPos.side_to_move(), RootPos.game_ply()); + TimeMgr.init(Limits, RootPos.side_to_move(), RootPos.game_ply(), now()); int contempt = Options["Contempt"] * PawnValueEg / 100; // From centipawns DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(contempt); @@ -339,7 +338,6 @@ namespace { CounterMovesHistory.clear(); Gains.clear(); Countermoves.clear(); - Followupmoves.clear(); size_t multiPV = Options["MultiPV"]; Skill skill(Options["Skill Level"]); @@ -403,7 +401,7 @@ namespace { // the UI) before a re-search. if ( multiPV == 1 && (bestValue <= alpha || bestValue >= beta) - && now() - SearchTime > 3000) + && TimeMgr.elapsed_time() > 3000) sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl; // In case of failing low/high increase aspiration window and @@ -434,9 +432,9 @@ namespace { if (Signals.stop) sync_cout << "info nodes " << RootPos.nodes_searched() - << " time " << now() - SearchTime << sync_endl; + << " time " << TimeMgr.elapsed_time() << sync_endl; - else if (PVIdx + 1 == multiPV || now() - SearchTime > 3000) + else if (PVIdx + 1 == multiPV || TimeMgr.elapsed_time() > 3000) sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl; } @@ -463,10 +461,10 @@ namespace { // of the available time has been used or we matched an easyMove // from the previous search and just did a fast verification. if ( RootMoves.size() == 1 - || now() - SearchTime > TimeMgr.available_time() + || TimeMgr.elapsed_time() > TimeMgr.available_time() || ( RootMoves[0].pv[0] == easyMove && BestMoveChanges < 0.03 - && now() - SearchTime > TimeMgr.available_time() / 10)) + && TimeMgr.elapsed_time() > TimeMgr.available_time() / 10)) { // If we are allowed to ponder do not stop the search now but // keep pondering until the GUI sends "ponderhit" or "stop". @@ -486,7 +484,7 @@ namespace { // Clear any candidate easy move that wasn't stable for the last search // iterations; the second condition prevents consecutive fast moves. - if (EasyMove.stableCnt < 6 || now() - SearchTime < TimeMgr.available_time()) + if (EasyMove.stableCnt < 6 || TimeMgr.elapsed_time() < TimeMgr.available_time()) EasyMove.clear(); // If skill level is enabled, swap best PV line with the sub-optimal one @@ -595,7 +593,7 @@ namespace { { ss->currentMove = ttMove; // Can be MOVE_NONE - // If ttMove is quiet, update killers, history, counter move and followup move on TT hit + // If ttMove is quiet, update killers, history, counter move on TT hit if (ttValue >= beta && ttMove && !pos.capture_or_promotion(ttMove) && !inCheck) update_stats(pos, ss, ttMove, depth, nullptr, 0); @@ -784,14 +782,9 @@ namespace { moves_loop: // When in check and at SpNode search starts from here Square prevMoveSq = to_sq((ss-1)->currentMove); - Move countermoves[] = { Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].first, - Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].second }; + Move countermove = Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq]; - Square prevOwnMoveSq = to_sq((ss-2)->currentMove); - Move followupmoves[] = { Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].first, - Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].second }; - - MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermoves, followupmoves, ss); + MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermove, ss); CheckInfo ci(pos); value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc improving = ss->staticEval >= (ss-2)->staticEval @@ -839,7 +832,7 @@ moves_loop: // When in check and at SpNode search starts from here { Signals.firstRootMove = (moveCount == 1); - if (thisThread == Threads.main() && now() - SearchTime > 3000) + if (thisThread == Threads.main() && TimeMgr.elapsed_time() > 3000) sync_cout << "info depth " << depth / ONE_PLY << " currmove " << UCI::move(move, pos.is_chess960()) << " currmovenumber " << moveCount + PVIdx << sync_endl; @@ -964,10 +957,13 @@ moves_loop: // When in check and at SpNode search starts from here ss->reduction = reduction(improving, depth, moveCount); if ( (!PvNode && cutNode) - || History[pos.piece_on(to_sq(move))][to_sq(move)] < VALUE_ZERO) + || History[pos.piece_on(to_sq(move))][to_sq(move)] < VALUE_ZERO + || ( History[pos.piece_on(to_sq(move))][to_sq(move)] + + CounterMovesHistory[pos.piece_on(prevMoveSq)][prevMoveSq] + [pos.piece_on(to_sq(move))][to_sq(move)] < VALUE_ZERO)) ss->reduction += ONE_PLY; - if (move == countermoves[0] || move == countermoves[1]) + if (move == countermove) ss->reduction = std::max(DEPTH_ZERO, ss->reduction - ONE_PLY); // Decrease reduction for moves that escape a capture @@ -1142,7 +1138,7 @@ moves_loop: // When in check and at SpNode search starts from here bestValue = excludedMove ? alpha : inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()]; - // Quiet best move: update killers, history, countermoves and followupmoves + // Quiet best move: update killers, history and countermoves else if (bestValue >= beta && !pos.capture_or_promotion(bestMove) && !inCheck) update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount - 1); @@ -1402,8 +1398,8 @@ moves_loop: // When in check and at SpNode search starts from here *pv = MOVE_NONE; } - // update_stats() updates killers, history, countermoves and followupmoves - // stats after a fail-high of a quiet move. + // update_stats() updates killers, history and countermoves stats after a fail-high + // of a quiet move. void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt) { @@ -1435,18 +1431,12 @@ moves_loop: // When in check and at SpNode search starts from here cmh.update(pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus); } + // Extra penalty for TT move in previous ply when it gets refuted if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove) { - Value bonus2 = Value(((depth+1) / ONE_PLY) * ((depth+1) / ONE_PLY)); - Square prevPrevSq = to_sq((ss-2)->currentMove); - Followupmoves.update(pos.piece_on(prevPrevSq), prevPrevSq, move); - - Square prevMoveSq = to_sq((ss-1)->currentMove); - Piece prevMovePiece = pos.piece_on(prevMoveSq); - - HistoryStats& cmh2 = CounterMovesHistory[pos.piece_on(prevPrevSq)][prevPrevSq]; - cmh2.update(prevMovePiece, prevMoveSq, -bonus2); + HistoryStats& ttMoveCmh = CounterMovesHistory[pos.piece_on(prevPrevSq)][prevPrevSq]; + ttMoveCmh.update(pos.piece_on(prevSq), prevSq, -bonus - 2 * depth / ONE_PLY - 1); } } @@ -1491,7 +1481,7 @@ moves_loop: // When in check and at SpNode search starts from here string UCI::pv(const Position& pos, Depth depth, Value alpha, Value beta) { std::stringstream ss; - TimePoint elapsed = now() - SearchTime + 1; + TimePoint elapsed = TimeMgr.elapsed_time() + 1; size_t multiPV = std::min((size_t)Options["MultiPV"], RootMoves.size()); int selDepth = 0; @@ -1735,7 +1725,7 @@ void Thread::idle_loop() { void check_time() { static TimePoint lastInfoTime = now(); - TimePoint elapsed = now() - SearchTime; + TimePoint elapsed = TimeMgr.elapsed_time(); if (now() - lastInfoTime >= 1000) {