X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=46e93d071e012ed2e0c0daa4f014638e7c538d48;hp=31e8b0b661f46392453d097c39e137ba52bead57;hb=d490bb99734bd6e2f8a0a352d2f3f1ba264ece66;hpb=3627348e2b4633604a878b0e5397acb6218a6afc diff --git a/src/search.cpp b/src/search.cpp index 31e8b0b6..46e93d07 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -132,19 +132,6 @@ namespace { Move pv[3]; }; - // skip half of the plies in blocks depending on the helper thread idx. - bool skip_ply(int idx, int ply) { - - idx = (idx - 1) % 20 + 1; // cycle after 20 threads. - - // number of successive plies to skip, depending on idx. - int ones = 1; - while (ones * (ones + 1) < idx) - ones++; - - return ((ply + idx - 1) / ones - ones) % 2 == 0; - } - EasyMoveManager EasyMove; Value DrawValue[COLOR_NB]; @@ -321,6 +308,9 @@ void MainThread::search() { std::cout << sync_endl; } +// Sizes and phases of the skip-blocks, used for distributing search depths across the threads. +static int skipsize[20] = {1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4}; +static int phase [20] = {0, 1, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7}; // Thread::search() is the main iterative deepening loop. It calls search() // repeatedly with increasing depth until the allocated thinking time has been @@ -334,6 +324,8 @@ void Thread::search() { MainThread* mainThread = (this == Threads.main() ? Threads.main() : nullptr); std::memset(ss-4, 0, 7 * sizeof(Stack)); + for(int i = -4; i < 0; i++) + (ss+i)->counterMoves = &this->counterMoveHistory[NO_PIECE][0]; // use as sentinel. bestValue = delta = alpha = -VALUE_INFINITE; beta = VALUE_INFINITE; @@ -358,13 +350,15 @@ void Thread::search() { multiPV = std::min(multiPV, rootMoves.size()); + int hIdx = (idx - 1) % 20; // helper index, cycle after 20 threads + // Iterative deepening loop until requested to stop or the target depth is reached while ( (rootDepth += ONE_PLY) < DEPTH_MAX && !Signals.stop && (!Limits.depth || Threads.main()->rootDepth / ONE_PLY <= Limits.depth)) { - // skip plies for helper threads - if (idx && skip_ply(idx, rootDepth / ONE_PLY + rootPos.game_ply())) + // skip half of the plies in blocks depending on game ply and helper index. + if (idx && ((rootDepth / ONE_PLY + rootPos.game_ply() + phase[hIdx]) / skipsize[hIdx]) % 2) continue; // Age out PV variability metric @@ -601,7 +595,7 @@ namespace { assert(0 <= ss->ply && ss->ply < MAX_PLY); ss->currentMove = (ss+1)->excludedMove = bestMove = MOVE_NONE; - ss->counterMoves = nullptr; + ss->counterMoves = &thisThread->counterMoveHistory[NO_PIECE][0]; (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE; Square prevSq = to_sq((ss-1)->currentMove); @@ -737,14 +731,15 @@ namespace { && (ss->staticEval >= beta - 35 * (depth / ONE_PLY - 6) || depth >= 13 * ONE_PLY) && pos.non_pawn_material(pos.side_to_move())) { - ss->currentMove = MOVE_NULL; - ss->counterMoves = nullptr; assert(eval - beta >= 0); // Null move dynamic reduction based on depth and value Depth R = ((823 + 67 * depth / ONE_PLY) / 256 + std::min((eval - beta) / PawnValueMg, 3)) * ONE_PLY; + ss->currentMove = MOVE_NULL; + ss->counterMoves = &thisThread->counterMoveHistory[NO_PIECE][0]; + pos.do_null_move(st); Value nullValue = depth-R < ONE_PLY ? -qsearch(pos, ss+1, -beta, -beta+1) : - search(pos, ss+1, -beta, -beta+1, depth-R, !cutNode, true); @@ -779,8 +774,7 @@ namespace { Depth rdepth = depth - 4 * ONE_PLY; assert(rdepth >= ONE_PLY); - assert((ss-1)->currentMove != MOVE_NONE); - assert((ss-1)->currentMove != MOVE_NULL); + assert(is_ok((ss-1)->currentMove)); MovePicker mp(pos, ttMove, rbeta - ss->staticEval); @@ -789,6 +783,7 @@ namespace { { ss->currentMove = move; ss->counterMoves = &thisThread->counterMoveHistory[pos.moved_piece(move)][to_sq(move)]; + pos.do_move(move, st); value = -search(pos, ss+1, -rbeta, -rbeta+1, rdepth, !cutNode, false); pos.undo_move(move); @@ -814,6 +809,9 @@ moves_loop: // When in check search starts from here const CounterMoveStats* cmh = (ss-1)->counterMoves; const CounterMoveStats* fmh = (ss-2)->counterMoves; const CounterMoveStats* fmh2 = (ss-4)->counterMoves; + const bool cm_ok = is_ok((ss-1)->currentMove); + const bool fm_ok = is_ok((ss-2)->currentMove); + const bool fm2_ok = is_ok((ss-4)->currentMove); MovePicker mp(pos, ttMove, depth, ss); value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc @@ -913,9 +911,9 @@ moves_loop: // When in check search starts from here // Countermoves based pruning if ( lmrDepth < 3 - && (!cmh || (*cmh )[moved_piece][to_sq(move)] < VALUE_ZERO) - && (!fmh || (*fmh )[moved_piece][to_sq(move)] < VALUE_ZERO) - && (!fmh2 || (*fmh2)[moved_piece][to_sq(move)] < VALUE_ZERO || (cmh && fmh))) + && (((*cmh )[moved_piece][to_sq(move)] < VALUE_ZERO) || !cm_ok) + && (((*fmh )[moved_piece][to_sq(move)] < VALUE_ZERO) || !fm_ok) + && (((*fmh2)[moved_piece][to_sq(move)] < VALUE_ZERO) || !fm2_ok || (cm_ok && fm_ok))) continue; // Futility pruning: parent node @@ -975,9 +973,9 @@ moves_loop: // When in check search starts from here && !pos.see_ge(make_move(to_sq(move), from_sq(move)), VALUE_ZERO)) r -= 2 * ONE_PLY; - ss->history = (cmh ? (*cmh )[moved_piece][to_sq(move)] : VALUE_ZERO) - + (fmh ? (*fmh )[moved_piece][to_sq(move)] : VALUE_ZERO) - + (fmh2 ? (*fmh2)[moved_piece][to_sq(move)] : VALUE_ZERO) + ss->history = (*cmh )[moved_piece][to_sq(move)] + + (*fmh )[moved_piece][to_sq(move)] + + (*fmh2)[moved_piece][to_sq(move)] + thisThread->history.get(~pos.side_to_move(), move) - 4000; // Correction factor @@ -1120,7 +1118,7 @@ moves_loop: // When in check search starts from here // Bonus for prior countermove that caused the fail low else if ( depth >= 3 * ONE_PLY && !pos.captured_piece() - && is_ok((ss-1)->currentMove)) + && cm_ok) update_cm_stats(ss-1, pos.piece_on(prevSq), prevSq, stat_bonus(depth)); tte->save(posKey, value_to_tt(bestValue, ss->ply), @@ -1380,18 +1378,9 @@ moves_loop: // When in check search starts from here void update_cm_stats(Stack* ss, Piece pc, Square s, Value bonus) { - CounterMoveStats* cmh = (ss-1)->counterMoves; - CounterMoveStats* fmh1 = (ss-2)->counterMoves; - CounterMoveStats* fmh2 = (ss-4)->counterMoves; - - if (cmh) - cmh->update(pc, s, bonus); - - if (fmh1) - fmh1->update(pc, s, bonus); - - if (fmh2) - fmh2->update(pc, s, bonus); + for (int i : {1, 2, 4}) + if (is_ok((ss-i)->currentMove)) + (ss-i)->counterMoves->update(pc, s, bonus); } @@ -1411,7 +1400,7 @@ moves_loop: // When in check search starts from here thisThread->history.update(c, move, bonus); update_cm_stats(ss, pos.moved_piece(move), to_sq(move), bonus); - if ((ss-1)->counterMoves) + if (is_ok((ss-1)->currentMove)) { Square prevSq = to_sq((ss-1)->currentMove); thisThread->counterMoves.update(pos.piece_on(prevSq), prevSq, move);