X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=f7718ce442d50136b9508405bc6f3bdb76e34654;hp=fa7052d0dc0c2605201a17bd283742541e1c3c59;hb=55297064268e47103f95a1eb8fd8fe80b6aa2887;hpb=c295599e4ad481f677b14cb0be14174b61ebff81 diff --git a/src/search.cpp b/src/search.cpp index fa7052d0..f7718ce4 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -52,13 +52,17 @@ using std::endl; namespace { - /// Types + // Types enum NodeType { NonPV, PV }; // Set to true to force running with one thread. // Used for debugging SMP code. const bool FakeSplit = false; + // Fast lookup table of sliding pieces indexed by Piece + const bool Slidings[18] = { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1 }; + inline bool piece_is_slider(Piece p) { return Slidings[p]; } + // ThreadsManager class is used to handle all the threads related stuff in search, // init, starting, parking and, the most important, launching a slave thread at a // split point are what this class does. All the access to shared thread data is @@ -75,39 +79,23 @@ namespace { int active_threads() const { return ActiveThreads; } void set_active_threads(int newActiveThreads) { ActiveThreads = newActiveThreads; } - void incrementNodeCounter(int threadID) { threads[threadID].nodes++; } - void incrementBetaCounter(Color us, Depth d, int threadID) { threads[threadID].betaCutOffs[us] += unsigned(d); } - void resetNodeCounters(); - void resetBetaCounters(); - int64_t nodes_searched() const; - void get_beta_counters(Color us, int64_t& our, int64_t& their) const; bool available_thread_exists(int master) const; bool thread_is_available(int slave, int master) const; bool thread_should_stop(int threadID) const; - void wake_sleeping_threads(); - void put_threads_to_sleep(); + void wake_sleeping_thread(int threadID); void idle_loop(int threadID, SplitPoint* sp); template - void split(const Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue, - Depth depth, Move threatMove, bool mateThreat, int* moveCount, MovePicker* mp, bool pvNode); + void split(Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue, + Depth depth, Move threatMove, bool mateThreat, int moveCount, MovePicker* mp, bool pvNode); private: - friend void poll(); - int ActiveThreads; - volatile bool AllThreadsShouldExit, AllThreadsShouldSleep; + volatile bool AllThreadsShouldExit; Thread threads[MAX_THREADS]; - Lock MPLock, WaitLock; - -#if !defined(_MSC_VER) - pthread_cond_t WaitCond; -#else - HANDLE SitIdleEvent[MAX_THREADS]; -#endif - + WaitCondition WaitCond[MAX_THREADS]; }; @@ -117,7 +105,7 @@ namespace { struct RootMove { - RootMove() { nodes = cumulativeNodes = ourBeta = theirBeta = 0ULL; } + RootMove() : mp_score(0), nodes(0) {} // RootMove::operator<() is the comparison function used when // sorting the moves. A move m1 is considered to be better @@ -125,12 +113,13 @@ namespace { // have equal score but m1 has the higher beta cut-off count. bool operator<(const RootMove& m) const { - return score != m.score ? score < m.score : theirBeta <= m.theirBeta; + return score != m.score ? score < m.score : mp_score <= m.mp_score; } Move move; Value score; - int64_t nodes, cumulativeNodes, ourBeta, theirBeta; + int mp_score; + int64_t nodes; Move pv[PLY_MAX_PLUS_2]; }; @@ -143,49 +132,57 @@ namespace { public: RootMoveList(Position& pos, Move searchMoves[]); + Move move(int moveNum) const { return moves[moveNum].move; } + Move move_pv(int moveNum, int i) const { return moves[moveNum].pv[i]; } int move_count() const { return count; } - Move get_move(int moveNum) const { return moves[moveNum].move; } - Value get_move_score(int moveNum) const { return moves[moveNum].score; } + Value move_score(int moveNum) const { return moves[moveNum].score; } + int64_t move_nodes(int moveNum) const { return moves[moveNum].nodes; } + void add_move_nodes(int moveNum, int64_t nodes) { moves[moveNum].nodes += nodes; } void set_move_score(int moveNum, Value score) { moves[moveNum].score = score; } - Move get_move_pv(int moveNum, int i) const { return moves[moveNum].pv[i]; } - int64_t get_move_cumulative_nodes(int moveNum) const { return moves[moveNum].cumulativeNodes; } - void set_move_nodes(int moveNum, int64_t nodes); - void set_beta_counters(int moveNum, int64_t our, int64_t their); void set_move_pv(int moveNum, const Move pv[]); + void score_moves(const Position& pos); void sort(); void sort_multipv(int n); private: - static const int MaxRootMoves = 500; - RootMove moves[MaxRootMoves]; + RootMove moves[MOVES_MAX]; int count; }; + // When formatting a move for std::cout we must know if we are in Chess960 + // or not. To keep using the handy operator<<() on the move the trick is to + // embed this flag in the stream itself. Function-like named enum set960 is + // used as a custom manipulator and the stream internal general-purpose array, + // accessed through ios_base::iword(), is used to pass the flag to the move's + // operator<<() that will use it to properly format castling moves. + enum set960 {}; + + std::ostream& operator<< (std::ostream& os, const set960& m) { + + os.iword(0) = int(m); + return os; + } + + /// Adjustments // Step 6. Razoring // Maximum depth for razoring - const Depth RazorDepth = 4 * OnePly; + const Depth RazorDepth = 4 * ONE_PLY; // Dynamic razoring margin based on depth inline Value razor_margin(Depth d) { return Value(0x200 + 0x10 * int(d)); } - // Step 8. Null move search with verification search - - // Null move margin. A null move search will not be done if the static - // evaluation of the position is more than NullMoveMargin below beta. - const Value NullMoveMargin = Value(0x200); - // Maximum depth for use of dynamic threat detection when null move fails low - const Depth ThreatDepth = 5 * OnePly; + const Depth ThreatDepth = 5 * ONE_PLY; // Step 9. Internal iterative deepening // Minimum depth for use of internal iterative deepening - const Depth IIDDepth[2] = { 8 * OnePly /* non-PV */, 5 * OnePly /* PV */}; + const Depth IIDDepth[2] = { 8 * ONE_PLY /* non-PV */, 5 * ONE_PLY /* PV */}; // At Non-PV nodes we do an internal iterative deepening search // when the static evaluation is bigger then beta - IIDMargin. @@ -199,7 +196,7 @@ namespace { Depth PassedPawnExtension[2], PawnEndgameExtension[2], MateThreatExtension[2]; // Minimum depth for use of singular extension - const Depth SingularExtensionDepth[2] = { 7 * OnePly /* non-PV */, 6 * OnePly /* PV */}; + const Depth SingularExtensionDepth[2] = { 8 * ONE_PLY /* non-PV */, 6 * ONE_PLY /* PV */}; // If the TT move is at least SingularExtensionMargin better then the // remaining ones we will extend it. @@ -211,11 +208,11 @@ namespace { const Value FutilityMarginQS = Value(0x80); // Futility lookup tables (initialized at startup) and their getter functions - int32_t FutilityMarginsMatrix[16][64]; // [depth][moveNumber] + Value FutilityMarginsMatrix[16][64]; // [depth][moveNumber] int FutilityMoveCountArray[32]; // [depth] - inline Value futility_margin(Depth d, int mn) { return Value(d < 7 * OnePly ? FutilityMarginsMatrix[Max(d, 1)][Min(mn, 63)] : 2 * VALUE_INFINITE); } - inline int futility_move_count(Depth d) { return d < 16 * OnePly ? FutilityMoveCountArray[d] : 512; } + inline Value futility_margin(Depth d, int mn) { return d < 7 * ONE_PLY ? FutilityMarginsMatrix[Max(d, 1)][Min(mn, 63)] : 2 * VALUE_INFINITE; } + inline int futility_move_count(Depth d) { return d < 16 * ONE_PLY ? FutilityMoveCountArray[d] : 512; } // Step 14. Reduced search @@ -228,14 +225,17 @@ namespace { // Common adjustments // Search depth at iteration 1 - const Depth InitialDepth = OnePly; + const Depth InitialDepth = ONE_PLY; // Easy move margin. An easy move candidate must be at least this much // better than the second best move. const Value EasyMoveMargin = Value(0x200); - /// Global variables + /// Namespace variables + + // Book object + Book OpeningBook; // Iteration counter int Iteration; @@ -263,7 +263,7 @@ namespace { // Multi-threads related variables Depth MinimumSplitDepth; int MaxThreadsPerSplitPoint; - ThreadsManager TM; + ThreadsManager ThreadsMgr; // Node counters, used only by thread[0] but try to keep in different cache // lines (64 bytes each) from the heavy multi-thread read accessed variables. @@ -275,17 +275,21 @@ namespace { /// Local functions - Value id_loop(const Position& pos, Move searchMoves[]); + Value id_loop(Position& pos, Move searchMoves[]); Value root_search(Position& pos, SearchStack* ss, Move* pv, RootMoveList& rml, Value* alphaPtr, Value* betaPtr); - template + template Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); template Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); template - void sp_search(SplitPoint* sp, int threadID); + inline Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { + + return depth < ONE_PLY ? qsearch(pos, ss, alpha, beta, DEPTH_ZERO, ply) + : search(pos, ss, alpha, beta, depth, ply); + } template Depth extension(const Position& pos, Move m, bool captureOrPromotion, bool moveIsCheck, bool singleEvasion, bool mateThreat, bool* dangerous); @@ -294,7 +298,6 @@ namespace { bool value_is_mate(Value value); Value value_to_tt(Value v, int ply); Value value_from_tt(Value v, int ply); - bool move_is_killer(Move m, SearchStack* ss); bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply); bool connected_threat(const Position& pos, Move m, Move threat); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); @@ -304,8 +307,8 @@ namespace { int current_search_time(); std::string value_to_uci(Value v); - int nps(); - void poll(); + int nps(const Position& pos); + void poll(const Position& pos); void ponderhit(); void wait_for_stop_or_ponderhit(); void init_ss_array(SearchStack* ss, int size); @@ -314,7 +317,7 @@ namespace { void extract_pv_from_tt(const Position& pos, Move bestMove, Move pv[]); #if !defined(_MSC_VER) - void *init_thread(void *threadID); + void* init_thread(void* threadID); #else DWORD WINAPI init_thread(LPVOID threadID); #endif @@ -329,17 +332,16 @@ namespace { /// init_threads(), exit_threads() and nodes_searched() are helpers to /// give accessibility to some TM methods from outside of current file. -void init_threads() { TM.init_threads(); } -void exit_threads() { TM.exit_threads(); } -int64_t nodes_searched() { return TM.nodes_searched(); } +void init_threads() { ThreadsMgr.init_threads(); } +void exit_threads() { ThreadsMgr.exit_threads(); } /// init_search() is called during startup. It initializes various lookup tables void init_search() { - int d; // depth (OnePly == 2) - int hd; // half depth (OnePly == 1) + int d; // depth (ONE_PLY == 2) + int hd; // half depth (ONE_PLY == 1) int mc; // moveCount // Init reductions array @@ -347,17 +349,17 @@ void init_search() { { double pvRed = 0.33 + log(double(hd)) * log(double(mc)) / 4.5; double nonPVRed = 0.33 + log(double(hd)) * log(double(mc)) / 2.25; - ReductionMatrix[PV][hd][mc] = (int8_t) ( pvRed >= 1.0 ? floor( pvRed * int(OnePly)) : 0); - ReductionMatrix[NonPV][hd][mc] = (int8_t) (nonPVRed >= 1.0 ? floor(nonPVRed * int(OnePly)) : 0); + ReductionMatrix[PV][hd][mc] = (int8_t) ( pvRed >= 1.0 ? floor( pvRed * int(ONE_PLY)) : 0); + ReductionMatrix[NonPV][hd][mc] = (int8_t) (nonPVRed >= 1.0 ? floor(nonPVRed * int(ONE_PLY)) : 0); } // Init futility margins array for (d = 1; d < 16; d++) for (mc = 0; mc < 64; mc++) - FutilityMarginsMatrix[d][mc] = 112 * int(log(double(d * d) / 2) / log(2.0) + 1.001) - 8 * mc + 45; + FutilityMarginsMatrix[d][mc] = Value(112 * int(log(double(d * d) / 2) / log(2.0) + 1.001) - 8 * mc + 45); // Init futility move count array for (d = 0; d < 32; d++) - FutilityMoveCountArray[d] = 3 + (1 << (3 * d / 8)); + FutilityMoveCountArray[d] = int(3.001 + 0.25 * pow(d, 2.0)); } @@ -366,26 +368,27 @@ void init_search() { int perft(Position& pos, Depth depth) { + MoveStack mlist[MOVES_MAX]; StateInfo st; - Move move; + Move m; int sum = 0; - MovePicker mp(pos, MOVE_NONE, depth, H); + + // Generate all legal moves + MoveStack* last = generate_moves(pos, mlist); // If we are at the last ply we don't need to do and undo // the moves, just to count them. - if (depth <= OnePly) // Replace with '<' to test also qsearch - { - while (mp.get_next_move()) sum++; - return sum; - } + if (depth <= ONE_PLY) + return int(last - mlist); // Loop through all legal moves CheckInfo ci(pos); - while ((move = mp.get_next_move()) != MOVE_NONE) + for (MoveStack* cur = mlist; cur != last; cur++) { - pos.do_move(move, st, ci, pos.move_is_check(move, ci)); - sum += perft(pos, depth - OnePly); - pos.undo_move(move); + m = cur->move; + pos.do_move(m, st, ci, pos.move_is_check(m, ci)); + sum += perft(pos, depth - ONE_PLY); + pos.undo_move(m); } return sum; } @@ -396,13 +399,12 @@ int perft(Position& pos, Depth depth) /// search-related global variables, and calls root_search(). It returns false /// when a quit command is received during the search. -bool think(const Position& pos, bool infinite, bool ponder, int time[], int increment[], +bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[], int movesToGo, int maxDepth, int maxNodes, int maxTime, Move searchMoves[]) { // Initialize global search variables StopOnPonderhit = AbortSearch = Quit = AspirationFailLow = false; NodesSincePoll = 0; - TM.resetNodeCounters(); SearchStartTime = get_system_time(); ExactMaxTime = maxTime; MaxDepth = maxDepth; @@ -412,12 +414,12 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr UseTimeManagement = !ExactMaxTime && !MaxDepth && !MaxNodes && !InfiniteSearch; // Look for a book move, only during games, not tests - if (UseTimeManagement && get_option_value_bool("OwnBook")) + if (UseTimeManagement && Options["OwnBook"].value()) { - if (get_option_value_string("Book File") != OpeningBook.file_name()) - OpeningBook.open(get_option_value_string("Book File")); + if (Options["Book File"].value() != OpeningBook.file_name()) + OpeningBook.open(Options["Book File"].value()); - Move bookMove = OpeningBook.get_move(pos, get_option_value_bool("Best Book Move")); + Move bookMove = OpeningBook.get_move(pos, Options["Best Book Move"].value()); if (bookMove != MOVE_NONE) { if (PonderSearch) @@ -429,50 +431,53 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr } // Read UCI option values - TT.set_size(get_option_value_int("Hash")); - if (button_was_pressed("Clear Hash")) + TT.set_size(Options["Hash"].value()); + if (Options["Clear Hash"].value()) + { + Options["Clear Hash"].set_value("false"); TT.clear(); + } - CheckExtension[1] = Depth(get_option_value_int("Check Extension (PV nodes)")); - CheckExtension[0] = Depth(get_option_value_int("Check Extension (non-PV nodes)")); - SingleEvasionExtension[1] = Depth(get_option_value_int("Single Evasion Extension (PV nodes)")); - SingleEvasionExtension[0] = Depth(get_option_value_int("Single Evasion Extension (non-PV nodes)")); - PawnPushTo7thExtension[1] = Depth(get_option_value_int("Pawn Push to 7th Extension (PV nodes)")); - PawnPushTo7thExtension[0] = Depth(get_option_value_int("Pawn Push to 7th Extension (non-PV nodes)")); - PassedPawnExtension[1] = Depth(get_option_value_int("Passed Pawn Extension (PV nodes)")); - PassedPawnExtension[0] = Depth(get_option_value_int("Passed Pawn Extension (non-PV nodes)")); - PawnEndgameExtension[1] = Depth(get_option_value_int("Pawn Endgame Extension (PV nodes)")); - PawnEndgameExtension[0] = Depth(get_option_value_int("Pawn Endgame Extension (non-PV nodes)")); - MateThreatExtension[1] = Depth(get_option_value_int("Mate Threat Extension (PV nodes)")); - MateThreatExtension[0] = Depth(get_option_value_int("Mate Threat Extension (non-PV nodes)")); - - MinimumSplitDepth = get_option_value_int("Minimum Split Depth") * OnePly; - MaxThreadsPerSplitPoint = get_option_value_int("Maximum Number of Threads per Split Point"); - MultiPV = get_option_value_int("MultiPV"); - Chess960 = get_option_value_bool("UCI_Chess960"); - UseLogFile = get_option_value_bool("Use Search Log"); + CheckExtension[1] = Options["Check Extension (PV nodes)"].value(); + CheckExtension[0] = Options["Check Extension (non-PV nodes)"].value(); + SingleEvasionExtension[1] = Options["Single Evasion Extension (PV nodes)"].value(); + SingleEvasionExtension[0] = Options["Single Evasion Extension (non-PV nodes)"].value(); + PawnPushTo7thExtension[1] = Options["Pawn Push to 7th Extension (PV nodes)"].value(); + PawnPushTo7thExtension[0] = Options["Pawn Push to 7th Extension (non-PV nodes)"].value(); + PassedPawnExtension[1] = Options["Passed Pawn Extension (PV nodes)"].value(); + PassedPawnExtension[0] = Options["Passed Pawn Extension (non-PV nodes)"].value(); + PawnEndgameExtension[1] = Options["Pawn Endgame Extension (PV nodes)"].value(); + PawnEndgameExtension[0] = Options["Pawn Endgame Extension (non-PV nodes)"].value(); + MateThreatExtension[1] = Options["Mate Threat Extension (PV nodes)"].value(); + MateThreatExtension[0] = Options["Mate Threat Extension (non-PV nodes)"].value(); + + MinimumSplitDepth = Options["Minimum Split Depth"].value() * ONE_PLY; + MaxThreadsPerSplitPoint = Options["Maximum Number of Threads per Split Point"].value(); + MultiPV = Options["MultiPV"].value(); + UseLogFile = Options["Use Search Log"].value(); if (UseLogFile) - LogFile.open(get_option_value_string("Search Log Filename").c_str(), std::ios::out | std::ios::app); + LogFile.open(Options["Search Log Filename"].value().c_str(), std::ios::out | std::ios::app); read_weights(pos.side_to_move()); // Set the number of active threads - int newActiveThreads = get_option_value_int("Threads"); - if (newActiveThreads != TM.active_threads()) + int newActiveThreads = Options["Threads"].value(); + if (newActiveThreads != ThreadsMgr.active_threads()) { - TM.set_active_threads(newActiveThreads); - init_eval(TM.active_threads()); + ThreadsMgr.set_active_threads(newActiveThreads); + init_eval(ThreadsMgr.active_threads()); } - // Wake up sleeping threads - TM.wake_sleeping_threads(); + // Wake up needed threads + for (int i = 1; i < newActiveThreads; i++) + ThreadsMgr.wake_sleeping_thread(i); // Set thinking time int myTime = time[pos.side_to_move()]; int myIncrement = increment[pos.side_to_move()]; if (UseTimeManagement) - TimeMgr.update(myTime, myIncrement, movesToGo, pos.startpos_ply_counter()); + TimeMgr.init(myTime, myIncrement, movesToGo, pos.startpos_ply_counter()); // Set best NodesBetweenPolls interval to avoid lagging under // heavy time pressure. @@ -500,7 +505,8 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr if (UseLogFile) LogFile.close(); - TM.put_threads_to_sleep(); + // This makes all the threads to go to sleep + ThreadsMgr.set_active_threads(1); return !Quit; } @@ -513,16 +519,15 @@ namespace { // been consumed, the user stops the search, or the maximum search depth is // reached. - Value id_loop(const Position& pos, Move searchMoves[]) { + Value id_loop(Position& pos, Move searchMoves[]) { - Position p(pos, pos.thread()); SearchStack ss[PLY_MAX_PLUS_2]; Move pv[PLY_MAX_PLUS_2]; Move EasyMove = MOVE_NONE; Value value, alpha = -VALUE_INFINITE, beta = VALUE_INFINITE; // Moves to search are verified, copied, scored and sorted - RootMoveList rml(p, searchMoves); + RootMoveList rml(pos, searchMoves); // Handle special case of searching on a mate/stale position if (rml.move_count() == 0) @@ -535,26 +540,27 @@ namespace { // Print RootMoveList startup scoring to the standard output, // so to output information also for iteration 1. - cout << "info depth " << 1 + cout << set960(pos.is_chess960()) // Is enough to set once at the beginning + << "info depth " << 1 << "\ninfo depth " << 1 - << " score " << value_to_uci(rml.get_move_score(0)) + << " score " << value_to_uci(rml.move_score(0)) << " time " << current_search_time() - << " nodes " << TM.nodes_searched() - << " nps " << nps() - << " pv " << rml.get_move(0) << "\n"; + << " nodes " << pos.nodes_searched() + << " nps " << nps(pos) + << " pv " << rml.move(0) << "\n"; // Initialize TT.new_search(); H.clear(); init_ss_array(ss, PLY_MAX_PLUS_2); pv[0] = pv[1] = MOVE_NONE; - ValueByIteration[1] = rml.get_move_score(0); + ValueByIteration[1] = rml.move_score(0); Iteration = 1; // Is one move significantly better than others after initial scoring ? if ( rml.move_count() == 1 - || rml.get_move_score(0) > rml.get_move_score(1) + EasyMoveMargin) - EasyMove = rml.get_move(0); + || rml.move_score(0) > rml.move_score(1) + EasyMoveMargin) + EasyMove = rml.move(0); // Iterative deepening loop while (Iteration < PLY_MAX) @@ -579,11 +585,11 @@ namespace { } // Search to the current depth, rml is updated and sorted, alpha and beta could change - value = root_search(p, ss, pv, rml, &alpha, &beta); + value = root_search(pos, ss, pv, rml, &alpha, &beta); // Write PV to transposition table, in case the relevant entries have // been overwritten during the search. - insert_pv_in_tt(p, pv); + insert_pv_in_tt(pos, pv); if (AbortSearch) break; // Value cannot be trusted. Break out immediately! @@ -612,19 +618,18 @@ namespace { stopSearch = true; // Stop search early if one move seems to be much better than the others - int64_t nodes = TM.nodes_searched(); if ( Iteration >= 8 && EasyMove == pv[0] - && ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100 - && current_search_time() > TimeMgr.optimumSearchTime / 16) - ||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100 - && current_search_time() > TimeMgr.optimumSearchTime / 32))) + && ( ( rml.move_nodes(0) > (pos.nodes_searched() * 85) / 100 + && current_search_time() > TimeMgr.available_time() / 16) + ||( rml.move_nodes(0) > (pos.nodes_searched() * 98) / 100 + && current_search_time() > TimeMgr.available_time() / 32))) stopSearch = true; // Add some extra time if the best move has changed during the last two iterations if (Iteration > 5 && Iteration <= 50) - TimeMgr.best_move_changes(BestMoveChangesByIteration[Iteration], - BestMoveChangesByIteration[Iteration-1]); + TimeMgr.pv_instability(BestMoveChangesByIteration[Iteration], + BestMoveChangesByIteration[Iteration-1]); // 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 @@ -651,14 +656,14 @@ namespace { wait_for_stop_or_ponderhit(); else // Print final search statistics - cout << "info nodes " << TM.nodes_searched() - << " nps " << nps() + cout << "info nodes " << pos.nodes_searched() + << " nps " << nps(pos) << " time " << current_search_time() << endl; // Print the best move and the ponder move to the standard output - if (pv[0] == MOVE_NONE) + if (pv[0] == MOVE_NONE || MultiPV > 1) { - pv[0] = rml.get_move(0); + pv[0] = rml.move(0); pv[1] = MOVE_NONE; } @@ -679,17 +684,17 @@ namespace { if (dbg_show_hit_rate) dbg_print_hit_rate(LogFile); - LogFile << "\nNodes: " << TM.nodes_searched() - << "\nNodes/second: " << nps() - << "\nBest move: " << move_to_san(p, pv[0]); + LogFile << "\nNodes: " << pos.nodes_searched() + << "\nNodes/second: " << nps(pos) + << "\nBest move: " << move_to_san(pos, pv[0]); StateInfo st; - p.do_move(pv[0], st); + pos.do_move(pv[0], st); LogFile << "\nPonder move: " - << move_to_san(p, pv[1]) // Works also with MOVE_NONE + << move_to_san(pos, pv[1]) // Works also with MOVE_NONE << endl; } - return rml.get_move_score(0); + return rml.move_score(0); } @@ -700,7 +705,6 @@ namespace { Value root_search(Position& pos, SearchStack* ss, Move* pv, RootMoveList& rml, Value* alphaPtr, Value* betaPtr) { - EvalInfo ei; StateInfo st; CheckInfo ci(pos); int64_t nodes; @@ -714,6 +718,7 @@ namespace { alpha = *alphaPtr; beta = *betaPtr; isCheck = pos.is_check(); + depth = (Iteration - 2) * ONE_PLY + InitialDepth; // Step 1. Initialize node (polling is omitted at root) ss->currentMove = ss->bestMove = MOVE_NONE; @@ -724,7 +729,8 @@ namespace { // Step 5. Evaluate the position statically // At root we do this only to get reference value for child nodes - ss->eval = isCheck ? VALUE_NONE : evaluate(pos, ei); + ss->evalMargin = VALUE_NONE; + ss->eval = isCheck ? VALUE_NONE : evaluate(pos, ss->evalMargin); // Step 6. Razoring (omitted at root) // Step 7. Static null move pruning (omitted at root) @@ -737,6 +743,7 @@ namespace { while (1) { // Sort the moves before to (re)search + rml.score_moves(pos); rml.sort(); // Step 10. Loop through all moves in the root move list @@ -746,14 +753,11 @@ namespace { FirstRootMove = (i == 0); // Save the current node count before the move is searched - nodes = TM.nodes_searched(); - - // Reset beta cut-off counters - TM.resetBetaCounters(); + nodes = pos.nodes_searched(); // Pick the next root move, and print the move and the move number to // the standard output. - move = ss->currentMove = rml.get_move(i); + move = ss->currentMove = rml.move(i); if (current_search_time() >= 1000) cout << "info currmove " << move @@ -763,7 +767,6 @@ namespace { captureOrPromotion = pos.move_is_capture_or_promotion(move); // Step 11. Decide the new search depth - depth = (Iteration - 2) * OnePly + InitialDepth; ext = extension(pos, move, captureOrPromotion, moveIsCheck, false, false, &dangerous); newDepth = depth + ext; @@ -797,7 +800,7 @@ namespace { // if the move fails high will be re-searched at full depth bool doFullDepthSearch = true; - if ( depth >= 3 * OnePly + if ( depth >= 3 * ONE_PLY && !dangerous && !captureOrPromotion && !move_is_castle(move)) @@ -805,7 +808,7 @@ namespace { ss->reduction = reduction(depth, i - MultiPV + 2); if (ss->reduction) { - assert(newDepth-ss->reduction >= OnePly); + assert(newDepth-ss->reduction >= ONE_PLY); // Reduced depth non-pv search using alpha as upperbound value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, 1); @@ -815,15 +818,15 @@ namespace { // The move failed high, but if reduction is very big we could // face a false positive, retry with a less aggressive reduction, // if the move fails high again then go with full depth search. - if (doFullDepthSearch && ss->reduction > 2 * OnePly) + if (doFullDepthSearch && ss->reduction > 2 * ONE_PLY) { - assert(newDepth - OnePly >= OnePly); + assert(newDepth - ONE_PLY >= ONE_PLY); - ss->reduction = OnePly; + ss->reduction = ONE_PLY; value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, 1); doFullDepthSearch = (value > alpha); } - ss->reduction = Depth(0); // Restore original reduction + ss->reduction = DEPTH_ZERO; // Restore original reduction } // Step 15. Full depth search @@ -870,12 +873,8 @@ namespace { if (AbortSearch) break; - // Remember beta-cutoff and searched nodes counts for this move. The - // info is used to sort the root moves for the next iteration. - int64_t our, their; - TM.get_beta_counters(pos.side_to_move(), our, their); - rml.set_beta_counters(i, our, their); - rml.set_move_nodes(i, TM.nodes_searched() - nodes); + // Remember searched nodes counts for this move + rml.add_move_nodes(i, pos.nodes_searched() - nodes); assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE); assert(value < beta); @@ -914,19 +913,19 @@ namespace { for (int j = 0; j < Min(MultiPV, rml.move_count()); j++) { cout << "info multipv " << j + 1 - << " score " << value_to_uci(rml.get_move_score(j)) + << " score " << value_to_uci(rml.move_score(j)) << " depth " << (j <= i ? Iteration : Iteration - 1) << " time " << current_search_time() - << " nodes " << TM.nodes_searched() - << " nps " << nps() + << " nodes " << pos.nodes_searched() + << " nps " << nps(pos) << " pv "; - for (int k = 0; rml.get_move_pv(j, k) != MOVE_NONE && k < PLY_MAX; k++) - cout << rml.get_move_pv(j, k) << " "; + for (int k = 0; rml.move_pv(j, k) != MOVE_NONE && k < PLY_MAX; k++) + cout << rml.move_pv(j, k) << " "; cout << endl; } - alpha = rml.get_move_score(Min(i, MultiPV - 1)); + alpha = rml.move_score(Min(i, MultiPV - 1)); } } // PV move or new best move @@ -955,49 +954,63 @@ namespace { } - // search<>() is the main search function for both PV and non-PV nodes + // search<>() is the main search function for both PV and non-PV nodes and for + // normal and SplitPoint nodes. When called just after a split point the search + // is simpler because we have already probed the hash table, done a null move + // search, and searched the first move before splitting, we don't have to repeat + // all this work again. We also don't need to store anything to the hash table + // here: This is taken care of after we return from the split point. - template + template Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE); assert(beta > alpha && beta <= VALUE_INFINITE); assert(PvNode || alpha == beta - 1); assert(ply > 0 && ply < PLY_MAX); - assert(pos.thread() >= 0 && pos.thread() < TM.active_threads()); + assert(pos.thread() >= 0 && pos.thread() < ThreadsMgr.active_threads()); - Move movesSearched[256]; - EvalInfo ei; + Move movesSearched[MOVES_MAX]; StateInfo st; - const TTEntry *tte, *ttx; + const TTEntry *tte; Key posKey; Move ttMove, move, excludedMove, threatMove; Depth ext, newDepth; + ValueType vt; Value bestValue, value, oldAlpha; - Value refinedValue, nullValue, futilityValueScaled; // Non-PV specific + Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific bool isCheck, singleEvasion, singularExtensionNode, moveIsCheck, captureOrPromotion, dangerous; bool mateThreat = false; int moveCount = 0; int threadID = pos.thread(); + SplitPoint* sp = NULL; refinedValue = bestValue = value = -VALUE_INFINITE; oldAlpha = alpha; + isCheck = pos.is_check(); + + if (SpNode) + { + sp = ss->sp; + tte = NULL; + ttMove = excludedMove = MOVE_NONE; + threatMove = sp->threatMove; + mateThreat = sp->mateThreat; + goto split_point_start; + } else {} // Hack to fix icc's "statement is unreachable" warning // Step 1. Initialize node and poll. Polling can abort search - TM.incrementNodeCounter(threadID); ss->currentMove = ss->bestMove = threatMove = MOVE_NONE; (ss+2)->killers[0] = (ss+2)->killers[1] = (ss+2)->mateKiller = MOVE_NONE; if (threadID == 0 && ++NodesSincePoll > NodesBetweenPolls) { NodesSincePoll = 0; - poll(); + poll(pos); } // Step 2. Check for aborted search and immediate draw - if (AbortSearch || TM.thread_should_stop(threadID)) - return Value(0); - - if (pos.is_draw() || ply >= PLY_MAX - 1) + if ( AbortSearch || ThreadsMgr.thread_should_stop(threadID) + || pos.is_draw() || ply >= PLY_MAX - 1) return VALUE_DRAW; // Step 3. Mate distance pruning @@ -1014,7 +1027,7 @@ namespace { posKey = excludedMove ? pos.get_exclusion_key() : pos.get_key(); tte = TT.retrieve(posKey); - ttMove = (tte ? tte->move() : MOVE_NONE); + ttMove = tte ? tte->move() : MOVE_NONE; // At PV nodes, we don't use the TT for pruning, but only for move ordering. // This is to avoid problems in the following areas: @@ -1023,33 +1036,29 @@ namespace { // * Fifty move rule detection // * Searching for a mate // * Printing of full PV line - if (!PvNode && tte && ok_to_use_TT(tte, depth, beta, ply)) { - // Refresh tte entry to avoid aging - TT.store(posKey, tte->value(), tte->type(), tte->depth(), ttMove, tte->static_value(), tte->king_danger()); - + TT.refresh(tte); ss->bestMove = ttMove; // Can be MOVE_NONE return value_from_tt(tte->value(), ply); } // Step 5. Evaluate the position statically and // update gain statistics of parent move. - isCheck = pos.is_check(); if (isCheck) - ss->eval = VALUE_NONE; + ss->eval = ss->evalMargin = VALUE_NONE; else if (tte) { assert(tte->static_value() != VALUE_NONE); ss->eval = tte->static_value(); - ei.kingDanger[pos.side_to_move()] = tte->king_danger(); + ss->evalMargin = tte->static_value_margin(); refinedValue = refine_eval(tte, ss->eval, ply); } else { - refinedValue = ss->eval = evaluate(pos, ei); - TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); + refinedValue = ss->eval = evaluate(pos, ss->evalMargin); + TT.store(posKey, VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, MOVE_NONE, ss->eval, ss->evalMargin); } // Save gain for the parent non-capture move @@ -1066,7 +1075,7 @@ namespace { && !pos.has_pawn_on_7th(pos.side_to_move())) { Value rbeta = beta - razor_margin(depth); - Value v = qsearch(pos, ss, rbeta-1, rbeta, Depth(0), ply); + Value v = qsearch(pos, ss, rbeta-1, rbeta, DEPTH_ZERO, ply); if (v < rbeta) // Logically we should return (v + razor_margin(depth)), but // surprisingly this did slightly weaker in tests. @@ -1086,21 +1095,18 @@ namespace { return refinedValue - futility_margin(depth, 0); // Step 8. Null move search with verification search (is omitted in PV nodes) - // When we jump directly to qsearch() we do a null move only if static value is - // at least beta. Otherwise we do a null move if static value is not more than - // NullMoveMargin under beta. if ( !PvNode && !ss->skipNullMove - && depth > OnePly + && depth > ONE_PLY && !isCheck - && refinedValue >= beta - (depth >= 4 * OnePly ? NullMoveMargin : 0) + && refinedValue >= beta && !value_is_mate(beta) && pos.non_pawn_material(pos.side_to_move())) { ss->currentMove = MOVE_NULL; // Null move dynamic reduction based on depth - int R = 3 + (depth >= 5 * OnePly ? depth / 8 : 0); + int R = 3 + (depth >= 5 * ONE_PLY ? depth / 8 : 0); // Null move dynamic reduction based on value if (refinedValue - beta > PawnValueMidgame) @@ -1108,9 +1114,7 @@ namespace { pos.do_null_move(st); (ss+1)->skipNullMove = true; - - nullValue = depth-R*OnePly < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) - : - search(pos, ss+1, -beta, -alpha, depth-R*OnePly, ply+1); + nullValue = -search(pos, ss+1, -beta, -alpha, depth-R*ONE_PLY, ply+1); (ss+1)->skipNullMove = false; pos.undo_null_move(); @@ -1120,12 +1124,12 @@ namespace { if (nullValue >= value_mate_in(PLY_MAX)) nullValue = beta; - if (depth < 6 * OnePly) + if (depth < 6 * ONE_PLY) return nullValue; // Do verification search at high depths ss->skipNullMove = true; - Value v = search(pos, ss, alpha, beta, depth-R*OnePly, ply); + Value v = search(pos, ss, alpha, beta, depth-R*ONE_PLY, ply); ss->skipNullMove = false; if (v >= beta) @@ -1155,7 +1159,7 @@ namespace { && ttMove == MOVE_NONE && (PvNode || (!isCheck && ss->eval >= beta - IIDMargin))) { - Depth d = (PvNode ? depth - 2 * OnePly : depth / 2); + Depth d = (PvNode ? depth - 2 * ONE_PLY : depth / 2); ss->skipNullMove = true; search(pos, ss, alpha, beta, d, ply); @@ -1167,30 +1171,48 @@ namespace { // Expensive mate threat detection (only for PV nodes) if (PvNode) - mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move())); + mateThreat = pos.has_mate_threat(); + +split_point_start: // At split points actual search starts from here // Initialize a MovePicker object for the current position - MovePicker mp = MovePicker(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); + // FIXME currently MovePicker() c'tor is needless called also in SplitPoint + MovePicker mpBase(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta)); + MovePicker& mp = SpNode ? *sp->mp : mpBase; CheckInfo ci(pos); ss->bestMove = MOVE_NONE; - singleEvasion = isCheck && mp.number_of_evasions() == 1; - singularExtensionNode = depth >= SingularExtensionDepth[PvNode] + singleEvasion = !SpNode && isCheck && mp.number_of_evasions() == 1; + futilityBase = ss->eval + ss->evalMargin; + singularExtensionNode = !SpNode + && depth >= SingularExtensionDepth[PvNode] && tte && tte->move() && !excludedMove // Do not allow recursive singular extension search - && is_lower_bound(tte->type()) - && tte->depth() >= depth - 3 * OnePly; + && (tte->type() & VALUE_TYPE_LOWER) + && tte->depth() >= depth - 3 * ONE_PLY; + if (SpNode) + { + lock_grab(&(sp->lock)); + bestValue = sp->bestValue; + } // Step 10. Loop through moves // Loop through all legal moves until no moves remain or a beta cutoff occurs while ( bestValue < beta && (move = mp.get_next_move()) != MOVE_NONE - && !TM.thread_should_stop(threadID)) + && !ThreadsMgr.thread_should_stop(threadID)) { assert(move_is_ok(move)); - if (move == excludedMove) + if (SpNode) + { + moveCount = ++sp->moveCount; + lock_release(&(sp->lock)); + } + else if (move == excludedMove) continue; + else + movesSearched[moveCount++] = move; moveIsCheck = pos.move_is_check(move, ci); captureOrPromotion = pos.move_is_capture_or_promotion(move); @@ -1204,24 +1226,11 @@ namespace { // lower then ttValue minus a margin then we extend ttMove. if ( singularExtensionNode && move == tte->move() - && ext < OnePly) + && ext < ONE_PLY) { - // Avoid to do an expensive singular extension search on nodes where - // such search have already been done in the past, so assume the last - // singular extension search result is still valid. - if ( !PvNode - && depth < SingularExtensionDepth[PvNode] + 5 * OnePly - && (ttx = TT.retrieve(pos.get_exclusion_key())) != NULL) - { - if (is_upper_bound(ttx->type())) - ext = OnePly; - - singularExtensionNode = false; - } - Value ttValue = value_from_tt(tte->value(), ply); - if (singularExtensionNode && abs(ttValue) < VALUE_KNOWN_WIN) + if (abs(ttValue) < VALUE_KNOWN_WIN) { Value b = ttValue - SingularExtensionMargin; ss->excludedMove = move; @@ -1231,14 +1240,13 @@ namespace { ss->excludedMove = MOVE_NONE; ss->bestMove = MOVE_NONE; if (v < b) - ext = OnePly; + ext = ONE_PLY; } } - newDepth = depth - OnePly + ext; - // Update current move (this must be done after singular extension search) - movesSearched[moveCount++] = ss->currentMove = move; + ss->currentMove = move; + newDepth = depth - ONE_PLY + ext; // Step 12. Futility pruning (is omitted in PV nodes) if ( !PvNode @@ -1251,20 +1259,43 @@ namespace { // Move count based pruning if ( moveCount >= futility_move_count(depth) && !(threatMove && connected_threat(pos, move, threatMove)) - && bestValue > value_mated_in(PLY_MAX)) + && bestValue > value_mated_in(PLY_MAX)) // FIXME bestValue is racy + { + if (SpNode) + lock_grab(&(sp->lock)); + continue; + } // Value based pruning - // We illogically ignore reduction condition depth >= 3*OnePly for predicted depth, + // We illogically ignore reduction condition depth >= 3*ONE_PLY for predicted depth, // but fixing this made program slightly weaker. Depth predictedDepth = newDepth - reduction(depth, moveCount); - futilityValueScaled = ss->eval + futility_margin(predictedDepth, moveCount) + futilityValueScaled = futilityBase + futility_margin(predictedDepth, moveCount) + H.gain(pos.piece_on(move_from(move)), move_to(move)); if (futilityValueScaled < beta) { - if (futilityValueScaled > bestValue) + if (SpNode) + { + lock_grab(&(sp->lock)); + if (futilityValueScaled > sp->bestValue) + sp->bestValue = bestValue = futilityValueScaled; + } + else if (futilityValueScaled > bestValue) bestValue = futilityValueScaled; + + continue; + } + + // Prune neg. see moves at low depths + if ( predictedDepth < 2 * ONE_PLY + && bestValue > value_mated_in(PLY_MAX) + && pos.see_sign(move) < 0) + { + if (SpNode) + lock_grab(&(sp->lock)); + continue; } } @@ -1274,27 +1305,26 @@ namespace { // Step extra. pv search (only in PV nodes) // The first move in list is the expected PV - if (PvNode && moveCount == 1) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) - : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); + if (!SpNode && PvNode && moveCount == 1) + value = -search(pos, ss+1, -beta, -alpha, newDepth, ply+1); else { // Step 14. Reduced depth search // If the move fails high will be re-searched at full depth. bool doFullDepthSearch = true; - if ( depth >= 3 * OnePly + if ( depth >= 3 * ONE_PLY && !captureOrPromotion && !dangerous && !move_is_castle(move) - && !move_is_killer(move, ss)) + && !(ss->killers[0] == move || ss->killers[1] == move)) { ss->reduction = reduction(depth, moveCount); if (ss->reduction) { + alpha = SpNode ? sp->alpha : alpha; Depth d = newDepth - ss->reduction; - value = d < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0), ply+1) - : - search(pos, ss+1, -(alpha+1), -alpha, d, ply+1); + value = -search(pos, ss+1, -(alpha+1), -alpha, d, ply+1); doFullDepthSearch = (value > alpha); } @@ -1302,29 +1332,29 @@ namespace { // The move failed high, but if reduction is very big we could // face a false positive, retry with a less aggressive reduction, // if the move fails high again then go with full depth search. - if (doFullDepthSearch && ss->reduction > 2 * OnePly) + if (doFullDepthSearch && ss->reduction > 2 * ONE_PLY) { - assert(newDepth - OnePly >= OnePly); + assert(newDepth - ONE_PLY >= ONE_PLY); - ss->reduction = OnePly; + ss->reduction = ONE_PLY; + alpha = SpNode ? sp->alpha : alpha; value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1); doFullDepthSearch = (value > alpha); } - ss->reduction = Depth(0); // Restore original reduction + ss->reduction = DEPTH_ZERO; // Restore original reduction } // Step 15. Full depth search if (doFullDepthSearch) { - value = newDepth < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0), ply+1) - : - search(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1); + alpha = SpNode ? sp->alpha : alpha; + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1); // Step extra. pv search (only in PV nodes) // Search only for possible new PV nodes, if instead value >= beta then // parent node fails low with value <= alpha and tries another move. if (PvNode && value > alpha && value < beta) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) - : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); + value = -search(pos, ss+1, -beta, -alpha, newDepth, ply+1); } } @@ -1334,61 +1364,90 @@ namespace { assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); // Step 17. Check for new best move - if (value > bestValue) + if (SpNode) + { + lock_grab(&(sp->lock)); + bestValue = sp->bestValue; + alpha = sp->alpha; + } + + if (value > bestValue && !(SpNode && ThreadsMgr.thread_should_stop(threadID))) { bestValue = value; + + if (SpNode) + sp->bestValue = value; + if (value > alpha) { + if (SpNode && (!PvNode || value >= beta)) + sp->stopRequest = true; + if (PvNode && value < beta) // We want always alpha < beta + { alpha = value; + if (SpNode) + sp->alpha = value; + } if (value == value_mate_in(ply + 1)) ss->mateKiller = move; ss->bestMove = move; + + if (SpNode) + sp->parentSstack->bestMove = move; } } // Step 18. Check for split - if ( depth >= MinimumSplitDepth - && TM.active_threads() > 1 + if ( !SpNode + && depth >= MinimumSplitDepth + && ThreadsMgr.active_threads() > 1 && bestValue < beta - && TM.available_thread_exists(threadID) + && ThreadsMgr.available_thread_exists(threadID) && !AbortSearch - && !TM.thread_should_stop(threadID) + && !ThreadsMgr.thread_should_stop(threadID) && Iteration <= 99) - TM.split(pos, ss, ply, &alpha, beta, &bestValue, depth, - threatMove, mateThreat, &moveCount, &mp, PvNode); + ThreadsMgr.split(pos, ss, ply, &alpha, beta, &bestValue, depth, + threatMove, mateThreat, moveCount, &mp, PvNode); } // Step 19. Check for mate and stalemate // All legal moves have been searched and if there are // no legal moves, it must be mate or stalemate. // If one move was excluded return fail low score. - if (!moveCount) + if (!SpNode && !moveCount) return excludedMove ? oldAlpha : isCheck ? value_mated_in(ply) : VALUE_DRAW; // Step 20. Update tables // If the search is not aborted, update the transposition table, // history counters, and killer moves. - if (AbortSearch || TM.thread_should_stop(threadID)) - return bestValue; + if (!SpNode && !AbortSearch && !ThreadsMgr.thread_should_stop(threadID)) + { + move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove; + vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER + : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT; - ValueType vt = (bestValue <= oldAlpha ? VALUE_TYPE_UPPER : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT); - move = (bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove); - TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, ei.kingDanger[pos.side_to_move()]); + TT.store(posKey, value_to_tt(bestValue, ply), vt, depth, move, ss->eval, ss->evalMargin); - // Update killers and history only for non capture moves that fails high - if (bestValue >= beta) - { - TM.incrementBetaCounter(pos.side_to_move(), depth, threadID); - if (!pos.move_is_capture_or_promotion(move)) + // Update killers and history only for non capture moves that fails high + if ( bestValue >= beta + && !pos.move_is_capture_or_promotion(move)) { update_history(pos, move, depth, movesSearched, moveCount); update_killers(move, ss); } } + if (SpNode) + { + // Here we have the lock still grabbed + sp->slaves[threadID] = 0; + sp->nodes += pos.nodes_searched(); + lock_release(&(sp->lock)); + } + assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); return bestValue; @@ -1397,7 +1456,7 @@ namespace { // qsearch() is the quiescence search function, which is called by the main // search function when the remaining depth is zero (or, to be more precise, - // less than OnePly). + // less than ONE_PLY). template Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { @@ -1407,17 +1466,15 @@ namespace { assert(PvNode || alpha == beta - 1); assert(depth <= 0); assert(ply > 0 && ply < PLY_MAX); - assert(pos.thread() >= 0 && pos.thread() < TM.active_threads()); + assert(pos.thread() >= 0 && pos.thread() < ThreadsMgr.active_threads()); - EvalInfo ei; StateInfo st; Move ttMove, move; - Value bestValue, value, futilityValue, futilityBase; + Value bestValue, value, evalMargin, futilityValue, futilityBase; bool isCheck, deepChecks, enoughMaterial, moveIsCheck, evasionPrunable; const TTEntry* tte; Value oldAlpha = alpha; - TM.incrementNodeCounter(pos.thread()); ss->bestMove = ss->currentMove = MOVE_NONE; // Check for an instant draw or maximum ply reached @@ -1441,7 +1498,7 @@ namespace { if (isCheck) { bestValue = futilityBase = -VALUE_INFINITE; - ss->eval = VALUE_NONE; + ss->eval = evalMargin = VALUE_NONE; deepChecks = enoughMaterial = false; } else @@ -1450,20 +1507,19 @@ namespace { { assert(tte->static_value() != VALUE_NONE); - ei.kingDanger[pos.side_to_move()] = tte->king_danger(); - bestValue = tte->static_value(); + evalMargin = tte->static_value_margin(); + ss->eval = bestValue = tte->static_value(); } else - bestValue = evaluate(pos, ei); + ss->eval = bestValue = evaluate(pos, evalMargin); - ss->eval = bestValue; update_gains(pos, (ss-1)->currentMove, (ss-1)->eval, ss->eval); // Stand pat. Return immediately if static value is at least beta if (bestValue >= beta) { if (!tte) - TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, DEPTH_NONE, MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); + TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, DEPTH_NONE, MOVE_NONE, ss->eval, evalMargin); return bestValue; } @@ -1472,18 +1528,18 @@ namespace { alpha = bestValue; // If we are near beta then try to get a cutoff pushing checks a bit further - deepChecks = (depth == -OnePly && bestValue >= beta - PawnValueMidgame / 8); + deepChecks = (depth == -ONE_PLY && bestValue >= beta - PawnValueMidgame / 8); // Futility pruning parameters, not needed when in check - futilityBase = bestValue + FutilityMarginQS + ei.kingDanger[pos.side_to_move()]; + futilityBase = ss->eval + evalMargin + FutilityMarginQS; enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; } // 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 or depth == -OnePly + // queen promotions and checks (only if depth == 0 or depth == -ONE_PLY // and we are near beta) will be generated. - MovePicker mp = MovePicker(pos, ttMove, deepChecks ? Depth(0) : depth, H); + MovePicker mp = MovePicker(pos, ttMove, deepChecks ? DEPTH_ZERO : depth, H); CheckInfo ci(pos); // Loop through the moves until no moves remain or a beta cutoff occurs @@ -1505,7 +1561,7 @@ namespace { { futilityValue = futilityBase + pos.endgame_value_of_piece_on(move_to(move)) - + (move_is_ep(move) ? PawnValueEndgame : Value(0)); + + (move_is_ep(move) ? PawnValueEndgame : VALUE_ZERO); if (futilityValue < alpha) { @@ -1515,11 +1571,10 @@ namespace { } } - // Detect blocking evasions that are candidate to be pruned + // Detect non-capture evasions that are candidate to be pruned evasionPrunable = isCheck && bestValue > value_mated_in(PLY_MAX) && !pos.move_is_capture(move) - && pos.type_of_piece_on(move_from(move)) != KING && !pos.can_castle(pos.side_to_move()); // Don't search moves with negative SEE values @@ -1535,7 +1590,7 @@ namespace { // Make and search the move pos.do_move(move, st, ci, moveIsCheck); - value = -qsearch(pos, ss+1, -beta, -alpha, depth-OnePly, ply+1); + value = -qsearch(pos, ss+1, -beta, -alpha, depth-ONE_PLY, ply+1); pos.undo_move(move); assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); @@ -1558,14 +1613,9 @@ namespace { return value_mated_in(ply); // Update transposition table - Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1)); + Depth d = (depth == DEPTH_ZERO ? DEPTH_ZERO : DEPTH_ZERO - ONE_PLY); ValueType vt = (bestValue <= oldAlpha ? VALUE_TYPE_UPPER : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT); - TT.store(pos.get_key(), value_to_tt(bestValue, ply), vt, d, ss->bestMove, ss->eval, ei.kingDanger[pos.side_to_move()]); - - // Update killers only for checking moves that fails high - if ( bestValue >= beta - && !pos.move_is_capture_or_promotion(ss->bestMove)) - update_killers(ss->bestMove, ss); + TT.store(pos.get_key(), value_to_tt(bestValue, ply), vt, d, ss->bestMove, ss->eval, evalMargin); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); @@ -1573,174 +1623,6 @@ namespace { } - // sp_search() is used to search from a split point. This function is called - // by each thread working at the split point. It is similar to the normal - // search() function, but simpler. Because we have already probed the hash - // table, done a null move search, and searched the first move before - // splitting, we don't have to repeat all this work in sp_search(). We - // also don't need to store anything to the hash table here: This is taken - // care of after we return from the split point. - - template - void sp_search(SplitPoint* sp, int threadID) { - - assert(threadID >= 0 && threadID < TM.active_threads()); - assert(TM.active_threads() > 1); - - StateInfo st; - Move move; - Depth ext, newDepth; - Value value; - Value futilityValueScaled; // NonPV specific - bool isCheck, moveIsCheck, captureOrPromotion, dangerous; - int moveCount; - value = -VALUE_INFINITE; - - Position pos(*sp->pos, threadID); - CheckInfo ci(pos); - SearchStack* ss = sp->sstack[threadID] + 1; - isCheck = pos.is_check(); - - // Step 10. Loop through moves - // Loop through all legal moves until no moves remain or a beta cutoff occurs - lock_grab(&(sp->lock)); - - while ( sp->bestValue < sp->beta - && (move = sp->mp->get_next_move()) != MOVE_NONE - && !TM.thread_should_stop(threadID)) - { - moveCount = ++sp->moveCount; - lock_release(&(sp->lock)); - - assert(move_is_ok(move)); - - moveIsCheck = pos.move_is_check(move, ci); - captureOrPromotion = pos.move_is_capture_or_promotion(move); - - // Step 11. Decide the new search depth - ext = extension(pos, move, captureOrPromotion, moveIsCheck, false, sp->mateThreat, &dangerous); - newDepth = sp->depth - OnePly + ext; - - // Update current move - ss->currentMove = move; - - // Step 12. Futility pruning (is omitted in PV nodes) - if ( !PvNode - && !captureOrPromotion - && !isCheck - && !dangerous - && !move_is_castle(move)) - { - // Move count based pruning - if ( moveCount >= futility_move_count(sp->depth) - && !(sp->threatMove && connected_threat(pos, move, sp->threatMove)) - && sp->bestValue > value_mated_in(PLY_MAX)) - { - lock_grab(&(sp->lock)); - continue; - } - - // Value based pruning - Depth predictedDepth = newDepth - reduction(sp->depth, moveCount); - futilityValueScaled = ss->eval + futility_margin(predictedDepth, moveCount) - + H.gain(pos.piece_on(move_from(move)), move_to(move)); - - if (futilityValueScaled < sp->beta) - { - lock_grab(&(sp->lock)); - - if (futilityValueScaled > sp->bestValue) - sp->bestValue = futilityValueScaled; - continue; - } - } - - // Step 13. Make the move - pos.do_move(move, st, ci, moveIsCheck); - - // Step 14. Reduced search - // If the move fails high will be re-searched at full depth. - bool doFullDepthSearch = true; - - if ( !captureOrPromotion - && !dangerous - && !move_is_castle(move) - && !move_is_killer(move, ss)) - { - ss->reduction = reduction(sp->depth, moveCount); - if (ss->reduction) - { - Value localAlpha = sp->alpha; - Depth d = newDepth - ss->reduction; - value = d < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0), sp->ply+1) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, d, sp->ply+1); - - doFullDepthSearch = (value > localAlpha); - } - - // The move failed high, but if reduction is very big we could - // face a false positive, retry with a less aggressive reduction, - // if the move fails high again then go with full depth search. - if (doFullDepthSearch && ss->reduction > 2 * OnePly) - { - assert(newDepth - OnePly >= OnePly); - - ss->reduction = OnePly; - Value localAlpha = sp->alpha; - value = -search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth-ss->reduction, sp->ply+1); - doFullDepthSearch = (value > localAlpha); - } - ss->reduction = Depth(0); // Restore original reduction - } - - // Step 15. Full depth search - if (doFullDepthSearch) - { - Value localAlpha = sp->alpha; - value = newDepth < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0), sp->ply+1) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth, sp->ply+1); - - // Step extra. pv search (only in PV nodes) - // Search only for possible new PV nodes, if instead value >= beta then - // parent node fails low with value <= alpha and tries another move. - if (PvNode && value > localAlpha && value < sp->beta) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -sp->beta, -sp->alpha, Depth(0), sp->ply+1) - : - search(pos, ss+1, -sp->beta, -sp->alpha, newDepth, sp->ply+1); - } - - // Step 16. Undo move - pos.undo_move(move); - - assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); - - // Step 17. Check for new best move - lock_grab(&(sp->lock)); - - if (value > sp->bestValue && !TM.thread_should_stop(threadID)) - { - sp->bestValue = value; - - if (sp->bestValue > sp->alpha) - { - if (!PvNode || value >= sp->beta) - sp->stopRequest = true; - - if (PvNode && value < sp->beta) // This guarantees that always: sp->alpha < sp->beta - sp->alpha = value; - - sp->parentSstack->bestMove = ss->bestMove = move; - } - } - } - - /* Here we have the lock still grabbed */ - - sp->slaves[threadID] = 0; - - lock_release(&(sp->lock)); - } - - // connected_moves() tests whether two moves are 'connected' in the sense // that the first move somehow made the second move possible (for instance // if the moving piece is the same in both moves). The first move is assumed @@ -1840,17 +1722,6 @@ namespace { } - // move_is_killer() checks if the given move is among the killer moves - - bool move_is_killer(Move m, SearchStack* ss) { - - if (ss->killers[0] == m || ss->killers[1] == 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 and in @@ -1863,7 +1734,7 @@ namespace { assert(m != MOVE_NONE); - Depth result = Depth(0); + Depth result = DEPTH_ZERO; *dangerous = moveIsCheck | singleEvasion | mateThreat; if (*dangerous) @@ -1896,7 +1767,7 @@ namespace { if ( captureOrPromotion && pos.type_of_piece_on(move_to(m)) != PAWN && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) - - pos.midgame_value_of_piece_on(move_to(m)) == Value(0)) + - pos.midgame_value_of_piece_on(move_to(m)) == VALUE_ZERO) && !move_is_promotion(m) && !move_is_ep(m)) { @@ -1909,11 +1780,11 @@ namespace { && pos.type_of_piece_on(move_to(m)) != PAWN && pos.see_sign(m) >= 0) { - result += OnePly/2; + result += ONE_PLY / 2; *dangerous = true; } - return Min(result, OnePly); + return Min(result, ONE_PLY); } @@ -1969,8 +1840,8 @@ namespace { || v >= Max(value_mate_in(PLY_MAX), beta) || v < Min(value_mated_in(PLY_MAX), beta)) - && ( (is_lower_bound(tte->type()) && v >= beta) - || (is_upper_bound(tte->type()) && v < beta)); + && ( ((tte->type() & VALUE_TYPE_LOWER) && v >= beta) + || ((tte->type() & VALUE_TYPE_UPPER) && v < beta)); } @@ -1983,8 +1854,8 @@ namespace { Value v = value_from_tt(tte->value(), ply); - if ( (is_lower_bound(tte->type()) && v >= defaultEval) - || (is_upper_bound(tte->type()) && v < defaultEval)) + if ( ((tte->type() & VALUE_TYPE_LOWER) && v >= defaultEval) + || ((tte->type() & VALUE_TYPE_UPPER) && v < defaultEval)) return v; return defaultEval; @@ -1996,7 +1867,6 @@ namespace { void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount) { - Move m; H.success(pos.piece_on(move_from(move)), move_to(move), depth); @@ -2034,7 +1904,7 @@ namespace { if ( m != MOVE_NULL && before != VALUE_NONE && after != VALUE_NONE - && pos.captured_piece() == NO_PIECE_TYPE + && pos.captured_piece_type() == PIECE_TYPE_NONE && !move_is_special(m)) H.set_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); } @@ -2055,7 +1925,7 @@ namespace { std::stringstream s; - if (abs(v) < VALUE_MATE - PLY_MAX * OnePly) + if (abs(v) < VALUE_MATE - PLY_MAX * ONE_PLY) s << "cp " << int(v) * 100 / int(PawnValueMidgame); // Scale to pawn = 100 else s << "mate " << (v > 0 ? (VALUE_MATE - v + 1) / 2 : -(VALUE_MATE + v) / 2 ); @@ -2065,10 +1935,10 @@ namespace { // nps() computes the current nodes/second count. - int nps() { + int nps(const Position& pos) { int t = current_search_time(); - return (t > 0 ? int((TM.nodes_searched() * 1000) / t) : 0); + return (t > 0 ? int((pos.nodes_searched() * 1000) / t) : 0); } @@ -2076,13 +1946,13 @@ namespace { // looks at the time consumed so far and decides if it's time to abort the // search. - void poll() { + void poll(const Position& pos) { static int lastInfoTime; int t = current_search_time(); // Poll for input - if (Bioskey()) + if (data_available()) { // We are line oriented, don't read single chars std::string command; @@ -2125,7 +1995,7 @@ namespace { if (dbg_show_hit_rate) dbg_print_hit_rate(); - cout << "info nodes " << TM.nodes_searched() << " nps " << nps() + cout << "info nodes " << pos.nodes_searched() << " nps " << nps(pos) << " time " << t << endl; } @@ -2137,12 +2007,12 @@ namespace { && !AspirationFailLow && t > TimeMgr.available_time(); - bool noMoreTime = t > TimeMgr.maximumSearchTime + bool noMoreTime = t > TimeMgr.maximum_time() || stillAtFirstMove; if ( (Iteration >= 3 && UseTimeManagement && noMoreTime) || (ExactMaxTime && t >= ExactMaxTime) - || (Iteration >= 3 && MaxNodes && TM.nodes_searched() >= MaxNodes)) + || (Iteration >= 3 && MaxNodes && pos.nodes_searched() >= MaxNodes)) AbortSearch = true; } @@ -2160,7 +2030,7 @@ namespace { && !AspirationFailLow && t > TimeMgr.available_time(); - bool noMoreTime = t > TimeMgr.maximumSearchTime + bool noMoreTime = t > TimeMgr.maximum_time() || stillAtFirstMove; if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit)) @@ -2177,7 +2047,8 @@ namespace { { ss->excludedMove = MOVE_NONE; ss->skipNullMove = false; - ss->reduction = Depth(0); + ss->reduction = DEPTH_ZERO; + ss->sp = NULL; if (i < 3) ss->killers[0] = ss->killers[1] = ss->mateKiller = MOVE_NONE; @@ -2221,8 +2092,8 @@ namespace { << " score " << value_to_uci(value) << (value >= beta ? " lowerbound" : value <= alpha ? " upperbound" : "") << " time " << current_search_time() - << " nodes " << TM.nodes_searched() - << " nps " << nps() + << " nodes " << pos.nodes_searched() + << " nps " << nps(pos) << " pv "; for (Move* m = pv; *m != MOVE_NONE; m++) @@ -2235,8 +2106,7 @@ namespace { ValueType t = value >= beta ? VALUE_TYPE_LOWER : value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT; - LogFile << pretty_pv(pos, current_search_time(), Iteration, - TM.nodes_searched(), value, t, pv) << endl; + LogFile << pretty_pv(pos, current_search_time(), Iteration, value, t, pv) << endl; } } @@ -2250,16 +2120,15 @@ namespace { StateInfo st; TTEntry* tte; Position p(pos, pos.thread()); - EvalInfo ei; - Value v; + Value v, m = VALUE_NONE; for (int i = 0; pv[i] != MOVE_NONE; i++) { tte = TT.retrieve(p.get_key()); if (!tte || tte->move() != pv[i]) { - v = (p.is_check() ? VALUE_NONE : evaluate(p, ei)); - TT.store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, pv[i], v, ei.kingDanger[pos.side_to_move()]); + v = (p.is_check() ? VALUE_NONE : evaluate(p, m)); + TT.store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, pv[i], v, m); } p.do_move(pv[i], st); } @@ -2303,9 +2172,9 @@ namespace { #if !defined(_MSC_VER) - void* init_thread(void *threadID) { + void* init_thread(void* threadID) { - TM.idle_loop(*(int*)threadID, NULL); + ThreadsMgr.idle_loop(*(int*)threadID, NULL); return NULL; } @@ -2313,7 +2182,7 @@ namespace { DWORD WINAPI init_thread(LPVOID threadID) { - TM.idle_loop(*(int*)threadID, NULL); + ThreadsMgr.idle_loop(*(int*)threadID, NULL); return 0; } @@ -2322,41 +2191,6 @@ namespace { /// The ThreadsManager class - // resetNodeCounters(), resetBetaCounters(), searched_nodes() and - // get_beta_counters() are getters/setters for the per thread - // counters used to sort the moves at root. - - void ThreadsManager::resetNodeCounters() { - - for (int i = 0; i < MAX_THREADS; i++) - threads[i].nodes = 0ULL; - } - - void ThreadsManager::resetBetaCounters() { - - for (int i = 0; i < MAX_THREADS; i++) - threads[i].betaCutOffs[WHITE] = threads[i].betaCutOffs[BLACK] = 0ULL; - } - - int64_t ThreadsManager::nodes_searched() const { - - int64_t result = 0ULL; - for (int i = 0; i < ActiveThreads; i++) - result += threads[i].nodes; - - return result; - } - - void ThreadsManager::get_beta_counters(Color us, int64_t& our, int64_t& their) const { - - our = their = 0UL; - for (int i = 0; i < MAX_THREADS; i++) - { - our += threads[i].betaCutOffs[us]; - their += threads[i].betaCutOffs[opposite_color(us)]; - } - } - // idle_loop() is where the threads are parked when they have no work to do. // The parameter 'sp', if non-NULL, is a pointer to an active SplitPoint @@ -2379,38 +2213,42 @@ namespace { // If we are not thinking, wait for a condition to be signaled // instead of wasting CPU time polling for work. - while (AllThreadsShouldSleep || threadID >= ActiveThreads) + while (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING) { assert(!sp); assert(threadID != 0); - threads[threadID].state = THREAD_SLEEPING; -#if !defined(_MSC_VER) + if (AllThreadsShouldExit) + break; + + threads[threadID].state = THREAD_AVAILABLE; + lock_grab(&WaitLock); - if (AllThreadsShouldSleep || threadID >= ActiveThreads) - pthread_cond_wait(&WaitCond, &WaitLock); + + if (threadID >= ActiveThreads || threads[threadID].state == THREAD_INITIALIZING) + cond_wait(&WaitCond[threadID], &WaitLock); + lock_release(&WaitLock); -#else - WaitForSingleObject(SitIdleEvent[threadID], INFINITE); -#endif } - // If thread has just woken up, mark it as available - if (threads[threadID].state == THREAD_SLEEPING) - threads[threadID].state = THREAD_AVAILABLE; - // If this thread has been assigned work, launch a search if (threads[threadID].state == THREAD_WORKISWAITING) { - assert(!AllThreadsShouldExit && !AllThreadsShouldSleep); + assert(!AllThreadsShouldExit); threads[threadID].state = THREAD_SEARCHING; - if (threads[threadID].splitPoint->pvNode) - sp_search(threads[threadID].splitPoint, threadID); - else - sp_search(threads[threadID].splitPoint, threadID); + // Here we call search() with SplitPoint template parameter set to true + SplitPoint* tsp = threads[threadID].splitPoint; + Position pos(*tsp->pos, threadID); + SearchStack* ss = tsp->sstack[threadID] + 1; + ss->sp = tsp; + if (tsp->pvNode) + search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + else { + search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + } assert(threads[threadID].state == THREAD_SEARCHING); threads[threadID].state = THREAD_AVAILABLE; @@ -2428,6 +2266,8 @@ namespace { lock_grab(&(sp->lock)); lock_release(&(sp->lock)); + // In helpful master concept a master can help only a sub-tree, and + // because here is all finished is not possible master is booked. assert(threads[threadID].state == THREAD_AVAILABLE); threads[threadID].state = THREAD_SEARCHING; @@ -2443,23 +2283,15 @@ namespace { void ThreadsManager::init_threads() { - volatile int i; + int i, arg[MAX_THREADS]; bool ok; -#if !defined(_MSC_VER) - pthread_t pthread[1]; -#endif - // Initialize global locks lock_init(&MPLock); lock_init(&WaitLock); -#if !defined(_MSC_VER) - pthread_cond_init(&WaitCond, NULL); -#else for (i = 0; i < MAX_THREADS; i++) - SitIdleEvent[i] = CreateEvent(0, FALSE, FALSE, 0); -#endif + cond_init(&WaitCond[i]); // Initialize splitPoints[] locks for (i = 0; i < MAX_THREADS; i++) @@ -2469,33 +2301,34 @@ namespace { // Will be set just before program exits to properly end the threads AllThreadsShouldExit = false; - // Threads will be put to sleep as soon as created - AllThreadsShouldSleep = true; - - // All threads except the main thread should be initialized to THREAD_AVAILABLE + // Threads will be put all threads to sleep as soon as created ActiveThreads = 1; + + // All threads except the main thread should be initialized to THREAD_INITIALIZING threads[0].state = THREAD_SEARCHING; for (i = 1; i < MAX_THREADS; i++) - threads[i].state = THREAD_AVAILABLE; + threads[i].state = THREAD_INITIALIZING; // Launch the helper threads for (i = 1; i < MAX_THREADS; i++) { + arg[i] = i; #if !defined(_MSC_VER) - ok = (pthread_create(pthread, NULL, init_thread, (void*)(&i)) == 0); + pthread_t pthread[1]; + ok = (pthread_create(pthread, NULL, init_thread, (void*)(&arg[i])) == 0); + pthread_detach(pthread[0]); #else - ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&i), 0, NULL) != NULL); + ok = (CreateThread(NULL, 0, init_thread, (LPVOID)(&arg[i]), 0, NULL) != NULL); #endif - if (!ok) { cout << "Failed to create thread number " << i << endl; - Application::exit_with_failure(); + exit(EXIT_FAILURE); } // Wait until the thread has finished launching and is gone to sleep - while (threads[i].state != THREAD_SLEEPING) {} + while (threads[i].state == THREAD_INITIALIZING) {} } } @@ -2505,16 +2338,14 @@ namespace { void ThreadsManager::exit_threads() { - ActiveThreads = MAX_THREADS; // HACK - AllThreadsShouldSleep = true; // HACK - wake_sleeping_threads(); + AllThreadsShouldExit = true; // Let the woken up threads to exit idle_loop() - // This makes the threads to exit idle_loop() - AllThreadsShouldExit = true; - - // Wait for thread termination + // Wake up all the threads and waits for termination for (int i = 1; i < MAX_THREADS; i++) + { + wake_sleeping_thread(i); while (threads[i].state != THREAD_TERMINATED) {} + } // Now we can safely destroy the locks for (int i = 0; i < MAX_THREADS; i++) @@ -2523,6 +2354,10 @@ namespace { lock_destroy(&WaitLock); lock_destroy(&MPLock); + + // Now we can safely destroy the wait conditions + for (int i = 0; i < MAX_THREADS; i++) + cond_destroy(&WaitCond[i]); } @@ -2534,9 +2369,9 @@ namespace { assert(threadID >= 0 && threadID < ActiveThreads); - SplitPoint* sp; + SplitPoint* sp = threads[threadID].splitPoint; - for (sp = threads[threadID].splitPoint; sp && !sp->stopRequest; sp = sp->parent) {} + for ( ; sp && !sp->stopRequest; sp = sp->parent) {} return sp != NULL; } @@ -2561,12 +2396,9 @@ namespace { // Make a local copy to be sure doesn't change under our feet int localActiveSplitPoints = threads[slave].activeSplitPoints; - if (localActiveSplitPoints == 0) - // No active split points means that the thread is available as - // a slave for any other thread. - return true; - - if (ActiveThreads == 2) + // No active split points means that the thread is available as + // a slave for any other thread. + if (localActiveSplitPoints == 0 || ActiveThreads == 2) return true; // Apply the "helpful master" concept if possible. Use localActiveSplitPoints @@ -2601,25 +2433,24 @@ namespace { // split point objects), the function immediately returns. If splitting is // possible, a SplitPoint object is initialized with all the data that must be // copied to the helper threads and we tell our helper threads that they have - // been assigned work. This will cause them to instantly leave their idle loops - // and call sp_search(). When all threads have returned from sp_search() then - // split() returns. + // been assigned work. This will cause them to instantly leave their idle loops and + // call search().When all threads have returned from search() then split() returns. template - void ThreadsManager::split(const Position& p, SearchStack* ss, int ply, Value* alpha, + void ThreadsManager::split(Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue, Depth depth, Move threatMove, - bool mateThreat, int* moveCount, MovePicker* mp, bool pvNode) { - assert(p.is_ok()); + bool mateThreat, int moveCount, MovePicker* mp, bool pvNode) { + assert(pos.is_ok()); assert(ply > 0 && ply < PLY_MAX); assert(*bestValue >= -VALUE_INFINITE); assert(*bestValue <= *alpha); assert(*alpha < beta); assert(beta <= VALUE_INFINITE); - assert(depth > Depth(0)); - assert(p.thread() >= 0 && p.thread() < ActiveThreads); + assert(depth > DEPTH_ZERO); + assert(pos.thread() >= 0 && pos.thread() < ActiveThreads); assert(ActiveThreads > 1); - int i, master = p.thread(); + int i, master = pos.thread(); Thread& masterThread = threads[master]; lock_grab(&MPLock); @@ -2648,8 +2479,9 @@ namespace { splitPoint.pvNode = pvNode; splitPoint.bestValue = *bestValue; splitPoint.mp = mp; - splitPoint.moveCount = *moveCount; - splitPoint.pos = &p; + splitPoint.moveCount = moveCount; + splitPoint.pos = &pos; + splitPoint.nodes = 0; splitPoint.parentSstack = ss; for (i = 0; i < ActiveThreads; i++) splitPoint.slaves[i] = 0; @@ -2703,63 +2535,38 @@ namespace { *bestValue = splitPoint.bestValue; masterThread.activeSplitPoints--; masterThread.splitPoint = splitPoint.parent; + pos.set_nodes_searched(pos.nodes_searched() + splitPoint.nodes); lock_release(&MPLock); } - // wake_sleeping_threads() wakes up all sleeping threads when it is time + // wake_sleeping_thread() wakes up all sleeping threads when it is time // to start a new search from the root. - void ThreadsManager::wake_sleeping_threads() { - - assert(AllThreadsShouldSleep); - assert(ActiveThreads > 0); - - AllThreadsShouldSleep = false; - - if (ActiveThreads == 1) - return; - -#if !defined(_MSC_VER) - pthread_mutex_lock(&WaitLock); - pthread_cond_broadcast(&WaitCond); - pthread_mutex_unlock(&WaitLock); -#else - for (int i = 1; i < MAX_THREADS; i++) - SetEvent(SitIdleEvent[i]); -#endif + void ThreadsManager::wake_sleeping_thread(int threadID) { + lock_grab(&WaitLock); + cond_signal(&WaitCond[threadID]); + lock_release(&WaitLock); } - // put_threads_to_sleep() makes all the threads go to sleep just before - // to leave think(), at the end of the search. Threads should have already - // finished the job and should be idle. - - void ThreadsManager::put_threads_to_sleep() { - - assert(!AllThreadsShouldSleep); - - // This makes the threads to go to sleep - AllThreadsShouldSleep = true; - } - /// The RootMoveList class // RootMoveList c'tor - RootMoveList::RootMoveList(Position& pos, Move searchMoves[]) : count(0) { + RootMoveList::RootMoveList(Position& pos, Move searchMoves[]) { SearchStack ss[PLY_MAX_PLUS_2]; - MoveStack mlist[MaxRootMoves]; + MoveStack mlist[MOVES_MAX]; StateInfo st; bool includeAllMoves = (searchMoves[0] == MOVE_NONE); // Initialize search stack init_ss_array(ss, PLY_MAX_PLUS_2); - ss[0].currentMove = ss[0].bestMove = MOVE_NONE; - ss[0].eval = VALUE_NONE; + ss[0].eval = ss[0].evalMargin = VALUE_NONE; + count = 0; // Generate all legal moves MoveStack* last = generate_moves(pos, mlist); @@ -2776,32 +2583,35 @@ namespace { continue; // Find a quick score for the move - pos.do_move(cur->move, st); - ss[0].currentMove = cur->move; - moves[count].move = cur->move; - moves[count].score = -qsearch(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, Depth(0), 1); - moves[count].pv[0] = cur->move; + moves[count].move = ss[0].currentMove = moves[count].pv[0] = cur->move; moves[count].pv[1] = MOVE_NONE; + pos.do_move(cur->move, st); + moves[count].score = -qsearch(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, DEPTH_ZERO, 1); pos.undo_move(cur->move); count++; } sort(); } + // Score root moves using the standard way used in main search, the moves + // are scored according to the order in which are returned by MovePicker. - // RootMoveList simple methods definitions - - void RootMoveList::set_move_nodes(int moveNum, int64_t nodes) { + void RootMoveList::score_moves(const Position& pos) + { + Move move; + int score = 1000; + MovePicker mp = MovePicker(pos, MOVE_NONE, ONE_PLY, H); - moves[moveNum].nodes = nodes; - moves[moveNum].cumulativeNodes += nodes; + while ((move = mp.get_next_move()) != MOVE_NONE) + for (int i = 0; i < count; i++) + if (moves[i].move == move) + { + moves[i].mp_score = score--; + break; + } } - void RootMoveList::set_beta_counters(int moveNum, int64_t our, int64_t their) { - - moves[moveNum].ourBeta = our; - moves[moveNum].theirBeta = their; - } + // RootMoveList simple methods definitions void RootMoveList::set_move_pv(int moveNum, const Move pv[]) { @@ -2841,4 +2651,4 @@ namespace { } } -} // namspace +} // namespace