X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=d02035183b07a262abd14de260b6baee824aa332;hp=02907a80f9d63dcc883a508c6791f76fd7660bfa;hb=d95b9189d850da83066a9bf3b2a1caffabb8073a;hpb=55b6464d4096edae032c67d829acff69705b22a6 diff --git a/src/search.cpp b/src/search.cpp index 02907a80..d0203518 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -144,7 +144,7 @@ namespace { bool UseFutilityPruning = true; // Margins for futility pruning in the quiescence search, at frontier - // nodes, and at pre-frontier nodes: + // nodes, and at pre-frontier nodes Value FutilityMargin0 = Value(0x80); Value FutilityMargin1 = Value(0x100); Value FutilityMargin2 = Value(0x300); @@ -167,27 +167,28 @@ namespace { Depth PawnEndgameExtension[2] = {OnePly, OnePly}; Depth MateThreatExtension[2] = {Depth(0), Depth(0)}; - // Search depth at iteration 1: + // Search depth at iteration 1 const Depth InitialDepth = OnePly /*+ OnePly/2*/; // Node counters int NodesSincePoll; int NodesBetweenPolls = 30000; - // Iteration counter: + // Iteration counter int Iteration; + bool LastIterations; // Scores and number of times the best move changed for each iteration: Value ValueByIteration[PLY_MAX_PLUS_2]; int BestMoveChangesByIteration[PLY_MAX_PLUS_2]; - // MultiPV mode: + // MultiPV mode int MultiPV = 1; // Time managment variables int SearchStartTime; int MaxNodes, MaxDepth; - int MaxSearchTime, AbsoluteMaxSearchTime, ExtraSearchTime, TimeAdvantage; + int MaxSearchTime, AbsoluteMaxSearchTime, ExtraSearchTime; Move BestRootMove, PonderMove, EasyMove; int RootMoveNumber; bool InfiniteSearch; @@ -237,19 +238,20 @@ namespace { Depth depth, int ply, int threadID); void sp_search(SplitPoint *sp, int threadID); void sp_search_pv(SplitPoint *sp, int threadID); + void init_search_stack(SearchStack& ss); void init_search_stack(SearchStack ss[]); void init_node(const Position &pos, SearchStack ss[], int ply, int threadID); void update_pv(SearchStack ss[], int ply); void sp_update_pv(SearchStack *pss, SearchStack ss[], int ply); bool connected_moves(const Position &pos, Move m1, Move m2); - Depth extension(const Position &pos, Move m, bool pvNode, bool check, - bool singleReply, bool mateThreat); + bool move_is_killer(Move m, const SearchStack& ss); + Depth extension(const Position &pos, Move m, bool pvNode, bool check, bool singleReply, bool mateThreat, bool* dangerous); bool ok_to_do_nullmove(const Position &pos); bool ok_to_prune(const Position &pos, Move m, Move threat, Depth d); bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply); bool ok_to_history(const Position &pos, Move m); - void update_history(const Position& pos, Move m, Depth depth, - Move movesSearched[], int moveCount); + void update_history(const Position& pos, Move m, Depth depth, Move movesSearched[], int moveCount); + void update_killers(Move m, SearchStack& ss); bool fail_high_ply_1(); int current_search_time(); @@ -297,6 +299,9 @@ Lock IOLock; History H; // Should be made local? +// The empty search stack +SearchStack EmptySearchStack; + //// //// Functions @@ -422,16 +427,14 @@ void think(const Position &pos, bool infinite, bool ponder, int side_to_move, int myIncrement = increment[side_to_move]; int oppTime = time[1 - side_to_move]; - TimeAdvantage = myTime - oppTime; - if (!movesToGo) // Sudden death time control - { - if (increment) + { + if (myIncrement) { MaxSearchTime = myTime / 30 + myIncrement; AbsoluteMaxSearchTime = Max(myTime / 4, myIncrement - 100); } else { // Blitz game without increment - MaxSearchTime = myTime / 40; + MaxSearchTime = myTime / 30; AbsoluteMaxSearchTime = myTime / 8; } } @@ -561,6 +564,9 @@ void init_threads() { // Wait until the thread has finished launching: while (!Threads[i].running); } + + // Init also the empty search stack + init_search_stack(EmptySearchStack); } @@ -617,6 +623,7 @@ namespace { ValueByIteration[0] = Value(0); ValueByIteration[1] = rml.get_move_score(0); Iteration = 1; + LastIterations = false; EasyMove = rml.scan_for_easy_move(); @@ -671,9 +678,8 @@ namespace { ExtraSearchTime = BestMoveChangesByIteration[Iteration] * (MaxSearchTime / 2) + BestMoveChangesByIteration[Iteration-1] * (MaxSearchTime / 3); - // If we need some more and we are in time advantage take it - if (ExtraSearchTime > 0 && TimeAdvantage > 2 * MaxSearchTime) - ExtraSearchTime += MaxSearchTime / 2; + // Try to guess if the current iteration is the last one or the last two + LastIterations = (current_search_time() > ((MaxSearchTime + ExtraSearchTime)*58) / 128); // Stop search if most of MaxSearchTime is consumed at the end of the // iteration. We probably don't have enough time to search the first @@ -766,7 +772,8 @@ namespace { << " currmovenumber " << i + 1 << std::endl; // Decide search depth for this move - ext = extension(pos, move, true, pos.move_is_check(move), false, false); + bool dangerous; + ext = extension(pos, move, true, pos.move_is_check(move), false, false, &dangerous); newDepth = (Iteration - 2) * OnePly + ext + InitialDepth; // Make the move, and search it @@ -783,7 +790,7 @@ namespace { if (Problem && StopOnPonderhit) StopOnPonderhit = false; - } + } else { value = -search(pos, ss, -alpha, newDepth, 1, true, 0); @@ -933,16 +940,14 @@ namespace { // Initialize a MovePicker object for the current position, and prepare // to search all moves - MovePicker mp = MovePicker(pos, true, ttMove, ss[ply].mateKiller, - ss[ply].killer1, ss[ply].killer2, depth); + MovePicker mp = MovePicker(pos, true, ttMove, ss[ply], depth); Move move, movesSearched[256]; int moveCount = 0; Value value, bestValue = -VALUE_INFINITE; Bitboard dcCandidates = mp.discovered_check_candidates(); bool isCheck = pos.is_check(); - bool mateThreat = MateThreatExtension[1] > Depth(0) - && pos.has_mate_threat(opposite_color(pos.side_to_move())); + bool mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move())); // Loop through all legal moves until no moves remain or a beta cutoff // occurs. @@ -955,19 +960,19 @@ namespace { bool singleReply = (isCheck && mp.number_of_moves() == 1); bool moveIsCheck = pos.move_is_check(move, dcCandidates); bool moveIsCapture = pos.move_is_capture(move); - bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); movesSearched[moveCount++] = ss[ply].currentMove = move; if (moveIsCapture) - ss[ply].currentMoveCaptureValue = pos.midgame_value_of_piece_on(move_to(move)); + ss[ply].currentMoveCaptureValue = pos.midgame_value_of_piece_on(move_to(move)); else if (move_is_ep(move)) - ss[ply].currentMoveCaptureValue = PawnValueMidgame; + ss[ply].currentMoveCaptureValue = PawnValueMidgame; else - ss[ply].currentMoveCaptureValue = Value(0); + ss[ply].currentMoveCaptureValue = Value(0); // Decide the new search depth - Depth ext = extension(pos, move, true, moveIsCheck, singleReply, mateThreat); + bool dangerous; + Depth ext = extension(pos, move, true, moveIsCheck, singleReply, mateThreat, &dangerous); Depth newDepth = depth - OnePly + ext; // Make and search the move @@ -981,14 +986,12 @@ namespace { // Try to reduce non-pv search depth by one ply if move seems not problematic, // if the move fails high will be re-searched at full depth. if ( depth >= 2*OnePly - && ext == Depth(0) && moveCount >= LMRPVMoves + && !dangerous && !moveIsCapture && !move_promotion(move) - && !moveIsPassedPawnPush && !move_is_castle(move) - && move != ss[ply].killer1 - && move != ss[ply].killer2) + && !move_is_killer(move, ss[ply])) { ss[ply].reduction = OnePly; value = -search(pos, ss, -alpha, newDepth-OnePly, ply+1, true, threadID); @@ -1070,11 +1073,7 @@ namespace { if (ok_to_history(pos, m)) // Only non capture moves are considered { update_history(pos, m, depth, movesSearched, moveCount); - if (m != ss[ply].killer1) - { - ss[ply].killer2 = ss[ply].killer1; - ss[ply].killer1 = m; - } + update_killers(m, ss[ply]); } TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER); } @@ -1143,7 +1142,8 @@ namespace { UndoInfo u; pos.do_null_move(u); - Value nullValue = -search(pos, ss, -(beta-1), depth-4*OnePly, ply+1, false, threadID); + int R = (depth > 7 ? 4 : 3); + Value nullValue = -search(pos, ss, -(beta-1), depth-R*OnePly, ply+1, false, threadID); pos.undo_null_move(u); if (nullValue >= beta) @@ -1191,8 +1191,7 @@ namespace { // Initialize a MovePicker object for the current position, and prepare // to search all moves: - MovePicker mp = MovePicker(pos, false, ttMove, ss[ply].mateKiller, - ss[ply].killer1, ss[ply].killer2, depth); + MovePicker mp = MovePicker(pos, false, ttMove, ss[ply], depth); Move move, movesSearched[256]; int moveCount = 0; @@ -1214,19 +1213,18 @@ namespace { bool singleReply = (isCheck && mp.number_of_moves() == 1); bool moveIsCheck = pos.move_is_check(move, dcCandidates); bool moveIsCapture = pos.move_is_capture(move); - bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); movesSearched[moveCount++] = ss[ply].currentMove = move; // Decide the new search depth - Depth ext = extension(pos, move, false, moveIsCheck, singleReply, mateThreat); + bool dangerous; + Depth ext = extension(pos, move, false, moveIsCheck, singleReply, mateThreat, &dangerous); Depth newDepth = depth - OnePly + ext; // Futility pruning if ( useFutilityPruning - && ext == Depth(0) + && !dangerous && !moveIsCapture - && !moveIsPassedPawnPush && !move_promotion(move)) { if ( moveCount >= 2 + int(depth) @@ -1254,15 +1252,13 @@ namespace { // Try to reduce non-pv search depth by one ply if move seems not problematic, // if the move fails high will be re-searched at full depth. - if ( depth >= 2*OnePly - && ext == Depth(0) - && moveCount >= LMRNonPVMoves + if ( depth >= 2*OnePly + && moveCount >= LMRNonPVMoves + && !dangerous && !moveIsCapture && !move_promotion(move) - && !moveIsPassedPawnPush && !move_is_castle(move) - && move != ss[ply].killer1 - && move != ss[ply].killer2) + && !move_is_killer(move, ss[ply])) { ss[ply].reduction = OnePly; value = -search(pos, ss, -(beta-1), newDepth-OnePly, ply+1, true, threadID); @@ -1321,11 +1317,7 @@ namespace { if (ok_to_history(pos, m)) // Only non capture moves are considered { update_history(pos, m, depth, movesSearched, moveCount); - if (m != ss[ply].killer1) - { - ss[ply].killer2 = ss[ply].killer1; - ss[ply].killer1 = m; - } + update_killers(m, ss[ply]); } TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER); } @@ -1382,12 +1374,13 @@ namespace { // Initialize a MovePicker object for the current position, and prepare // to search the moves. Because the depth is <= 0 here, only captures, // queen promotions and checks (only if depth == 0) will be generated. - MovePicker mp = MovePicker(pos, false, MOVE_NONE, MOVE_NONE, MOVE_NONE, - MOVE_NONE, depth); + MovePicker mp = MovePicker(pos, false, MOVE_NONE, EmptySearchStack, depth, &ei); Move move; int moveCount = 0; Bitboard dcCandidates = mp.discovered_check_candidates(); bool isCheck = pos.is_check(); + bool pvNode = (beta - alpha != 1); + bool enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; // Loop through the moves until no moves remain or a beta cutoff // occurs. @@ -1396,20 +1389,17 @@ namespace { { assert(move_is_ok(move)); - bool moveIsCheck = pos.move_is_check(move, dcCandidates); - bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); - moveCount++; ss[ply].currentMove = move; // Futility pruning if ( UseQSearchFutilityPruning + && enoughMaterial && !isCheck - && !moveIsCheck + && !pvNode && !move_promotion(move) - && !moveIsPassedPawnPush - && beta - alpha == 1 - && pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame) + && !pos.move_is_check(move, dcCandidates) + && !pos.move_is_passed_pawn_push(move)) { Value futilityValue = staticValue + Max(pos.midgame_value_of_piece_on(move_to(move)), @@ -1425,7 +1415,7 @@ namespace { } } - // Don't search captures and checks with negative SEE values. + // Don't search captures and checks with negative SEE values if ( !isCheck && !move_promotion(move) && (pos.midgame_value_of_piece_on(move_from(move)) > @@ -1463,6 +1453,13 @@ namespace { // Update transposition table TT.store(pos, value_to_tt(bestValue, ply), depth, MOVE_NONE, VALUE_TYPE_EXACT); + // Update killers only for good check moves + Move m = ss[ply].currentMove; + if (alpha >= beta && ok_to_history(pos, m)) // Only non capture moves are considered + { + // Wrong to update history when depth is <= 0 + update_killers(m, ss[ply]); + } return bestValue; } @@ -1497,7 +1494,6 @@ namespace { bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates); bool moveIsCapture = pos.move_is_capture(move); - bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); lock_grab(&(sp->lock)); int moveCount = ++sp->moves; @@ -1506,14 +1502,14 @@ namespace { ss[sp->ply].currentMove = move; // Decide the new search depth. - Depth ext = extension(pos, move, false, moveIsCheck, false, false); + bool dangerous; + Depth ext = extension(pos, move, false, moveIsCheck, false, false, &dangerous); Depth newDepth = sp->depth - OnePly + ext; // Prune? if ( useFutilityPruning - && ext == Depth(0) + && !dangerous && !moveIsCapture - && !moveIsPassedPawnPush && !move_promotion(move) && moveCount >= 2 + int(sp->depth) && ok_to_prune(pos, move, ss[sp->ply].threatMove, sp->depth)) @@ -1525,14 +1521,12 @@ namespace { // Try to reduce non-pv search depth by one ply if move seems not problematic, // if the move fails high will be re-searched at full depth. - if ( ext == Depth(0) + if ( !dangerous && moveCount >= LMRNonPVMoves && !moveIsCapture - && !moveIsPassedPawnPush && !move_promotion(move) && !move_is_castle(move) - && move != ss[sp->ply].killer1 - && move != ss[sp->ply].killer2) + && !move_is_killer(move, ss[sp->ply])) { ss[sp->ply].reduction = OnePly; value = -search(pos, ss, -(sp->beta-1), newDepth - OnePly, sp->ply+1, true, threadID); @@ -1610,7 +1604,6 @@ namespace { { bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates); bool moveIsCapture = pos.move_is_capture(move); - bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); assert(move_is_ok(move)); @@ -1624,7 +1617,8 @@ namespace { ss[sp->ply].currentMove = move; // Decide the new search depth. - Depth ext = extension(pos, move, true, moveIsCheck, false, false); + bool dangerous; + Depth ext = extension(pos, move, true, moveIsCheck, false, false, &dangerous); Depth newDepth = sp->depth - OnePly + ext; // Make and search the move. @@ -1633,14 +1627,12 @@ namespace { // Try to reduce non-pv search depth by one ply if move seems not problematic, // if the move fails high will be re-searched at full depth. - if ( ext == Depth(0) + if ( !dangerous && moveCount >= LMRPVMoves && !moveIsCapture - && !moveIsPassedPawnPush && !move_promotion(move) && !move_is_castle(move) - && move != ss[sp->ply].killer1 - && move != ss[sp->ply].killer2) + && !move_is_killer(move, ss[sp->ply])) { ss[sp->ply].reduction = OnePly; value = -search(pos, ss, -sp->alpha, newDepth - OnePly, sp->ply+1, true, threadID); @@ -1871,17 +1863,28 @@ namespace { // init_search_stack() initializes a search stack at the beginning of a // new search from the root. + void init_search_stack(SearchStack& ss) { + + ss.pv[0] = MOVE_NONE; + ss.pv[1] = MOVE_NONE; + ss.currentMove = MOVE_NONE; + ss.threatMove = MOVE_NONE; + ss.reduction = Depth(0); + for (int j = 0; j < KILLER_MAX; j++) + ss.killers[j] = MOVE_NONE; + } void init_search_stack(SearchStack ss[]) { - for(int i = 0; i < 3; i++) { - ss[i].pv[i] = MOVE_NONE; - ss[i].pv[i+1] = MOVE_NONE; - ss[i].currentMove = MOVE_NONE; - ss[i].mateKiller = MOVE_NONE; - ss[i].killer1 = MOVE_NONE; - ss[i].killer2 = MOVE_NONE; - ss[i].threatMove = MOVE_NONE; - ss[i].reduction = Depth(0); + + for (int i = 0; i < 3; i++) + { + ss[i].pv[i] = MOVE_NONE; + ss[i].pv[i+1] = MOVE_NONE; + ss[i].currentMove = MOVE_NONE; + ss[i].threatMove = MOVE_NONE; + ss[i].reduction = Depth(0); + for (int j = 0; j < KILLER_MAX; j++) + ss[i].killers[j] = MOVE_NONE; } } @@ -1905,13 +1908,13 @@ namespace { NodesSincePoll = 0; } } - ss[ply].pv[ply] = ss[ply].pv[ply+1] = ss[ply].currentMove = MOVE_NONE; ss[ply+2].mateKiller = MOVE_NONE; - ss[ply+2].killer1 = ss[ply+2].killer2 = MOVE_NONE; ss[ply].threatMove = MOVE_NONE; ss[ply].reduction = Depth(0); ss[ply].currentMoveCaptureValue = Value(0); + for (int j = 0; j < KILLER_MAX; j++) + ss[ply+2].killers[j] = MOVE_NONE; if(Threads[threadID].printCurrentLine) print_current_line(ss, ply, threadID); @@ -2014,14 +2017,32 @@ namespace { } + // move_is_killer() checks if the given move is among the + // killer moves of that ply. + + bool move_is_killer(Move m, const SearchStack& ss) { + + const Move* k = ss.killers; + for (int i = 0; i < KILLER_MAX; i++, k++) + if (*k == m) + return true; + + return false; + } + + // extension() decides whether a move should be searched with normal depth, // or with extended depth. Certain classes of moves (checking moves, in - // particular) are searched with bigger depth than ordinary moves. + // particular) are searched with bigger depth than ordinary moves and in + // any case are marked as 'dangerous'. Note that also if a move is not + // extended, as example because the corresponding UCI option is set to zero, + // the move is marked as 'dangerous' so, at least, we avoid to prune it. - Depth extension(const Position &pos, Move m, bool pvNode, - bool check, bool singleReply, bool mateThreat) { + Depth extension(const Position &pos, Move m, bool pvNode, bool check, + bool singleReply, bool mateThreat, bool* dangerous) { Depth result = Depth(0); + *dangerous = check || singleReply || mateThreat; if (check) result += CheckExtension[pvNode]; @@ -2029,26 +2050,37 @@ namespace { if (singleReply) result += SingleReplyExtension[pvNode]; + if (mateThreat) + result += MateThreatExtension[pvNode]; + if (pos.move_is_pawn_push_to_7th(m)) + { result += PawnPushTo7thExtension[pvNode]; - + *dangerous = true; + } if (pos.move_is_passed_pawn_push(m)) + { result += PassedPawnExtension[pvNode]; + *dangerous = true; + } - if (mateThreat) - result += MateThreatExtension[pvNode]; - - if ( pos.midgame_value_of_piece_on(move_to(m)) >= RookValueMidgame - && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) - - pos.midgame_value_of_piece_on(move_to(m)) == Value(0)) + if ( pos.midgame_value_of_piece_on(move_to(m)) >= RookValueMidgame + && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) + - pos.midgame_value_of_piece_on(move_to(m)) == Value(0)) && !move_promotion(m)) + { result += PawnEndgameExtension[pvNode]; - + *dangerous = true; + } + if ( pvNode && pos.move_is_capture(m) && pos.type_of_piece_on(move_to(m)) != PAWN && pos.see(m) >= 0) + { result += OnePly/2; + *dangerous = true; + } return Min(result, OnePly); } @@ -2137,13 +2169,11 @@ namespace { // ok_to_history() returns true if a move m can be stored - // in history. Should be a non capturing move. + // in history. Should be a non capturing move nor a promotion. bool ok_to_history(const Position& pos, Move m) { - return pos.square_is_empty(move_to(m)) - && !move_promotion(m) - && !move_is_ep(m); + return !pos.move_is_capture(m) && !move_promotion(m); } @@ -2156,8 +2186,26 @@ namespace { H.success(pos.piece_on(move_from(m)), m, depth); for (int i = 0; i < moveCount - 1; i++) - if (ok_to_history(pos, movesSearched[i]) && m != movesSearched[i]) + { + assert(m != movesSearched[i]); + if (ok_to_history(pos, movesSearched[i])) H.failure(pos.piece_on(move_from(movesSearched[i])), movesSearched[i]); + } + } + + + // update_killers() add a good move that produced a beta-cutoff + // among the killer moves of that ply. + + void update_killers(Move m, SearchStack& ss) { + + if (m == ss.killers[0]) + return; + + for (int i = KILLER_MAX - 1; i > 0; i--) + ss.killers[i] = ss.killers[i - 1]; + + ss.killers[0] = m; } // fail_high_ply_1() checks if some thread is currently resolving a fail