namespace {
- // Different node types, used as template parameter
- enum NodeType { NonPV, PV };
-
- // Set to true to force running with one thread. Used for debugging.
+ // Set to true to force running with one thread. Used for debugging
const bool FakeSplit = false;
- // Lookup table to check if a Piece is a slider and its access function
- 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]; }
+ // Different node types, used as template parameter
+ enum NodeType { NonPV, PV };
// RootMove struct is used for moves at the root of the tree. For each root
// move, we store two scores, a node count, and a PV (really a refutation
// in the case of moves which fail low). Value pv_score is normally set at
// -VALUE_INFINITE for all non-pv moves, while non_pv_score is computed
// according to the order in which moves are returned by MovePicker.
-
struct RootMove {
RootMove();
Move pv[PLY_MAX_PLUS_2];
};
-
// RootMoveList struct is just a vector of RootMove objects,
// with an handful of methods above the standard ones.
-
struct RootMoveList : public std::vector<RootMove> {
typedef std::vector<RootMove> Base;
int bestMoveChanges;
};
+ // MovePickerExt template class extends MovePicker and allows to choose at compile
+ // time the proper moves source according to the type of node. In the default case
+ // we simply create and use a standard MovePicker object.
+ template<bool SpNode, bool Root> struct MovePickerExt : public MovePicker {
- // Overload operator<<() to make it easier to print moves in a coordinate
- // notation compatible with UCI protocol.
- std::ostream& operator<<(std::ostream& os, Move m) {
+ MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
+ : MovePicker(p, ttm, d, h, ss, b) {}
- bool chess960 = (os.iword(0) != 0); // See set960()
- return os << move_to_uci(m, chess960);
- }
+ RootMoveList::iterator rm; // Dummy, needed to compile
+ };
+ // In case of a SpNode we use split point's shared MovePicker object as moves source
+ template<> struct MovePickerExt<true, false> : public MovePicker {
- // 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 read it to properly format castling moves.
- enum set960 {};
+ MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
+ : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
- std::ostream& operator<< (std::ostream& os, const set960& f) {
+ Move get_next_move() { return mp->get_next_move(); }
- os.iword(0) = int(f);
- return os;
- }
+ RootMoveList::iterator rm; // Dummy, needed to compile
+ MovePicker* mp;
+ };
+ // In case of a Root node we use RootMoveList as moves source
+ template<> struct MovePickerExt<false, true> : public MovePicker {
- /// Adjustments
+ MovePickerExt(const Position&, Move, Depth, const History&, SearchStack*, Value);
+ Move get_next_move();
+
+ RootMoveList::iterator rm;
+ bool firstCall;
+ };
+
+
+ /// Constants
+
+ // Lookup table to check if a Piece is a slider and its access function
+ 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]; }
// Step 6. Razoring
void poll(const Position& pos);
void wait_for_stop_or_ponderhit();
+ // Overload operator<<() to make it easier to print moves in a coordinate
+ // notation compatible with UCI protocol.
+ std::ostream& operator<<(std::ostream& os, Move m) {
- // MovePickerExt is an extended MovePicker class used to choose at compile time
- // the proper move source according to the type of node.
- template<bool SpNode, bool Root> struct MovePickerExt;
-
- // In Root nodes use RootMoveList as source. Score and sort the root moves
- // before to search them.
- template<> struct MovePickerExt<false, true> : public MovePicker {
-
- MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePicker(p, ttm, d, h, ss, b), firstCall(true) {
- Move move;
- Value score = VALUE_ZERO;
-
- // Score root moves using standard ordering used in main search, the moves
- // are scored according to the order in which they are returned by MovePicker.
- // This is the second order score that is used to compare the moves when
- // the first orders pv_score of both moves are equal.
- while ((move = MovePicker::get_next_move()) != MOVE_NONE)
- for (rm = Rml.begin(); rm != Rml.end(); ++rm)
- if (rm->pv[0] == move)
- {
- rm->non_pv_score = score--;
- break;
- }
-
- Rml.sort();
- rm = Rml.begin();
- }
-
- Move get_next_move() {
-
- if (!firstCall)
- ++rm;
- else
- firstCall = false;
-
- return rm != Rml.end() ? rm->pv[0] : MOVE_NONE;
- }
-
- RootMoveList::iterator rm;
- bool firstCall;
- };
-
- // In SpNodes use split point's shared MovePicker object as move source
- template<> struct MovePickerExt<true, false> : public MovePicker {
-
- MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
-
- Move get_next_move() { return mp->get_next_move(); }
-
- RootMoveList::iterator rm; // Dummy, needed to compile
- MovePicker* mp;
- };
+ bool chess960 = (os.iword(0) != 0); // See set960()
+ return os << move_to_uci(m, chess960);
+ }
- // Default case, create and use a MovePicker object as source
- template<> struct MovePickerExt<false, false> : public MovePicker {
+ // 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 read it to properly format castling moves.
+ enum set960 {};
- MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePicker(p, ttm, d, h, ss, b) {}
+ std::ostream& operator<< (std::ostream& os, const set960& f) {
- RootMoveList::iterator rm; // Dummy, needed to compile
- };
+ os.iword(0) = int(f);
+ return os;
+ }
} // namespace
else
NodesBetweenPolls = 30000;
- // Look for a book move, only during games, not tests
- if (Limits.useTimeManagement() && Options["OwnBook"].value<bool>())
+ // Look for a book move
+ if (Options["OwnBook"].value<bool>())
{
if (Options["Book File"].value<std::string>() != OpeningBook.name())
OpeningBook.open(Options["Book File"].value<std::string>());
SkillLevel = Options["Skill level"].value<int>();
read_evaluation_uci_options(pos.side_to_move());
- ThreadsMgr.read_uci_options();
+ Threads.read_uci_options();
// If needed allocate pawn and material hash tables and adjust TT size
- ThreadsMgr.init_hash_tables();
+ Threads.init_hash_tables();
TT.set_size(Options["Hash"].value<int>());
if (Options["Clear Hash"].value<bool>())
MultiPV = (SkillLevelEnabled ? Max(UCIMultiPV, 4) : UCIMultiPV);
// Wake up needed threads and reset maxPly counter
- for (int i = 0; i < ThreadsMgr.active_threads(); i++)
+ for (int i = 0; i < Threads.size(); i++)
{
- ThreadsMgr[i].wake_up();
- ThreadsMgr[i].maxPly = 0;
+ Threads[i].wake_up();
+ Threads[i].maxPly = 0;
}
// Write to log file and keep it open to be accessed during the search
}
// This makes all the threads to go to sleep
- ThreadsMgr.set_active_threads(1);
+ Threads.set_size(1);
// If we are pondering or in infinite search, we shouldn't print the
// best move before we are told to do so.
// Retrieve max searched depth among threads
selDepth = 0;
- for (int i = 0; i < ThreadsMgr.active_threads(); i++)
- if (ThreadsMgr[i].maxPly > selDepth)
- selDepth = ThreadsMgr[i].maxPly;
+ for (int i = 0; i < Threads.size(); i++)
+ if (Threads[i].maxPly > selDepth)
+ selDepth = Threads[i].maxPly;
// Send PV line to GUI and to log file
for (int i = 0; i < Min(UCIMultiPV, (int)Rml.size()); i++)
assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE);
assert(beta > alpha && beta <= VALUE_INFINITE);
assert(PvNode || alpha == beta - 1);
- assert(pos.thread() >= 0 && pos.thread() < ThreadsMgr.active_threads());
+ assert(pos.thread() >= 0 && pos.thread() < Threads.size());
Move movesSearched[MAX_MOVES];
int64_t nodes;
ss->ply = (ss-1)->ply + 1;
// Used to send selDepth info to GUI
- if (PvNode && ThreadsMgr[threadID].maxPly < ss->ply)
- ThreadsMgr[threadID].maxPly = ss->ply;
+ if (PvNode && Threads[threadID].maxPly < ss->ply)
+ Threads[threadID].maxPly = ss->ply;
if (SpNode)
{
// Step 2. Check for aborted search and immediate draw
if (( StopRequest
- || ThreadsMgr.cutoff_at_splitpoint(threadID)
+ || Threads[threadID].cutoff_occurred()
|| pos.is_draw()
|| ss->ply > PLY_MAX) && !Root)
return VALUE_DRAW;
// Loop through all legal moves until no moves remain or a beta cutoff occurs
while ( bestValue < beta
&& (move = mp.get_next_move()) != MOVE_NONE
- && !ThreadsMgr.cutoff_at_splitpoint(threadID))
+ && !Threads[threadID].cutoff_occurred())
{
assert(move_is_ok(move));
alpha = sp->alpha;
}
- if (value > bestValue && !(SpNode && ThreadsMgr.cutoff_at_splitpoint(threadID)))
+ if (value > bestValue && !(SpNode && Threads[threadID].cutoff_occurred()))
{
bestValue = value;
sp->alpha = value;
}
else if (SpNode)
- sp->betaCutoff = true;
+ sp->is_betaCutoff = true;
if (value == value_mate_in(ss->ply + 1))
ss->mateKiller = move;
// Step 18. Check for split
if ( !Root
&& !SpNode
- && depth >= ThreadsMgr.min_split_depth()
- && ThreadsMgr.active_threads() > 1
+ && depth >= Threads.min_split_depth()
&& bestValue < beta
- && ThreadsMgr.available_thread_exists(threadID)
+ && Threads.available_slave_exists(threadID)
&& !StopRequest
- && !ThreadsMgr.cutoff_at_splitpoint(threadID))
- ThreadsMgr.split<FakeSplit>(pos, ss, &alpha, beta, &bestValue, depth,
- threatMove, moveCount, &mp, PvNode);
+ && !Threads[threadID].cutoff_occurred())
+ Threads.split<FakeSplit>(pos, ss, &alpha, beta, &bestValue, depth,
+ threatMove, moveCount, &mp, PvNode);
}
// Step 19. Check for mate and stalemate
// Step 20. Update tables
// If the search is not aborted, update the transposition table,
// history counters, and killer moves.
- if (!SpNode && !StopRequest && !ThreadsMgr.cutoff_at_splitpoint(threadID))
+ if (!SpNode && !StopRequest && !Threads[threadID].cutoff_occurred())
{
move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER
if (SpNode)
{
// Here we have the lock still grabbed
- sp->slaves[threadID] = 0;
+ sp->is_slave[threadID] = false;
sp->nodes += pos.nodes_searched();
lock_release(&(sp->lock));
}
assert(beta >= -VALUE_INFINITE && beta <= VALUE_INFINITE);
assert(PvNode || alpha == beta - 1);
assert(depth <= 0);
- assert(pos.thread() >= 0 && pos.thread() < ThreadsMgr.active_threads());
+ assert(pos.thread() >= 0 && pos.thread() < Threads.size());
StateInfo st;
Move ttMove, move;
return s.str();
}
+ // Specializations for MovePickerExt in case of Root node
+ MovePickerExt<false, true>::MovePickerExt(const Position& p, Move ttm, Depth d,
+ const History& h, SearchStack* ss, Value b)
+ : MovePicker(p, ttm, d, h, ss, b), firstCall(true) {
+ Move move;
+ Value score = VALUE_ZERO;
+
+ // Score root moves using standard ordering used in main search, the moves
+ // are scored according to the order in which they are returned by MovePicker.
+ // This is the second order score that is used to compare the moves when
+ // the first orders pv_score of both moves are equal.
+ while ((move = MovePicker::get_next_move()) != MOVE_NONE)
+ for (rm = Rml.begin(); rm != Rml.end(); ++rm)
+ if (rm->pv[0] == move)
+ {
+ rm->non_pv_score = score--;
+ break;
+ }
+
+ Rml.sort();
+ rm = Rml.begin();
+ }
+
+ Move MovePickerExt<false, true>::get_next_move() {
+
+ if (!firstCall)
+ ++rm;
+ else
+ firstCall = false;
+
+ return rm != Rml.end() ? rm->pv[0] : MOVE_NONE;
+ };
+
} // namespace
if (allThreadsShouldExit)
{
assert(!sp);
- threads[threadID].state = THREAD_TERMINATED;
+ threads[threadID].state = Thread::TERMINATED;
return;
}
// If we are not thinking, wait for a condition to be signaled
// instead of wasting CPU time polling for work.
while ( threadID >= activeThreads
- || threads[threadID].state == THREAD_INITIALIZING
- || (useSleepingThreads && threads[threadID].state == THREAD_AVAILABLE))
+ || threads[threadID].state == Thread::INITIALIZING
+ || (useSleepingThreads && threads[threadID].state == Thread::AVAILABLE))
{
assert(!sp || useSleepingThreads);
assert(threadID != 0 || useSleepingThreads);
- if (threads[threadID].state == THREAD_INITIALIZING)
- threads[threadID].state = THREAD_AVAILABLE;
+ if (threads[threadID].state == Thread::INITIALIZING)
+ threads[threadID].state = Thread::AVAILABLE;
// Grab the lock to avoid races with Thread::wake_up()
lock_grab(&threads[threadID].sleepLock);
// If we are master and all slaves have finished do not go to sleep
- for (i = 0; sp && i < activeThreads && !sp->slaves[i]; i++) {}
+ for (i = 0; sp && i < activeThreads && !sp->is_slave[i]; i++) {}
allFinished = (i == activeThreads);
if (allFinished || allThreadsShouldExit)
}
// Do sleep here after retesting sleep conditions
- if (threadID >= activeThreads || threads[threadID].state == THREAD_AVAILABLE)
+ if (threadID >= activeThreads || threads[threadID].state == Thread::AVAILABLE)
cond_wait(&threads[threadID].sleepCond, &threads[threadID].sleepLock);
lock_release(&threads[threadID].sleepLock);
}
// If this thread has been assigned work, launch a search
- if (threads[threadID].state == THREAD_WORKISWAITING)
+ if (threads[threadID].state == Thread::WORKISWAITING)
{
assert(!allThreadsShouldExit);
- threads[threadID].state = THREAD_SEARCHING;
+ threads[threadID].state = Thread::SEARCHING;
// Copy split point position and search stack and call search()
// with SplitPoint template parameter set to true.
else
search<NonPV, true, false>(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth);
- assert(threads[threadID].state == THREAD_SEARCHING);
+ assert(threads[threadID].state == Thread::SEARCHING);
- threads[threadID].state = THREAD_AVAILABLE;
+ 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)
+ && threads[tsp->master].state == Thread::AVAILABLE)
threads[tsp->master].wake_up();
}
// 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.
- for (i = 0; sp && i < activeThreads && !sp->slaves[i]; i++) {}
+ for (i = 0; sp && i < activeThreads && !sp->is_slave[i]; i++) {}
allFinished = (i == activeThreads);
if (allFinished)
// 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);
+ assert(threads[threadID].state == Thread::AVAILABLE);
- threads[threadID].state = THREAD_SEARCHING;
+ threads[threadID].state = Thread::SEARCHING;
return;
}
}
projects / stockfish / blobdiff