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
int active_threads() const { return ActiveThreads; }
void set_active_threads(int newActiveThreads) { ActiveThreads = newActiveThreads; }
- void incrementNodeCounter(int threadID) { threads[threadID].nodes++; }
- void resetNodeCounters();
- int64_t nodes_searched() 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 <bool Fake>
- 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
-
+ Lock MPLock, SleepLock[MAX_THREADS];
+ WaitCondition SleepCond[MAX_THREADS];
};
struct RootMove {
- RootMove() : mp_score(0), nodes(0), cumulativeNodes(0) {}
+ 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
Move move;
Value score;
int mp_score;
- int64_t nodes, cumulativeNodes;
+ int64_t nodes;
Move pv[PLY_MAX_PLUS_2];
};
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 score_moves(const Position& pos);
- void set_move_nodes(int moveNum, int64_t nodes);
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;
};
// 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 * ONE_PLY;
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 * ONE_PLY ? FutilityMarginsMatrix[Max(d, 1)][Min(mn, 63)] : 2 * VALUE_INFINITE); }
+ 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
const Value EasyMoveMargin = Value(0x200);
- /// Global variables
+ /// Namespace variables
+
+ // Book object
+ Book OpeningBook;
// Iteration counter
int Iteration;
// Multi-threads related variables
Depth MinimumSplitDepth;
int MaxThreadsPerSplitPoint;
+ bool UseSleepingThreads;
ThreadsManager ThreadsMgr;
// Node counters, used only by thread[0] but try to keep in different cache
/// 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 <NodeType PvNode>
+ template <NodeType PvNode, bool SpNode>
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply);
template <NodeType PvNode>
Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply);
template <NodeType PvNode>
- 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<PvNode>(pos, ss, alpha, beta, DEPTH_ZERO, ply)
+ : search<PvNode, false>(pos, ss, alpha, beta, depth, ply);
+ }
template <NodeType PvNode>
Depth extension(const Position& pos, Move m, bool captureOrPromotion, bool moveIsCheck, bool singleEvasion, bool mateThreat, bool* dangerous);
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);
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);
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
void init_threads() { ThreadsMgr.init_threads(); }
void exit_threads() { ThreadsMgr.exit_threads(); }
-int64_t nodes_searched() { return ThreadsMgr.nodes_searched(); }
/// init_search() is called during startup. It initializes various lookup tables
// Init reductions array
for (hd = 1; hd < 64; hd++) for (mc = 1; mc < 64; mc++)
{
- double pvRed = 0.33 + log(double(hd)) * log(double(mc)) / 4.5;
+ double pvRed = log(double(hd)) * log(double(mc)) / 3.0;
double nonPVRed = 0.33 + log(double(hd)) * log(double(mc)) / 2.25;
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));
}
int perft(Position& pos, Depth depth)
{
- MoveStack mlist[256];
+ MoveStack mlist[MOVES_MAX];
StateInfo st;
Move m;
int sum = 0;
/// 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;
- ThreadsMgr.resetNodeCounters();
SearchStartTime = get_system_time();
ExactMaxTime = maxTime;
MaxDepth = maxDepth;
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<bool>())
{
- if (get_option_value_string("Book File") != OpeningBook.file_name())
- OpeningBook.open(get_option_value_string("Book File"));
+ if (Options["Book File"].value<std::string>() != OpeningBook.file_name())
+ OpeningBook.open(Options["Book File"].value<std::string>());
- Move bookMove = OpeningBook.get_move(pos, get_option_value_bool("Best Book Move"));
+ Move bookMove = OpeningBook.get_move(pos, Options["Best Book Move"].value<bool>());
if (bookMove != MOVE_NONE)
{
if (PonderSearch)
}
// Read UCI option values
- TT.set_size(get_option_value_int("Hash"));
- if (button_was_pressed("Clear Hash"))
+ TT.set_size(Options["Hash"].value<int>());
+ if (Options["Clear Hash"].value<bool>())
+ {
+ 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") * ONE_PLY;
- MaxThreadsPerSplitPoint = get_option_value_int("Maximum Number of Threads per Split Point");
- MultiPV = get_option_value_int("MultiPV");
- UseLogFile = get_option_value_bool("Use Search Log");
+ CheckExtension[1] = Options["Check Extension (PV nodes)"].value<Depth>();
+ CheckExtension[0] = Options["Check Extension (non-PV nodes)"].value<Depth>();
+ SingleEvasionExtension[1] = Options["Single Evasion Extension (PV nodes)"].value<Depth>();
+ SingleEvasionExtension[0] = Options["Single Evasion Extension (non-PV nodes)"].value<Depth>();
+ PawnPushTo7thExtension[1] = Options["Pawn Push to 7th Extension (PV nodes)"].value<Depth>();
+ PawnPushTo7thExtension[0] = Options["Pawn Push to 7th Extension (non-PV nodes)"].value<Depth>();
+ PassedPawnExtension[1] = Options["Passed Pawn Extension (PV nodes)"].value<Depth>();
+ PassedPawnExtension[0] = Options["Passed Pawn Extension (non-PV nodes)"].value<Depth>();
+ PawnEndgameExtension[1] = Options["Pawn Endgame Extension (PV nodes)"].value<Depth>();
+ PawnEndgameExtension[0] = Options["Pawn Endgame Extension (non-PV nodes)"].value<Depth>();
+ MateThreatExtension[1] = Options["Mate Threat Extension (PV nodes)"].value<Depth>();
+ MateThreatExtension[0] = Options["Mate Threat Extension (non-PV nodes)"].value<Depth>();
+
+ MinimumSplitDepth = Options["Minimum Split Depth"].value<int>() * ONE_PLY;
+ MaxThreadsPerSplitPoint = Options["Maximum Number of Threads per Split Point"].value<int>();
+ MultiPV = Options["MultiPV"].value<int>();
+ UseLogFile = Options["Use Search Log"].value<bool>();
+ UseSleepingThreads = Options["Use Sleeping Threads"].value<bool>();
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<std::string>().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");
+ int newActiveThreads = Options["Threads"].value<int>();
if (newActiveThreads != ThreadsMgr.active_threads())
{
ThreadsMgr.set_active_threads(newActiveThreads);
- init_eval(ThreadsMgr.active_threads());
+ init_eval(newActiveThreads);
}
- // Wake up sleeping threads
- ThreadsMgr.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()];
if (UseLogFile)
LogFile.close();
- ThreadsMgr.put_threads_to_sleep();
+ // This makes all the threads to go to sleep
+ ThreadsMgr.set_active_threads(1);
return !Quit;
}
// 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)
// Print RootMoveList startup scoring to the standard output,
// so to output information also for iteration 1.
- cout << set960(p.is_chess960()) // Is enough to set once at the beginning
+ 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 " << ThreadsMgr.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)
}
// 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!
stopSearch = true;
// Stop search early if one move seems to be much better than the others
- int64_t nodes = ThreadsMgr.nodes_searched();
if ( Iteration >= 8
&& EasyMove == pv[0]
- && ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100
+ && ( ( rml.move_nodes(0) > (pos.nodes_searched() * 85) / 100
&& current_search_time() > TimeMgr.available_time() / 16)
- ||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100
+ ||( 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.pv_unstability(BestMoveChangesByIteration[Iteration],
+ TimeMgr.pv_instability(BestMoveChangesByIteration[Iteration],
BestMoveChangesByIteration[Iteration-1]);
// Stop search if most of MaxSearchTime is consumed at the end of the
wait_for_stop_or_ponderhit();
else
// Print final search statistics
- cout << "info nodes " << ThreadsMgr.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;
}
if (dbg_show_hit_rate)
dbg_print_hit_rate(LogFile);
- LogFile << "\nNodes: " << ThreadsMgr.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);
}
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;
// 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)
FirstRootMove = (i == 0);
// Save the current node count before the move is searched
- nodes = ThreadsMgr.nodes_searched();
+ 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
break;
// Remember searched nodes counts for this move
- rml.set_move_nodes(i, ThreadsMgr.nodes_searched() - nodes);
+ rml.add_move_nodes(i, pos.nodes_searched() - nodes);
assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE);
assert(value < beta);
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 " << ThreadsMgr.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
}
- // 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 <NodeType PvNode>
+ template <NodeType PvNode, bool SpNode>
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) {
assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE);
assert(ply > 0 && ply < PLY_MAX);
assert(pos.thread() >= 0 && pos.thread() < ThreadsMgr.active_threads());
- Move movesSearched[256];
- EvalInfo ei;
+ Move movesSearched[MOVES_MAX];
StateInfo st;
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
- ThreadsMgr.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 || ThreadsMgr.thread_should_stop(threadID))
- return VALUE_ZERO;
-
- 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
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:
// * 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
&& !isCheck
&& refinedValue < beta - razor_margin(depth)
&& ttMove == MOVE_NONE
- && (ss-1)->currentMove != MOVE_NULL
&& !value_is_mate(beta)
&& !pos.has_pawn_on_7th(pos.side_to_move()))
{
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 > ONE_PLY
&& !isCheck
- && refinedValue >= beta - (depth >= 4 * ONE_PLY ? NullMoveMargin : 0)
+ && refinedValue >= beta
&& !value_is_mate(beta)
&& pos.non_pawn_material(pos.side_to_move()))
{
pos.do_null_move(st);
(ss+1)->skipNullMove = true;
-
- nullValue = depth-R*ONE_PLY < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1)
- : - search<NonPV>(pos, ss+1, -beta, -alpha, depth-R*ONE_PLY, ply+1);
+ nullValue = -search<NonPV>(pos, ss+1, -beta, -alpha, depth-R*ONE_PLY, ply+1);
(ss+1)->skipNullMove = false;
pos.undo_null_move();
if (PvNode)
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
&& (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
{
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);
}
}
- newDepth = depth - ONE_PLY + 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
// 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*ONE_PLY for predicted depth,
// but fixing this made program slightly weaker.
Depth predictedDepth = newDepth - reduction<NonPV>(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;
}
}
// Step extra. pv search (only in PV nodes)
// The first move in list is the expected PV
- if (PvNode && moveCount == 1)
- value = newDepth < ONE_PLY ? -qsearch<PV>(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1)
- : - search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
+ if (!SpNode && PvNode && moveCount == 1)
+ value = -search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
else
{
// Step 14. Reduced depth search
&& !captureOrPromotion
&& !dangerous
&& !move_is_castle(move)
- && !move_is_killer(move, ss))
+ && !(ss->killers[0] == move || ss->killers[1] == move))
{
ss->reduction = reduction<PvNode>(depth, moveCount);
if (ss->reduction)
{
+ alpha = SpNode ? sp->alpha : alpha;
Depth d = newDepth - ss->reduction;
- value = d < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
- : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, ply+1);
+ value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, ply+1);
doFullDepthSearch = (value > alpha);
}
assert(newDepth - ONE_PLY >= ONE_PLY);
ss->reduction = ONE_PLY;
+ alpha = SpNode ? sp->alpha : alpha;
value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1);
doFullDepthSearch = (value > alpha);
}
// Step 15. Full depth search
if (doFullDepthSearch)
{
- value = newDepth < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
- : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1);
+ alpha = SpNode ? sp->alpha : alpha;
+ value = -search<NonPV>(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 < ONE_PLY ? -qsearch<PV>(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1)
- : - search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
+ value = -search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
}
}
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
+ if ( !SpNode
+ && depth >= MinimumSplitDepth
&& ThreadsMgr.active_threads() > 1
&& bestValue < beta
&& ThreadsMgr.available_thread_exists(threadID)
&& !ThreadsMgr.thread_should_stop(threadID)
&& Iteration <= 99)
ThreadsMgr.split<FakeSplit>(pos, ss, ply, &alpha, beta, &bestValue, depth,
- threatMove, mateThreat, &moveCount, &mp, PvNode);
+ 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 || ThreadsMgr.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
- && !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);
assert(ply > 0 && ply < PLY_MAX);
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;
- ThreadsMgr.incrementNodeCounter(pos.thread());
ss->bestMove = ss->currentMove = MOVE_NONE;
// Check for an instant draw or maximum ply reached
if (isCheck)
{
bestValue = futilityBase = -VALUE_INFINITE;
- ss->eval = VALUE_NONE;
+ ss->eval = evalMargin = VALUE_NONE;
deepChecks = enoughMaterial = false;
}
else
{
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;
}
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;
}
}
}
- // 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
// Update transposition table
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);
}
- // 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 <NodeType PvNode>
- void sp_search(SplitPoint* sp, int threadID) {
-
- assert(threadID >= 0 && threadID < ThreadsMgr.active_threads());
- assert(ThreadsMgr.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
- && !ThreadsMgr.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<PvNode>(pos, move, captureOrPromotion, moveIsCheck, false, sp->mateThreat, &dangerous);
- newDepth = sp->depth - ONE_PLY + 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<NonPV>(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<PvNode>(sp->depth, moveCount);
- if (ss->reduction)
- {
- Value localAlpha = sp->alpha;
- Depth d = newDepth - ss->reduction;
- value = d < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(localAlpha+1), -localAlpha, DEPTH_ZERO, sp->ply+1)
- : - search<NonPV>(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 * ONE_PLY)
- {
- assert(newDepth - ONE_PLY >= ONE_PLY);
-
- ss->reduction = ONE_PLY;
- Value localAlpha = sp->alpha;
- value = -search<NonPV>(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth-ss->reduction, sp->ply+1);
- doFullDepthSearch = (value > localAlpha);
- }
- ss->reduction = DEPTH_ZERO; // Restore original reduction
- }
-
- // Step 15. Full depth search
- if (doFullDepthSearch)
- {
- Value localAlpha = sp->alpha;
- value = newDepth < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(localAlpha+1), -localAlpha, DEPTH_ZERO, sp->ply+1)
- : - search<NonPV>(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 < ONE_PLY ? -qsearch<PV>(pos, ss+1, -sp->beta, -sp->alpha, DEPTH_ZERO, sp->ply+1)
- : - search<PV>(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 && !ThreadsMgr.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
}
- // 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
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);
// nps() computes the current nodes/second count.
- int nps() {
+ int nps(const Position& pos) {
int t = current_search_time();
- return (t > 0 ? int((ThreadsMgr.nodes_searched() * 1000) / t) : 0);
+ return (t > 0 ? int((pos.nodes_searched() * 1000) / t) : 0);
}
// 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;
if (dbg_show_hit_rate)
dbg_print_hit_rate();
- cout << "info nodes " << ThreadsMgr.nodes_searched() << " nps " << nps()
+ cout << "info nodes " << pos.nodes_searched() << " nps " << nps(pos)
<< " time " << t << endl;
}
if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
|| (ExactMaxTime && t >= ExactMaxTime)
- || (Iteration >= 3 && MaxNodes && ThreadsMgr.nodes_searched() >= MaxNodes))
+ || (Iteration >= 3 && MaxNodes && pos.nodes_searched() >= MaxNodes))
AbortSearch = true;
}
ss->excludedMove = MOVE_NONE;
ss->skipNullMove = false;
ss->reduction = DEPTH_ZERO;
+ ss->sp = NULL;
if (i < 3)
ss->killers[0] = ss->killers[1] = ss->mateKiller = MOVE_NONE;
<< " score " << value_to_uci(value)
<< (value >= beta ? " lowerbound" : value <= alpha ? " upperbound" : "")
<< " time " << current_search_time()
- << " nodes " << ThreadsMgr.nodes_searched()
- << " nps " << nps()
+ << " nodes " << pos.nodes_searched()
+ << " nps " << nps(pos)
<< " pv ";
for (Move* m = pv; *m != MOVE_NONE; m++)
ValueType t = value >= beta ? VALUE_TYPE_LOWER :
value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT;
- LogFile << pretty_pv(pos, current_search_time(), Iteration,
- ThreadsMgr.nodes_searched(), value, t, pv) << endl;
+ LogFile << pretty_pv(pos, current_search_time(), Iteration, value, t, pv) << endl;
}
}
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);
}
#if !defined(_MSC_VER)
- void* init_thread(void *threadID) {
+ void* init_thread(void* threadID) {
ThreadsMgr.idle_loop(*(int*)threadID, NULL);
return NULL;
/// 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;
- }
-
- int64_t ThreadsManager::nodes_searched() const {
-
- int64_t result = 0ULL;
- for (int i = 0; i < ActiveThreads; i++)
- result += threads[i].nodes;
-
- return result;
- }
-
// 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
assert(threadID >= 0 && threadID < MAX_THREADS);
+ int i;
+ bool allFinished = false;
+
while (true)
{
// Slave threads can exit as soon as AllThreadsShouldExit raises,
// 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
+ || (UseSleepingThreads && threads[threadID].state == THREAD_AVAILABLE))
{
- assert(!sp);
- assert(threadID != 0);
- threads[threadID].state = THREAD_SLEEPING;
+ assert(!sp || UseSleepingThreads);
+ assert(threadID != 0 || UseSleepingThreads);
-#if !defined(_MSC_VER)
- lock_grab(&WaitLock);
- if (AllThreadsShouldSleep || threadID >= ActiveThreads)
- pthread_cond_wait(&WaitCond, &WaitLock);
- lock_release(&WaitLock);
-#else
- WaitForSingleObject(SitIdleEvent[threadID], INFINITE);
-#endif
- }
+ if (threads[threadID].state == THREAD_INITIALIZING)
+ threads[threadID].state = THREAD_AVAILABLE;
- // If thread has just woken up, mark it as available
- if (threads[threadID].state == THREAD_SLEEPING)
- threads[threadID].state = THREAD_AVAILABLE;
+ // Grab the lock to avoid races with wake_sleeping_thread()
+ lock_grab(&SleepLock[threadID]);
+
+ // If we are master and all slaves have finished do not go to sleep
+ for (i = 0; sp && i < ActiveThreads && !sp->slaves[i]; i++) {}
+ allFinished = (i == ActiveThreads);
+
+ if (allFinished || AllThreadsShouldExit)
+ {
+ lock_release(&SleepLock[threadID]);
+ break;
+ }
+
+ // Do sleep here after retesting sleep conditions
+ if (threadID >= ActiveThreads || threads[threadID].state == THREAD_AVAILABLE)
+ cond_wait(&SleepCond[threadID], &SleepLock[threadID]);
+
+ lock_release(&SleepLock[threadID]);
+ }
// 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<PV>(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<PV, true>(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply);
else
- sp_search<NonPV>(threads[threadID].splitPoint, threadID);
+ search<NonPV, true>(pos, ss, tsp->alpha, tsp->beta, tsp->depth, tsp->ply);
assert(threads[threadID].state == THREAD_SEARCHING);
threads[threadID].state = THREAD_AVAILABLE;
+
+ // Wake up master thread so to allow it to return from the idle loop in
+ // case we are the last slave of the split point.
+ if (UseSleepingThreads && threadID != tsp->master && threads[tsp->master].state == THREAD_AVAILABLE)
+ wake_sleeping_thread(tsp->master);
}
// If this thread is the master of a split point and all slaves have
// finished their work at this split point, return from the idle loop.
- int i = 0;
- for ( ; sp && i < ActiveThreads && !sp->slaves[i]; i++) {}
+ for (i = 0; sp && i < ActiveThreads && !sp->slaves[i]; i++) {}
+ allFinished = (i == ActiveThreads);
- if (i == ActiveThreads)
+ if (allFinished)
{
// Because sp->slaves[] is reset under lock protection,
// be sure sp->lock has been released before to return.
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;
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
+ {
+ lock_init(&SleepLock[i]);
+ cond_init(&SleepCond[i]);
+ }
// Initialize splitPoints[] locks
for (i = 0; i < MAX_THREADS; i++)
// 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) {}
}
}
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++)
for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
lock_destroy(&(threads[i].splitPoints[j].lock));
- lock_destroy(&WaitLock);
lock_destroy(&MPLock);
+
+ // Now we can safely destroy the wait conditions
+ for (int i = 0; i < MAX_THREADS; i++)
+ {
+ lock_destroy(&SleepLock[i]);
+ cond_destroy(&SleepCond[i]);
+ }
}
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;
}
// 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
// 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 <bool Fake>
- 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_ZERO);
- assert(p.thread() >= 0 && p.thread() < ActiveThreads);
+ 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);
// Initialize the split point object
splitPoint.parent = masterThread.splitPoint;
+ splitPoint.master = master;
splitPoint.stopRequest = false;
splitPoint.ply = ply;
splitPoint.depth = depth;
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;
assert(i == master || threads[i].state == THREAD_BOOKED);
threads[i].state = THREAD_WORKISWAITING; // This makes the slave to exit from idle_loop()
+
+ if (UseSleepingThreads && i != master)
+ wake_sleeping_thread(i);
}
// Everything is set up. The master thread enters the idle loop, from
*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
- // to start a new search from the root.
-
- void ThreadsManager::wake_sleeping_threads() {
-
- assert(AllThreadsShouldSleep);
- assert(ActiveThreads > 0);
+ // wake_sleeping_thread() wakes up the thread with the given threadID
+ // when it is time to start a new search.
- 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(&SleepLock[threadID]);
+ cond_signal(&SleepCond[threadID]);
+ lock_release(&SleepLock[threadID]);
}
- // 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);
continue;
// Find a quick score for the 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);
- ss[0].currentMove = cur->move;
- moves[count].move = cur->move;
moves[count].score = -qsearch<PV>(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, DEPTH_ZERO, 1);
- moves[count].pv[0] = cur->move;
- moves[count].pv[1] = MOVE_NONE;
pos.undo_move(cur->move);
count++;
}
// RootMoveList simple methods definitions
- void RootMoveList::set_move_nodes(int moveNum, int64_t nodes) {
-
- moves[moveNum].nodes = nodes;
- moves[moveNum].cumulativeNodes += nodes;
- }
-
void RootMoveList::set_move_pv(int moveNum, const Move pv[]) {
int j;
}
}
-} // namspace
+} // namespace
projects / stockfish / blobdiff