X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=b22e82fe577ffbbd480fb11985956f0cbbbcdad2;hp=4cce6a9171de9139d8e51e717d966af819912492;hb=325dedc7da98cb530e2f758894ac49ac1befef0f;hpb=e5ffe9959c40a5ec6c4bca83a5a48070cae7fa5b diff --git a/src/search.cpp b/src/search.cpp index 4cce6a91..b22e82fe 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -270,7 +270,7 @@ namespace { if (moveIsCheck && pos.see_sign(m) >= 0) result += CheckExtension[PvNode]; - if (piece_type(pos.piece_on(move_from(m))) == PAWN) + if (type_of(pos.piece_on(move_from(m))) == PAWN) { Color c = pos.side_to_move(); if (relative_rank(c, move_to(m)) == RANK_7) @@ -286,10 +286,10 @@ namespace { } if ( captureOrPromotion - && piece_type(pos.piece_on(move_to(m))) != PAWN + && type_of(pos.piece_on(move_to(m))) != PAWN && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) - piece_value_midgame(pos.piece_on(move_to(m))) == VALUE_ZERO) - && !move_is_special(m)) + && !is_special(m)) { result += PawnEndgameExtension[PvNode]; *dangerous = true; @@ -363,7 +363,7 @@ int64_t perft(Position& pos, Depth depth) { bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { - static Book book; + static Book book; // Define static to initialize the PRNG only once // Initialize global search-related variables StopOnPonderhit = StopRequest = QuitRequest = AspirationFailLow = false; @@ -391,7 +391,7 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { if (Options["Book File"].value() != book.name()) book.open(Options["Book File"].value()); - Move bookMove = book.get_move(pos, Options["Best Book Move"].value()); + Move bookMove = book.probe(pos, Options["Best Book Move"].value()); if (bookMove != MOVE_NONE) { if (Limits.ponder) @@ -778,8 +778,18 @@ namespace { : can_return_tt(tte, depth, beta, ss->ply))) { TT.refresh(tte); - ss->bestMove = ttMove; // Can be MOVE_NONE - return value_from_tt(tte->value(), ss->ply); + ss->bestMove = move = ttMove; // Can be MOVE_NONE + value = value_from_tt(tte->value(), ss->ply); + + if ( value >= beta + && move + && !pos.is_capture_or_promotion(move) + && move != ss->killers[0]) + { + ss->killers[1] = ss->killers[0]; + ss->killers[0] = move; + } + return value; } // Step 5. Evaluate the position statically and update parent's gain statistics @@ -962,7 +972,7 @@ split_point_start: // At split points actual search starts from here && (move = mp.get_next_move()) != MOVE_NONE && !thread.cutoff_occurred()) { - assert(move_is_ok(move)); + assert(is_ok(move)); if (move == excludedMove) continue; @@ -1003,7 +1013,7 @@ split_point_start: // At split points actual search starts from here // At Root and at first iteration do a PV search on all the moves to score root moves isPvMove = (PvNode && moveCount <= (RootNode && depth <= ONE_PLY ? MAX_MOVES : 1)); givesCheck = pos.move_gives_check(move, ci); - captureOrPromotion = pos.move_is_capture_or_promotion(move); + captureOrPromotion = pos.is_capture_or_promotion(move); // Step 12. Decide the new search depth ext = extension(pos, move, captureOrPromotion, givesCheck, &dangerous); @@ -1043,7 +1053,7 @@ split_point_start: // At split points actual search starts from here && !inCheck && !dangerous && move != ttMove - && !move_is_castle(move)) + && !is_castle(move)) { // Move count based pruning if ( moveCount >= futility_move_count(depth) @@ -1117,7 +1127,7 @@ split_point_start: // At split points actual search starts from here if ( depth > 3 * ONE_PLY && !captureOrPromotion && !dangerous - && !move_is_castle(move) + && !is_castle(move) && ss->killers[0] != move && ss->killers[1] != move && (ss->reduction = reduction(depth, moveCount)) != DEPTH_ZERO) @@ -1242,7 +1252,7 @@ split_point_start: // At split points actual search starts from here // Update killers and history only for non capture moves that fails high if ( bestValue >= beta - && !pos.move_is_capture_or_promotion(move)) + && !pos.is_capture_or_promotion(move)) { if (move != ss->killers[0]) { @@ -1362,7 +1372,7 @@ split_point_start: // At split points actual search starts from here while ( bestValue < beta && (move = mp.get_next_move()) != MOVE_NONE) { - assert(move_is_ok(move)); + assert(is_ok(move)); givesCheck = pos.move_gives_check(move, ci); @@ -1372,12 +1382,12 @@ split_point_start: // At split points actual search starts from here && !givesCheck && move != ttMove && enoughMaterial - && !move_is_promotion(move) - && !pos.move_is_passed_pawn_push(move)) + && !is_promotion(move) + && !pos.is_passed_pawn_push(move)) { futilityValue = futilityBase + piece_value_endgame(pos.piece_on(move_to(move))) - + (move_is_ep(move) ? PawnValueEndgame : VALUE_ZERO); + + (is_enpassant(move) ? PawnValueEndgame : VALUE_ZERO); if (futilityValue < beta) { @@ -1398,14 +1408,14 @@ split_point_start: // At split points actual search starts from here evasionPrunable = !PvNode && inCheck && bestValue > VALUE_MATED_IN_PLY_MAX - && !pos.move_is_capture(move) + && !pos.is_capture(move) && !pos.can_castle(pos.side_to_move()); // Don't search moves with negative SEE values if ( !PvNode && (!inCheck || evasionPrunable) && move != ttMove - && !move_is_promotion(move) + && !is_promotion(move) && pos.see_sign(move) < 0) continue; @@ -1414,7 +1424,7 @@ split_point_start: // At split points actual search starts from here && !inCheck && givesCheck && move != ttMove - && !pos.move_is_capture_or_promotion(move) + && !pos.is_capture_or_promotion(move) && ss->eval + PawnValueMidgame / 4 < beta && !check_is_dangerous(pos, move, futilityBase, beta, &bestValue)) { @@ -1483,7 +1493,7 @@ split_point_start: // At split points actual search starts from here from = move_from(move); to = move_to(move); - them = opposite_color(pos.side_to_move()); + them = flip(pos.side_to_move()); ksq = pos.king_square(them); kingAtt = pos.attacks_from(ksq); pc = pos.piece_on(from); @@ -1499,7 +1509,7 @@ split_point_start: // At split points actual search starts from here return true; // Rule 2. Queen contact check is very dangerous - if ( piece_type(pc) == QUEEN + if ( type_of(pc) == QUEEN && bit_is_set(kingAtt, to)) return true; @@ -1538,8 +1548,8 @@ split_point_start: // At split points actual search starts from here Piece p1, p2; Square ksq; - assert(m1 && move_is_ok(m1)); - assert(m2 && move_is_ok(m2)); + assert(is_ok(m1)); + assert(is_ok(m2)); // Case 1: The moving piece is the same in both moves f2 = move_from(m2); @@ -1614,10 +1624,10 @@ split_point_start: // At split points actual search starts from here bool connected_threat(const Position& pos, Move m, Move threat) { - assert(move_is_ok(m)); - assert(threat && move_is_ok(threat)); - assert(!pos.move_is_capture_or_promotion(m)); - assert(!pos.move_is_passed_pawn_push(m)); + assert(is_ok(m)); + assert(is_ok(threat)); + assert(!pos.is_capture_or_promotion(m)); + assert(!pos.is_passed_pawn_push(m)); Square mfrom, mto, tfrom, tto; @@ -1632,9 +1642,9 @@ split_point_start: // At split points actual search starts from here // Case 2: If the threatened piece has value less than or equal to the // value of the threatening piece, don't prune moves which defend it. - if ( pos.move_is_capture(threat) + if ( pos.is_capture(threat) && ( piece_value_midgame(pos.piece_on(tfrom)) >= piece_value_midgame(pos.piece_on(tto)) - || piece_type(pos.piece_on(tfrom)) == KING) + || type_of(pos.piece_on(tfrom)) == KING) && pos.move_attacks_square(m, tto)) return true; @@ -1712,7 +1722,7 @@ split_point_start: // At split points actual search starts from here && before != VALUE_NONE && after != VALUE_NONE && pos.captured_piece_type() == PIECE_TYPE_NONE - && !move_is_special(m)) + && !is_special(m)) H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); } @@ -2073,7 +2083,7 @@ split_point_start: // At split points actual search starts from here int ply = 1; Move m = pv[0]; - assert(m != MOVE_NONE && pos.move_is_pl(m)); + assert(m != MOVE_NONE && pos.is_pseudo_legal(m)); pv.clear(); pv.push_back(m); @@ -2081,7 +2091,7 @@ split_point_start: // At split points actual search starts from here while ( (tte = TT.probe(pos.get_key())) != NULL && tte->move() != MOVE_NONE - && pos.move_is_pl(tte->move()) + && pos.is_pseudo_legal(tte->move()) && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces()) && ply < PLY_MAX && (!pos.is_draw() || ply < 2)) @@ -2107,7 +2117,7 @@ split_point_start: // At split points actual search starts from here Value v, m = VALUE_NONE; int ply = 0; - assert(pv[0] != MOVE_NONE && pos.move_is_pl(pv[0])); + assert(pv[0] != MOVE_NONE && pos.is_pseudo_legal(pv[0])); do { k = pos.get_key(); @@ -2128,13 +2138,11 @@ split_point_start: // At split points actual search starts from here } // namespace -// Little helper used by idle_loop() to check that all the slaves of a -// master thread have finished searching. +// Little helper used by idle_loop() to check that all the slave threads of a +// split point have finished searching. static bool all_slaves_finished(SplitPoint* sp) { - assert(sp); - for (int i = 0; i < Threads.size(); i++) if (sp->is_slave[i]) return false; @@ -2155,21 +2163,20 @@ void Thread::idle_loop(SplitPoint* sp) { // instead of wasting CPU time polling for work. while ( do_sleep || do_terminate - || (Threads.use_sleeping_threads() && state == Thread::AVAILABLE)) + || (Threads.use_sleeping_threads() && !is_searching)) { assert((!sp && threadID) || Threads.use_sleeping_threads()); - // Grab the lock to avoid races with Thread::wake_up() - lock_grab(&sleepLock); - // Slave thread should exit as soon as do_terminate flag raises if (do_terminate) { assert(!sp); - lock_release(&sleepLock); return; } + // Grab the lock to avoid races with Thread::wake_up() + lock_grab(&sleepLock); + // If we are master and all slaves have finished don't go to sleep if (sp && all_slaves_finished(sp)) { @@ -2181,19 +2188,17 @@ void Thread::idle_loop(SplitPoint* sp) { // particular we need to avoid a deadlock in case a master thread has, // in the meanwhile, allocated us and sent the wake_up() call before we // had the chance to grab the lock. - if (do_sleep || state == Thread::AVAILABLE) + if (do_sleep || !is_searching) cond_wait(&sleepCond, &sleepLock); lock_release(&sleepLock); } // If this thread has been assigned work, launch a search - if (state == Thread::WORKISWAITING) + if (is_searching) { assert(!do_terminate); - state = Thread::SEARCHING; - // Copy split point position and search stack and call search() SearchStack ss[PLY_MAX_PLUS_2]; SplitPoint* tsp = splitPoint; @@ -2211,15 +2216,15 @@ void Thread::idle_loop(SplitPoint* sp) { else assert(false); - assert(state == Thread::SEARCHING); + assert(is_searching); - state = Thread::AVAILABLE; + is_searching = false; // 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 != tsp->master - && Threads[tsp->master].state == Thread::AVAILABLE) + && !Threads[tsp->master].is_searching) Threads[tsp->master].wake_up(); }