#include "movepick.h"
#include "position.h"
#include "search.h"
-#include "timeman.h"
#include "thread.h"
+#include "timeman.h"
#include "tt.h"
#include "uci.h"
#include "syzygy/tbprobe.h"
enum NodeType { NonPV, PV };
// Sizes and phases of the skip-blocks, used for distributing search depths across the threads
- const int SkipSize[] = { 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 };
- const int SkipPhase[] = { 0, 1, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7 };
+ constexpr int SkipSize[] = { 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 };
+ constexpr int SkipPhase[] = { 0, 1, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7 };
// Razor and futility margins
- const int RazorMargin1 = 590;
- const int RazorMargin2 = 604;
- Value futility_margin(Depth d) { return Value(150 * d / ONE_PLY); }
+ constexpr int RazorMargin[] = {0, 590, 604};
+ Value futility_margin(Depth d, bool improving) {
+ return Value((175 - 50 * improving) * d / ONE_PLY);
+ }
// Futility and reductions lookup tables, initialized at startup
int FutilityMoveCounts[2][16]; // [improving][depth]
template <NodeType NT>
Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode, bool skipEarlyPruning);
- template <NodeType NT, bool InCheck>
+ template <NodeType NT>
Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth = DEPTH_ZERO);
Value value_to_tt(Value v, int ply);
ct = Options["Contempt"] * PawnValueEg / 100; // From centipawns
// Adjust contempt based on current bestValue (dynamic contempt)
- int sign = (bestValue > 0) - (bestValue < 0);
- ct += bestValue > 500 ? 70 :
- bestValue < -500 ? -70 :
- bestValue / 10 + sign * int(std::round(3.22 * log(1 + abs(bestValue))));
+ ct += int(std::round(48 * atan(float(bestValue) / 128)));
Eval::Contempt = (us == WHITE ? make_score(ct, ct / 2)
: -make_score(ct, ct / 2));
timeReduction *= 1.25;
// Use part of the gained time from a previous stable move for the current move
- double unstablePvFactor = 1.0 + mainThread->bestMoveChanges;
- unstablePvFactor *= std::pow(mainThread->previousTimeReduction, 0.528) / timeReduction;
+ double bestMoveInstability = 1.0 + mainThread->bestMoveChanges;
+ bestMoveInstability *= std::pow(mainThread->previousTimeReduction, 0.528) / timeReduction;
// Stop the search if we have only one legal move, or if available time elapsed
if ( rootMoves.size() == 1
- || Time.elapsed() > Time.optimum() * unstablePvFactor * improvingFactor / 581)
+ || Time.elapsed() > Time.optimum() * bestMoveInstability * improvingFactor / 581)
{
// If we are allowed to ponder do not stop the search now but
// keep pondering until the GUI sends "ponderhit" or "stop".
template <NodeType NT>
Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode, bool skipEarlyPruning) {
- const bool PvNode = NT == PV;
+ // Use quiescence search when needed
+ if (depth < ONE_PLY)
+ return qsearch<NT>(pos, ss, alpha, beta);
+
+ constexpr bool PvNode = NT == PV;
const bool rootNode = PvNode && ss->ply == 0;
assert(-VALUE_INFINITE <= alpha && alpha < beta && beta <= VALUE_INFINITE);
if (inCheck)
{
ss->staticEval = eval = VALUE_NONE;
+ improving = false;
goto moves_loop;
}
else if (ttHit)
ss->staticEval, TT.generation());
}
+ improving = ss->staticEval >= (ss-2)->staticEval
+ ||(ss-2)->staticEval == VALUE_NONE;
+
if (skipEarlyPruning || !pos.non_pawn_material(pos.side_to_move()))
goto moves_loop;
// Step 7. Razoring (skipped when in check)
if ( !PvNode
- && depth <= 2 * ONE_PLY)
+ && depth < 3 * ONE_PLY
+ && eval <= alpha - RazorMargin[depth / ONE_PLY])
{
- if ( depth == ONE_PLY
- && eval + RazorMargin1 <= alpha)
- return qsearch<NonPV, false>(pos, ss, alpha, alpha+1);
-
- else if (eval + RazorMargin2 <= alpha)
- {
- Value ralpha = alpha - RazorMargin2;
- Value v = qsearch<NonPV, false>(pos, ss, ralpha, ralpha+1);
-
- if (v <= ralpha)
- return v;
- }
+ Value ralpha = alpha - (depth >= 2 * ONE_PLY) * RazorMargin[depth / ONE_PLY];
+ Value v = qsearch<NonPV>(pos, ss, ralpha, ralpha+1);
+ if (depth < 2 * ONE_PLY || v <= ralpha)
+ return v;
}
// Step 8. Futility pruning: child node (skipped when in check)
if ( !rootNode
&& depth < 7 * ONE_PLY
- && eval - futility_margin(depth) >= beta
+ && eval - futility_margin(depth, improving) >= beta
&& eval < VALUE_KNOWN_WIN) // Do not return unproven wins
return eval;
ss->contHistory = thisThread->contHistory[NO_PIECE][0].get();
pos.do_null_move(st);
- Value nullValue = depth-R < ONE_PLY ? -qsearch<NonPV, false>(pos, ss+1, -beta, -beta+1)
- : - search<NonPV>(pos, ss+1, -beta, -beta+1, depth-R, !cutNode, true);
+
+ Value nullValue = -search<NonPV>(pos, ss+1, -beta, -beta+1, depth-R, !cutNode, true);
+
pos.undo_null_move();
if (nullValue >= beta)
thisThread->nmp_ply = ss->ply + 3 * (depth-R) / 4;
thisThread->nmp_odd = ss->ply % 2;
- Value v = depth-R < ONE_PLY ? qsearch<NonPV, false>(pos, ss, beta-1, beta)
- : search<NonPV>(pos, ss, beta-1, beta, depth-R, false, true);
+ Value v = search<NonPV>(pos, ss, beta-1, beta, depth-R, false, true);
thisThread->nmp_odd = thisThread->nmp_ply = 0;
{
assert(is_ok((ss-1)->currentMove));
- Value rbeta = std::min(beta + 200, VALUE_INFINITE);
+ Value rbeta = std::min(beta + 216 - 48 * improving, VALUE_INFINITE);
MovePicker mp(pos, ttMove, rbeta - ss->staticEval, &thisThread->captureHistory);
int probCutCount = 0;
while ( (move = mp.next_move()) != MOVE_NONE
- && probCutCount < depth / ONE_PLY - 3)
+ && probCutCount < 3)
if (pos.legal(move))
{
probCutCount++;
pos.do_move(move, st);
- // Perform a preliminary search at depth 1 to verify that the move holds.
- // We will only do this search if the depth is not 5, thus avoiding two
- // searches at depth 1 in a row.
- if (depth != 5 * ONE_PLY)
- value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, ONE_PLY, !cutNode, true);
+ // Perform a preliminary qsearch to verify that the move holds
+ value = -qsearch<NonPV>(pos, ss+1, -rbeta, -rbeta+1);
- // If the first search was skipped or was performed and held, perform
- // the regular search.
- if (depth == 5 * ONE_PLY || value >= rbeta)
+ // If the qsearch held perform the regular search
+ if (value >= rbeta)
value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, depth - 4 * ONE_PLY, !cutNode, false);
pos.undo_move(move);
// Step 11. Internal iterative deepening (skipped when in check)
if ( depth >= 6 * ONE_PLY
&& !ttMove
- && (PvNode || ss->staticEval + 256 >= beta))
+ && (PvNode || ss->staticEval + 128 >= beta))
{
Depth d = 3 * depth / 4 - 2 * ONE_PLY;
search<NT>(pos, ss, alpha, beta, d, cutNode, true);
MovePicker mp(pos, ttMove, depth, &thisThread->mainHistory, &thisThread->captureHistory, contHist, countermove, ss->killers);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
- improving = ss->staticEval >= (ss-2)->staticEval
- /* || ss->staticEval == VALUE_NONE Already implicit in the previous condition */
- ||(ss-2)->staticEval == VALUE_NONE;
singularExtensionNode = !rootNode
&& depth >= 8 * ONE_PLY
// Step 17. Full depth search when LMR is skipped or fails high
if (doFullDepthSearch)
- value = newDepth < ONE_PLY ?
- givesCheck ? -qsearch<NonPV, true>(pos, ss+1, -(alpha+1), -alpha)
- : -qsearch<NonPV, false>(pos, ss+1, -(alpha+1), -alpha)
- : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode, false);
+ value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode, false);
// For PV nodes only, do a full PV search on the first move or after a fail
// high (in the latter case search only if value < beta), otherwise let the
(ss+1)->pv = pv;
(ss+1)->pv[0] = MOVE_NONE;
- value = newDepth < ONE_PLY ?
- givesCheck ? -qsearch<PV, true>(pos, ss+1, -beta, -alpha)
- : -qsearch<PV, false>(pos, ss+1, -beta, -alpha)
- : - search<PV>(pos, ss+1, -beta, -alpha, newDepth, false, false);
+ value = -search<PV>(pos, ss+1, -beta, -alpha, newDepth, false, false);
}
// Step 18. Undo move
// qsearch() is the quiescence search function, which is called by the main
// search function with depth zero, or recursively with depth less than ONE_PLY.
-
- template <NodeType NT, bool InCheck>
+ template <NodeType NT>
Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) {
- const bool PvNode = NT == PV;
+ constexpr bool PvNode = NT == PV;
assert(alpha >= -VALUE_INFINITE && alpha < beta && beta <= VALUE_INFINITE);
assert(PvNode || (alpha == beta - 1));
assert(depth <= DEPTH_ZERO);
assert(depth / ONE_PLY * ONE_PLY == depth);
- assert(InCheck == bool(pos.checkers()));
Move pv[MAX_PLY+1];
StateInfo st;
Move ttMove, move, bestMove;
Depth ttDepth;
Value bestValue, value, ttValue, futilityValue, futilityBase, oldAlpha;
- bool ttHit, givesCheck, evasionPrunable;
+ bool ttHit, inCheck, givesCheck, evasionPrunable;
int moveCount;
if (PvNode)
(ss+1)->ply = ss->ply + 1;
ss->currentMove = bestMove = MOVE_NONE;
+ inCheck = pos.checkers();
moveCount = 0;
// Check for an immediate draw or maximum ply reached
if ( pos.is_draw(ss->ply)
|| ss->ply >= MAX_PLY)
- return (ss->ply >= MAX_PLY && !InCheck) ? evaluate(pos) : VALUE_DRAW;
+ return (ss->ply >= MAX_PLY && !inCheck) ? evaluate(pos) : VALUE_DRAW;
assert(0 <= ss->ply && ss->ply < MAX_PLY);
// Decide whether or not to include checks: this fixes also the type of
// TT entry depth that we are going to use. Note that in qsearch we use
// only two types of depth in TT: DEPTH_QS_CHECKS or DEPTH_QS_NO_CHECKS.
- ttDepth = InCheck || depth >= DEPTH_QS_CHECKS ? DEPTH_QS_CHECKS
+ ttDepth = inCheck || depth >= DEPTH_QS_CHECKS ? DEPTH_QS_CHECKS
: DEPTH_QS_NO_CHECKS;
// Transposition table lookup
posKey = pos.key();
return ttValue;
// Evaluate the position statically
- if (InCheck)
+ if (inCheck)
{
ss->staticEval = VALUE_NONE;
bestValue = futilityBase = -VALUE_INFINITE;
moveCount++;
// Futility pruning
- if ( !InCheck
+ if ( !inCheck
&& !givesCheck
&& futilityBase > -VALUE_KNOWN_WIN
&& !pos.advanced_pawn_push(move))
}
// Detect non-capture evasions that are candidates to be pruned
- evasionPrunable = InCheck
+ evasionPrunable = inCheck
&& (depth != DEPTH_ZERO || moveCount > 2)
&& bestValue > VALUE_MATED_IN_MAX_PLY
&& !pos.capture(move);
// Don't search moves with negative SEE values
- if ( (!InCheck || evasionPrunable)
+ if ( (!inCheck || evasionPrunable)
&& !pos.see_ge(move))
continue;
// Make and search the move
pos.do_move(move, st, givesCheck);
- value = givesCheck ? -qsearch<NT, true>(pos, ss+1, -beta, -alpha, depth - ONE_PLY)
- : -qsearch<NT, false>(pos, ss+1, -beta, -alpha, depth - ONE_PLY);
+ value = -qsearch<NT>(pos, ss+1, -beta, -alpha, depth - ONE_PLY);
pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
// All legal moves have been searched. A special case: If we're in check
// and no legal moves were found, it is checkmate.
- if (InCheck && bestValue == -VALUE_INFINITE)
+ if (inCheck && bestValue == -VALUE_INFINITE)
return mated_in(ss->ply); // Plies to mate from the root
tte->save(posKey, value_to_tt(bestValue, ss->ply),
return;
// When using nodes, ensure checking rate is not lower than 0.1% of nodes
- callsCnt = Limits.nodes ? std::min(4096, int(Limits.nodes / 1024)) : 4096;
+ callsCnt = Limits.nodes ? std::min(1024, int(Limits.nodes / 1024)) : 1024;
static TimePoint lastInfoTime = now();
projects / stockfish / blobdiff