X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=d385e3eb7c4a07a8094465245e7286328d46c7af;hp=0f937ed029d1fd749378c64e7326dc4edb4e44cc;hb=2ff2b5972799c2cb1b68e2d82e35b9b3c7c6996d;hpb=29fa6f3c5f8a700567a20c0dd2caf18876f736a0 diff --git a/src/search.cpp b/src/search.cpp index 0f937ed0..d385e3eb 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -306,7 +306,7 @@ namespace { int current_search_time(); std::string value_to_uci(Value v); - int nps(const Position& pos); + std::string speed_to_uci(int64_t nodes); void poll(const Position& pos); void wait_for_stop_or_ponderhit(); @@ -558,14 +558,14 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ Move bestMove = id_loop(pos, searchMoves, &ponderMove); // Print final search statistics - cout << "info nodes " << pos.nodes_searched() - << " nps " << nps(pos) - << " time " << current_search_time() << endl; + cout << "info" << speed_to_uci(pos.nodes_searched()) << endl; if (UseLogFile) { + int t = current_search_time(); + LogFile << "Nodes: " << pos.nodes_searched() - << "\nNodes/second: " << nps(pos) + << "\nNodes/second: " << (t > 0 ? int(pos.nodes_searched() * 1000 / t) : 0) << "\nBest move: " << move_to_san(pos, bestMove); StateInfo st; @@ -611,7 +611,7 @@ namespace { // Initialize FIXME move before Rml.init() TT.new_search(); H.clear(); - memset(ss, 0, PLY_MAX_PLUS_2 * sizeof(SearchStack)); + memset(ss, 0, 4 * sizeof(SearchStack)); *ponderMove = bestMove = easyMove = MOVE_NONE; depth = aspirationDelta = 0; ss->currentMove = MOVE_NULL; // Hack to skip update_gains() @@ -801,7 +801,8 @@ namespace { bestValue = alpha; // Step 1. Initialize node and poll. Polling can abort search - ss->currentMove = ss->bestMove = threatMove = MOVE_NONE; + ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE; + (ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO; (ss+2)->killers[0] = (ss+2)->killers[1] = (ss+2)->mateKiller = MOVE_NONE; if (threadID == 0 && ++NodesSincePoll > NodesBetweenPolls) @@ -1027,9 +1028,7 @@ split_point_start: // At split points actual search starts from here if (SendSearchedNodes) { SendSearchedNodes = false; - cout << "info nodes " << nodes - << " nps " << nps(pos) - << " time " << current_search_time() << endl; + cout << "info" << speed_to_uci(pos.nodes_searched()) << endl; } if (current_search_time() >= 1000) @@ -1070,7 +1069,7 @@ split_point_start: // At split points actual search starts from here // Update current move (this must be done after singular extension search) ss->currentMove = move; - newDepth = depth - (!Root ? ONE_PLY : DEPTH_ZERO) + ext; + newDepth = depth - ONE_PLY + ext; // Step 12. Futility pruning (is omitted in PV nodes) if ( !PvNode @@ -1217,7 +1216,7 @@ split_point_start: // At split points actual search starts from here ss->bestMove = move; if (SpNode) - sp->parentSstack->bestMove = move; + sp->ss->bestMove = move; } } @@ -1857,6 +1856,14 @@ split_point_start: // At split points actual search starts from here H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); } + // current_search_time() returns the number of milliseconds which have passed + // since the beginning of the current search. + + int current_search_time() { + + return get_system_time() - SearchStartTime; + } + // value_to_uci() converts a value to a string suitable for use with the UCI // protocol specifications: @@ -1878,21 +1885,19 @@ split_point_start: // At split points actual search starts from here } - // current_search_time() returns the number of milliseconds which have passed - // since the beginning of the current search. - - int current_search_time() { - - return get_system_time() - SearchStartTime; - } + // speed_to_uci() returns a string with time stats of current search suitable + // to be sent to UCI gui. + std::string speed_to_uci(int64_t nodes) { - // nps() computes the current nodes/second count + std::stringstream s; + int t = current_search_time(); - int nps(const Position& pos) { + s << " nodes " << nodes + << " nps " << (t > 0 ? int(nodes * 1000 / t) : 0) + << " time " << t; - int t = current_search_time(); - return (t > 0 ? int((pos.nodes_searched() * 1000) / t) : 0); + return s.str(); } @@ -2109,16 +2114,19 @@ split_point_start: // At split points actual search starts from here threads[threadID].state = THREAD_SEARCHING; - // Here we call search() with SplitPoint template parameter set to true + // Copy SplitPoint position and search stack and call search() + // with SplitPoint template parameter set to true. + SearchStack ss[PLY_MAX_PLUS_2]; SplitPoint* tsp = threads[threadID].splitPoint; Position pos(*tsp->pos, threadID); - SearchStack* ss = tsp->sstack[threadID] + 1; - ss->sp = tsp; + + memcpy(ss, tsp->ss - 1, 4 * sizeof(SearchStack)); + (ss+1)->sp = tsp; if (tsp->pvNode) - search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + search(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); else - search(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); + search(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth, tsp->ply); assert(threads[threadID].state == THREAD_SEARCHING); @@ -2363,7 +2371,7 @@ split_point_start: // At split points actual search starts from here splitPoint.moveCount = moveCount; splitPoint.pos = &pos; splitPoint.nodes = 0; - splitPoint.parentSstack = ss; + splitPoint.ss = ss; for (i = 0; i < activeThreads; i++) splitPoint.slaves[i] = 0; @@ -2390,12 +2398,10 @@ split_point_start: // At split points actual search starts from here lock_release(&mpLock); // Tell the threads that they have work to do. This will make them leave - // their idle loop. But before copy search stack tail for each thread. + // their idle loop. for (i = 0; i < activeThreads; i++) if (i == master || splitPoint.slaves[i]) { - memcpy(splitPoint.sstack[i], ss - 1, 4 * sizeof(SearchStack)); - assert(i == master || threads[i].state == THREAD_BOOKED); threads[i].state = THREAD_WORKISWAITING; // This makes the slave to exit from idle_loop() @@ -2536,9 +2542,7 @@ split_point_start: // At split points actual search starts from here << " multipv " << pvLine + 1 << " score " << value_to_uci(pv_score) << (pv_score >= beta ? " lowerbound" : pv_score <= alpha ? " upperbound" : "") - << " time " << current_search_time() - << " nodes " << pos.nodes_searched() - << " nps " << nps(pos) + << speed_to_uci(pos.nodes_searched()) << " pv " << l.str(); return s.str();