### 3.1 Selecting compiler (default = gcc)
-CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
+CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11 $(EXTRACXXFLAGS)
LDFLAGS += $(EXTRALDFLAGS)
ifeq ($(COMP),)
ifeq ($(COMP),gcc)
comp=gcc
CXX=g++
- CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
+ CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
+ LDFLAGS += -Wl,--no-as-needed
endif
ifeq ($(COMP),mingw)
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <algorithm>
#include <fstream>
#include <iostream>
#include <istream>
namespace {
-const char* Defaults[] = {
+const vector<string> Defaults = {
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
"r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10",
"8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11",
TT.clear();
if (limitType == "time")
- limits.movetime = atoi(limit.c_str()); // movetime is in ms
+ limits.movetime = stoi(limit); // movetime is in ms
else if (limitType == "nodes")
- limits.nodes = atoi(limit.c_str());
+ limits.nodes = stoi(limit);
else if (limitType == "mate")
- limits.mate = atoi(limit.c_str());
+ limits.mate = stoi(limit);
else
- limits.depth = atoi(limit.c_str());
+ limits.depth = stoi(limit);
if (fenFile == "default")
- fens.assign(Defaults, Defaults + 37);
+ fens = Defaults;
else if (fenFile == "current")
fens.push_back(current.fen());
else
{
string fen;
- ifstream file(fenFile.c_str());
+ ifstream file(fenFile);
if (!file.is_open())
{
}
}
- elapsed = std::max(Time::now() - elapsed, Time::point(1)); // Avoid a 'divide by zero'
+ elapsed = Time::now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
dbg_print(); // Just before to exit
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
#include <cassert>
+#include <numeric>
#include <vector>
#include "bitboard.h"
inline Result& operator|=(Result& r, Result v) { return r = Result(r | v); }
struct KPKPosition {
-
- KPKPosition(unsigned idx);
+ KPKPosition() = default;
+ explicit KPKPosition(unsigned idx);
operator Result() const { return result; }
Result classify(const std::vector<KPKPosition>& db)
{ return us == WHITE ? classify<WHITE>(db) : classify<BLACK>(db); }
- private:
template<Color Us> Result classify(const std::vector<KPKPosition>& db);
+ unsigned id;
Color us;
- Square bksq, wksq, psq;
+ Square ksq[COLOR_NB], psq;
Result result;
};
void Bitbases::init() {
- unsigned idx, repeat = 1;
- std::vector<KPKPosition> db;
- db.reserve(MAX_INDEX);
+ std::vector<KPKPosition> db(MAX_INDEX);
// Initialize db with known win / draw positions
- for (idx = 0; idx < MAX_INDEX; ++idx)
- db.push_back(KPKPosition(idx));
+ std::generate(db.begin(), db.end(), [](){ static unsigned id; return KPKPosition(id++); });
// Iterate through the positions until none of the unknown positions can be
// changed to either wins or draws (15 cycles needed).
- while (repeat)
- for (repeat = idx = 0; idx < MAX_INDEX; ++idx)
- repeat |= (db[idx] == UNKNOWN && db[idx].classify(db) != UNKNOWN);
+ while (std::accumulate(db.begin(), db.end(), false, [&](bool repeat, KPKPosition& pos)
+ { return (pos == UNKNOWN && pos.classify(db) != UNKNOWN) || repeat; })){}
// Map 32 results into one KPKBitbase[] entry
- for (idx = 0; idx < MAX_INDEX; ++idx)
- if (db[idx] == WIN)
- KPKBitbase[idx / 32] |= 1 << (idx & 0x1F);
+ for (auto& pos : db)
+ if (pos == WIN)
+ KPKBitbase[pos.id / 32] |= 1 << (pos.id & 0x1F);
}
KPKPosition::KPKPosition(unsigned idx) {
- wksq = Square((idx >> 0) & 0x3F);
- bksq = Square((idx >> 6) & 0x3F);
- us = Color ((idx >> 12) & 0x01);
- psq = make_square(File((idx >> 13) & 0x3), RANK_7 - Rank((idx >> 15) & 0x7));
- result = UNKNOWN;
+ id = idx;
+ ksq[WHITE] = Square((idx >> 0) & 0x3F);
+ ksq[BLACK] = Square((idx >> 6) & 0x3F);
+ us = Color ((idx >> 12) & 0x01);
+ psq = make_square(File((idx >> 13) & 0x3), RANK_7 - Rank((idx >> 15) & 0x7));
// Check if two pieces are on the same square or if a king can be captured
- if ( distance(wksq, bksq) <= 1
- || wksq == psq
- || bksq == psq
- || (us == WHITE && (StepAttacksBB[PAWN][psq] & bksq)))
+ if ( distance(ksq[WHITE], ksq[BLACK]) <= 1
+ || ksq[WHITE] == psq
+ || ksq[BLACK] == psq
+ || (us == WHITE && (StepAttacksBB[PAWN][psq] & ksq[BLACK])))
result = INVALID;
- else if (us == WHITE)
- {
- // Immediate win if a pawn can be promoted without getting captured
- if ( rank_of(psq) == RANK_7
- && wksq != psq + DELTA_N
- && ( distance(bksq, psq + DELTA_N) > 1
- ||(StepAttacksBB[KING][wksq] & (psq + DELTA_N))))
- result = WIN;
- }
+ // Immediate win if a pawn can be promoted without getting captured
+ else if ( us == WHITE
+ && rank_of(psq) == RANK_7
+ && ksq[us] != psq + DELTA_N
+ && ( distance(ksq[~us], psq + DELTA_N) > 1
+ || (StepAttacksBB[KING][ksq[us]] & (psq + DELTA_N))))
+ result = WIN;
+
// Immediate draw if it is a stalemate or a king captures undefended pawn
- else if ( !(StepAttacksBB[KING][bksq] & ~(StepAttacksBB[KING][wksq] | StepAttacksBB[PAWN][psq]))
- || (StepAttacksBB[KING][bksq] & psq & ~StepAttacksBB[KING][wksq]))
+ else if ( us == BLACK
+ && ( !(StepAttacksBB[KING][ksq[us]] & ~(StepAttacksBB[KING][ksq[~us]] | StepAttacksBB[PAWN][psq]))
+ || (StepAttacksBB[KING][ksq[us]] & psq & ~StepAttacksBB[KING][ksq[~us]])))
result = DRAW;
+
+ // Position will be classified later
+ else
+ result = UNKNOWN;
}
template<Color Us>
Result KPKPosition::classify(const std::vector<KPKPosition>& db) {
- // White to Move: If one move leads to a position classified as WIN, the result
+ // White to move: If one move leads to a position classified as WIN, the result
// of the current position is WIN. If all moves lead to positions classified
// as DRAW, the current position is classified as DRAW, otherwise the current
// position is classified as UNKNOWN.
//
- // Black to Move: If one move leads to a position classified as DRAW, the result
+ // Black to move: If one move leads to a position classified as DRAW, the result
// of the current position is DRAW. If all moves lead to positions classified
// as WIN, the position is classified as WIN, otherwise the current position is
// classified as UNKNOWN.
- const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Result Good = (Us == WHITE ? WIN : DRAW);
+ const Result Bad = (Us == WHITE ? DRAW : WIN);
Result r = INVALID;
- Bitboard b = StepAttacksBB[KING][Us == WHITE ? wksq : bksq];
+ Bitboard b = StepAttacksBB[KING][ksq[Us]];
while (b)
- r |= Us == WHITE ? db[index(Them, bksq, pop_lsb(&b), psq)]
- : db[index(Them, pop_lsb(&b), wksq, psq)];
+ r |= Us == WHITE ? db[index(Them, ksq[Them] , pop_lsb(&b), psq)]
+ : db[index(Them, pop_lsb(&b), ksq[Them] , psq)];
- if (Us == WHITE && rank_of(psq) < RANK_7)
+ if (Us == WHITE)
{
- Square s = psq + DELTA_N;
- r |= db[index(BLACK, bksq, wksq, s)]; // Single push
+ if (rank_of(psq) < RANK_7) // Single push
+ r |= db[index(Them, ksq[Them], ksq[Us], psq + DELTA_N)];
- if (rank_of(psq) == RANK_2 && s != wksq && s != bksq)
- r |= db[index(BLACK, bksq, wksq, s + DELTA_N)]; // Double push
+ if ( rank_of(psq) == RANK_2 // Double push
+ && psq + DELTA_N != ksq[Us]
+ && psq + DELTA_N != ksq[Them])
+ r |= db[index(Them, ksq[Them], ksq[Us], psq + DELTA_N + DELTA_N)];
}
- if (Us == WHITE)
- return result = r & WIN ? WIN : r & UNKNOWN ? UNKNOWN : DRAW;
- else
- return result = r & DRAW ? DRAW : r & UNKNOWN ? UNKNOWN : WIN;
+ return result = r & Good ? Good : r & UNKNOWN ? UNKNOWN : Bad;
}
} // namespace
string fen = sides[0] + char(8 - sides[0].length() + '0') + "/8/8/8/8/8/8/"
+ sides[1] + char(8 - sides[1].length() + '0') + " w - - 0 10";
- return Position(fen, false, NULL).material_key();
+ return Position(fen, false, nullptr).material_key();
}
- template<typename M>
- void delete_endgame(const typename M::value_type& p) { delete p.second; }
-
} // namespace
add<KRPPKRP>("KRPPKRP");
}
-Endgames::~Endgames() {
-
- for_each(m1.begin(), m1.end(), delete_endgame<M1>);
- for_each(m2.begin(), m2.end(), delete_endgame<M2>);
-}
-template<EndgameType E>
+template<EndgameType E, typename T>
void Endgames::add(const string& code) {
-
- map((Endgame<E>*)0)[key(code, WHITE)] = new Endgame<E>(WHITE);
- map((Endgame<E>*)0)[key(code, BLACK)] = new Endgame<E>(BLACK);
+ map<T>()[key(code, WHITE)] = std::unique_ptr<EndgameBase<T>>(new Endgame<E>(WHITE));
+ map<T>()[key(code, BLACK)] = std::unique_ptr<EndgameBase<T>>(new Endgame<E>(BLACK));
}
#define ENDGAME_H_INCLUDED
#include <map>
+#include <memory>
#include <string>
+#include <type_traits>
+#include <utility>
#include "position.h"
#include "types.h"
/// Endgame functions can be of two types depending on whether they return a
-/// Value or a ScaleFactor. Type eg_fun<int>::type returns either ScaleFactor
-/// or Value depending on whether the template parameter is 0 or 1.
-
-template<int> struct eg_fun { typedef Value type; };
-template<> struct eg_fun<1> { typedef ScaleFactor type; };
+/// Value or a ScaleFactor.
+template<EndgameType E> using
+eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
/// Base and derived templates for endgame evaluation and scaling functions
};
-template<EndgameType E, typename T = typename eg_fun<(E > SCALING_FUNCTIONS)>::type>
+template<EndgameType E, typename T = eg_type<E>>
struct Endgame : public EndgameBase<T> {
explicit Endgame(Color c) : strongSide(c), weakSide(~c) {}
class Endgames {
- typedef std::map<Key, EndgameBase<eg_fun<0>::type>*> M1;
- typedef std::map<Key, EndgameBase<eg_fun<1>::type>*> M2;
+ template<typename T> using Map = std::map<Key, std::unique_ptr<EndgameBase<T>>>;
- M1 m1;
- M2 m2;
+ template<EndgameType E, typename T = eg_type<E>>
+ void add(const std::string& code);
- M1& map(M1::mapped_type) { return m1; }
- M2& map(M2::mapped_type) { return m2; }
+ template<typename T>
+ Map<T>& map() {
+ return std::get<std::is_same<T, ScaleFactor>::value>(maps);
+ }
- template<EndgameType E> void add(const std::string& code);
+ std::pair<Map<Value>, Map<ScaleFactor>> maps;
public:
Endgames();
- ~Endgames();
- template<typename T> T probe(Key key, T& eg) {
- return eg = map(eg).count(key) ? map(eg)[key] : NULL;
+ template<typename T>
+ EndgameBase<T>* probe(Key key) {
+ return map<T>().count(key) ? map<T>()[key].get() : nullptr;
}
};
// Let's look if we have a specialized evaluation function for this particular
// material configuration. Firstly we look for a fixed configuration one, then
// for a generic one if the previous search failed.
- if (pos.this_thread()->endgames.probe(key, e->evaluationFunction))
+ if ((e->evaluationFunction = pos.this_thread()->endgames.probe<Value>(key)) != nullptr)
return e;
for (Color c = WHITE; c <= BLACK; ++c)
// configuration. Is there a suitable specialized scaling function?
EndgameBase<ScaleFactor>* sf;
- if (pos.this_thread()->endgames.probe(key, sf))
+ if ((sf = pos.this_thread()->endgames.probe<ScaleFactor>(key)) != nullptr)
{
e->scalingFunction[sf->strong_side()] = sf; // Only strong color assigned
return e;
Score imbalance() const { return make_score(value, value); }
Phase game_phase() const { return gamePhase; }
- bool specialized_eval_exists() const { return evaluationFunction != NULL; }
+ bool specialized_eval_exists() const { return evaluationFunction != nullptr; }
Value evaluate(const Position& pos) const { return (*evaluationFunction)(pos); }
// scale_factor takes a position and a color as input and returns a scale factor
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <chrono>
#include <fstream>
#include <iomanip>
#include <iostream>
#include "thread.h"
using namespace std;
+using namespace std::chrono;
namespace {
}
+/// Convert system time to milliseconds. That's all we need.
+
+Time::point Time::now() {
+ return duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
+}
+
+
/// Debug functions used mainly to collect run-time statistics
void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; }
std::ostream& operator<<(std::ostream& os, SyncCout sc) {
- static Mutex m;
+ static std::mutex m;
if (sc == IO_LOCK)
m.lock();
void start_logger(bool b) { Logger::start(b); }
-/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap
-/// the conversion from milliseconds to struct timespec, as used by pthreads.
-
-void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-
-#ifdef _WIN32
- int tm = msec;
-#else
- timespec ts, *tm = &ts;
- uint64_t ms = Time::now() + msec;
-
- ts.tv_sec = ms / 1000;
- ts.tv_nsec = (ms % 1000) * 1000000LL;
-#endif
-
- cond_timedwait(sleepCond, sleepLock, tm);
-}
-
-
/// prefetch() preloads the given address in L1/L2 cache. This is a non-blocking
/// function that doesn't stall the CPU waiting for data to be loaded from memory,
/// which can be quite slow.
#ifdef NO_PREFETCH
-void prefetch(char*) {}
+void prefetch(void*) {}
#else
-void prefetch(char* addr) {
+void prefetch(void* addr) {
# if defined(__INTEL_COMPILER)
// This hack prevents prefetches from being optimized away by
# endif
# if defined(__INTEL_COMPILER) || defined(_MSC_VER)
- _mm_prefetch(addr, _MM_HINT_T0);
+ _mm_prefetch((char*)addr, _MM_HINT_T0);
# else
__builtin_prefetch(addr);
# endif
#include "types.h"
const std::string engine_info(bool to_uci = false);
-void timed_wait(WaitCondition&, Lock&, int);
-void prefetch(char* addr);
+void prefetch(void* addr);
void start_logger(bool b);
void dbg_hit_on(bool b);
namespace Time {
typedef int64_t point;
- inline point now() { return system_time_to_msec(); }
+ point now();
}
template<class Entry, int Size>
struct HashTable {
- HashTable() : table(Size, Entry()) {}
Entry* operator[](Key key) { return &table[(uint32_t)key & (Size - 1)]; }
private:
- std::vector<Entry> table;
+ std::vector<Entry> table = std::vector<Entry>(Size);
};
if (Checks && !pos.gives_check(m, *ci))
return moveList;
- (moveList++)->move = m;
+ *moveList++ = m;
- return moveList;
+ return (void)ci, moveList; // Silence a warning under MSVC
}
inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
-
(moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
+
*moveList++ = make<PROMOTION>(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
-
(moveList++)->move = make<PROMOTION>(to - Delta, to, ROOK);
-
(moveList++)->move = make<PROMOTION>(to - Delta, to, BISHOP);
-
(moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
+
*moveList++ = make<PROMOTION>(to - Delta, to, ROOK);
+
*moveList++ = make<PROMOTION>(to - Delta, to, BISHOP);
+
*moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
}
// Knight promotion is the only promotion that can give a direct check
// that's not already included in the queen promotion.
if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
- (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
- else
- (void)ci; // Silence a warning under MSVC
+ *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
- return moveList;
+ return (void)ci, moveList; // Silence a warning under MSVC
}
while (b1)
{
Square to = pop_lsb(&b1);
- (moveList++)->move = make_move(to - Up, to);
+ *moveList++ = make_move(to - Up, to);
}
while (b2)
{
Square to = pop_lsb(&b2);
- (moveList++)->move = make_move(to - Up - Up, to);
+ *moveList++ = make_move(to - Up - Up, to);
}
}
while (b1)
{
Square to = pop_lsb(&b1);
- (moveList++)->move = make_move(to - Right, to);
+ *moveList++ = make_move(to - Right, to);
}
while (b2)
{
Square to = pop_lsb(&b2);
- (moveList++)->move = make_move(to - Left, to);
+ *moveList++ = make_move(to - Left, to);
}
if (pos.ep_square() != SQ_NONE)
assert(b1);
while (b1)
- (moveList++)->move = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
+ *moveList++ = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
}
}
b &= ci->checkSq[Pt];
while (b)
- (moveList++)->move = make_move(from, pop_lsb(&b));
+ *moveList++ = make_move(from, pop_lsb(&b));
}
return moveList;
template<Color Us, GenType Type> FORCE_INLINE
ExtMove* generate_all(const Position& pos, ExtMove* moveList, Bitboard target,
- const CheckInfo* ci = NULL) {
+ const CheckInfo* ci = nullptr) {
const bool Checks = Type == QUIET_CHECKS;
Square ksq = pos.king_square(Us);
Bitboard b = pos.attacks_from<KING>(ksq) & target;
while (b)
- (moveList++)->move = make_move(ksq, pop_lsb(&b));
+ *moveList++ = make_move(ksq, pop_lsb(&b));
}
if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
b &= ~PseudoAttacks[QUEEN][ci.ksq];
while (b)
- (moveList++)->move = make_move(from, pop_lsb(&b));
+ *moveList++ = make_move(from, pop_lsb(&b));
}
return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, moveList, ~pos.pieces(), &ci)
// Generate evasions for king, capture and non capture moves
Bitboard b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
while (b)
- (moveList++)->move = make_move(ksq, pop_lsb(&b));
+ *moveList++ = make_move(ksq, pop_lsb(&b));
if (more_than_one(pos.checkers()))
return moveList; // Double check, only a king move can save the day
moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
: generate<NON_EVASIONS>(pos, moveList);
while (cur != moveList)
- if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
- && !pos.legal(cur->move, pinned))
- cur->move = (--moveList)->move;
+ if ( (pinned || from_sq(*cur) == ksq || type_of(*cur) == ENPASSANT)
+ && !pos.legal(*cur, pinned))
+ *cur = (--moveList)->move;
else
++cur;
struct ExtMove {
Move move;
Value value;
+
+ operator Move() const { return move; }
+ void operator=(Move m) { move = m; }
};
inline bool operator<(const ExtMove& f, const ExtMove& s) {
template<GenType T>
struct MoveList {
- explicit MoveList(const Position& pos) : cur(moveList), last(generate<T>(pos, moveList)) { last->move = MOVE_NONE; }
- void operator++() { ++cur; }
- Move operator*() const { return cur->move; }
+ explicit MoveList(const Position& pos) : last(generate<T>(pos, moveList)) {}
+ const ExtMove* begin() const { return moveList; }
+ const ExtMove* end() const { return last; }
size_t size() const { return last - moveList; }
- bool contains(Move m) const {
- for (const ExtMove* it(moveList); it != last; ++it) if (it->move == m) return true;
+ bool contains(Move move) const {
+ for (const auto& m : *this) if (m == move) return true;
return false;
}
private:
- ExtMove moveList[MAX_MOVES];
- ExtMove *cur, *last;
+ ExtMove moveList[MAX_MOVES], *last;
};
#endif // #ifndef MOVEGEN_H_INCLUDED
STOP
};
- // Our insertion sort, which is guaranteed (and also needed) to be stable
+ // Our insertion sort, which is guaranteed to be stable, as it should be
void insertion_sort(ExtMove* begin, ExtMove* end)
{
ExtMove tmp, *p, *q;
}
}
- // Unary predicate used by std::partition to split positive values from remaining
- // ones so as to sort the two sets separately, with the second sort delayed.
- inline bool has_positive_value(const ExtMove& move) { return move.value > VALUE_ZERO; }
-
- // Picks the best move in the range (begin, end) and moves it to the front.
- // It's faster than sorting all the moves in advance when there are few
- // moves e.g. possible captures.
- inline ExtMove* pick_best(ExtMove* begin, ExtMove* end)
+ // pick_best() finds the best move in the range (begin, end) and moves it to
+ // the front. It's faster than sorting all the moves in advance when there
+ // are few moves e.g. the possible captures.
+ inline Move pick_best(ExtMove* begin, ExtMove* end)
{
std::swap(*begin, *std::max_element(begin, end));
- return begin;
+ return *begin;
}
+
} // namespace
assert(d > DEPTH_ZERO);
- cur = end = moves;
endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm;
followupmoves = fm;
stage = MAIN_SEARCH;
ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
- end += (ttMove != MOVE_NONE);
+ endMoves += (ttMove != MOVE_NONE);
}
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Square s) : pos(p), history(h), cur(moves), end(moves) {
+ Square s) : pos(p), history(h) {
assert(d <= DEPTH_ZERO);
}
ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
- end += (ttMove != MOVE_NONE);
+ endMoves += (ttMove != MOVE_NONE);
}
MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
- : pos(p), history(h), cur(moves), end(moves) {
+ : pos(p), history(h) {
assert(!pos.checkers());
if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold))
ttMove = MOVE_NONE;
- end += (ttMove != MOVE_NONE);
+ endMoves += (ttMove != MOVE_NONE);
}
// badCaptures[] array, but instead of doing it now we delay until the move
// has been picked up in pick_move_from_list(). This way we save some SEE
// calls in case we get a cutoff.
- Move m;
-
- for (ExtMove* it = moves; it != end; ++it)
- {
- m = it->move;
- it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(type_of(pos.moved_piece(m)));
-
+ for (auto& m : *this)
if (type_of(m) == ENPASSANT)
- it->value += PieceValue[MG][PAWN];
+ m.value = PieceValue[MG][PAWN] - Value(PAWN);
else if (type_of(m) == PROMOTION)
- it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
- }
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(PAWN)
+ + PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
+ else
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m)));
}
template<>
void MovePicker::score<QUIETS>() {
-
- Move m;
-
- for (ExtMove* it = moves; it != end; ++it)
- {
- m = it->move;
- it->value = history[pos.moved_piece(m)][to_sq(m)];
- }
+ for (auto& m : *this)
+ m.value = history[pos.moved_piece(m)][to_sq(m)];
}
template<>
// Try good captures ordered by MVV/LVA, then non-captures if destination square
// is not under attack, ordered by history value, then bad-captures and quiet
// moves with a negative SEE. This last group is ordered by the SEE value.
- Move m;
Value see;
- for (ExtMove* it = moves; it != end; ++it)
- {
- m = it->move;
+ for (auto& m : *this)
if ((see = pos.see_sign(m)) < VALUE_ZERO)
- it->value = see - HistoryStats::Max; // At the bottom
+ m.value = see - HistoryStats::Max; // At the bottom
else if (pos.capture(m))
- it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else
- it->value = history[pos.moved_piece(m)][to_sq(m)];
- }
+ m.value = history[pos.moved_piece(m)][to_sq(m)];
}
switch (++stage) {
case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6:
- end = generate<CAPTURES>(pos, moves);
+ endMoves = generate<CAPTURES>(pos, moves);
score<CAPTURES>();
- return;
+ break;
case KILLERS_S1:
cur = killers;
- end = cur + 2;
-
- killers[0].move = ss->killers[0];
- killers[1].move = ss->killers[1];
- killers[2].move = killers[3].move = MOVE_NONE;
- killers[4].move = killers[5].move = MOVE_NONE;
-
- // Please note that following code is racy and could yield to rare (less
- // than 1 out of a million) duplicated entries in SMP case. This is harmless.
-
- // Be sure countermoves are different from killers
- for (int i = 0; i < 2; ++i)
- if ( countermoves[i] != (cur+0)->move
- && countermoves[i] != (cur+1)->move)
- (end++)->move = countermoves[i];
-
- // Be sure followupmoves are different from killers and countermoves
- for (int i = 0; i < 2; ++i)
- if ( followupmoves[i] != (cur+0)->move
- && followupmoves[i] != (cur+1)->move
- && followupmoves[i] != (cur+2)->move
- && followupmoves[i] != (cur+3)->move)
- (end++)->move = followupmoves[i];
- return;
+ endMoves = cur + 6;
+ killers[0] = ss->killers[0];
+ killers[1] = ss->killers[1];
+ killers[2] = countermoves[0];
+ killers[3] = countermoves[1];
+ killers[4] = followupmoves[0];
+ killers[5] = followupmoves[1];
+ break;
case QUIETS_1_S1:
- endQuiets = end = generate<QUIETS>(pos, moves);
+ endQuiets = endMoves = generate<QUIETS>(pos, moves);
score<QUIETS>();
- end = std::partition(cur, end, has_positive_value);
- insertion_sort(cur, end);
- return;
+ endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
+ insertion_sort(cur, endMoves);
+ break;
case QUIETS_2_S1:
- cur = end;
- end = endQuiets;
+ cur = endMoves;
+ endMoves = endQuiets;
if (depth >= 3 * ONE_PLY)
- insertion_sort(cur, end);
- return;
+ insertion_sort(cur, endMoves);
+ break;
case BAD_CAPTURES_S1:
// Just pick them in reverse order to get MVV/LVA ordering
cur = moves + MAX_MOVES - 1;
- end = endBadCaptures;
- return;
+ endMoves = endBadCaptures;
+ break;
case EVASIONS_S2:
- end = generate<EVASIONS>(pos, moves);
- if (end > moves + 1)
+ endMoves = generate<EVASIONS>(pos, moves);
+ if (endMoves - moves > 1)
score<EVASIONS>();
- return;
+ break;
case QUIET_CHECKS_S3:
- end = generate<QUIET_CHECKS>(pos, moves);
- return;
+ endMoves = generate<QUIET_CHECKS>(pos, moves);
+ break;
case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
stage = STOP;
/* Fall through */
case STOP:
- end = cur + 1; // Avoid another next_phase() call
- return;
+ endMoves = cur + 1; // Avoid another generate_next_stage() call
+ break;
default:
assert(false);
while (true)
{
- while (cur == end)
+ while (cur == endMoves)
generate_next_stage();
switch (stage) {
return ttMove;
case CAPTURES_S1:
- move = pick_best(cur++, end)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove)
{
if (pos.see_sign(move) >= VALUE_ZERO)
return move;
// Losing capture, move it to the tail of the array
- (endBadCaptures--)->move = move;
+ *endBadCaptures-- = move;
}
break;
case KILLERS_S1:
- move = (cur++)->move;
+ move = *cur++;
if ( move != MOVE_NONE
&& move != ttMove
&& pos.pseudo_legal(move)
&& !pos.capture(move))
+ {
+ for (int i = 0; i < cur - 1 - killers; i++) // Skip duplicated
+ if (move == killers[i])
+ goto skip;
return move;
+ }
+ skip:
break;
case QUIETS_1_S1: case QUIETS_2_S1:
- move = (cur++)->move;
+ move = *cur++;
if ( move != ttMove
- && move != killers[0].move
- && move != killers[1].move
- && move != killers[2].move
- && move != killers[3].move
- && move != killers[4].move
- && move != killers[5].move)
+ && move != killers[0]
+ && move != killers[1]
+ && move != killers[2]
+ && move != killers[3]
+ && move != killers[4]
+ && move != killers[5])
return move;
break;
case BAD_CAPTURES_S1:
- return (cur--)->move;
+ return *cur--;
case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4:
- move = pick_best(cur++, end)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove)
return move;
break;
case CAPTURES_S5:
- move = pick_best(cur++, end)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove && pos.see(move) > captureThreshold)
return move;
break;
case CAPTURES_S6:
- move = pick_best(cur++, end)->move;
+ move = pick_best(cur++, endMoves);
if (to_sq(move) == recaptureSquare)
return move;
break;
case QUIET_CHECKS_S3:
- move = (cur++)->move;
+ move = *cur++;
if (move != ttMove)
return move;
break;
/// to get a cut-off first.
class MovePicker {
-
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
-
public:
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+
MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
MovePicker(const Position&, Move, const HistoryStats&, PieceType);
MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*);
private:
template<GenType> void score();
void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
const HistoryStats& history;
Square recaptureSquare;
Value captureThreshold;
int stage;
- ExtMove *cur, *end, *endQuiets, *endBadCaptures;
- ExtMove moves[MAX_MOVES];
+ ExtMove *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
};
#endif // #ifndef MOVEPICK_H_INCLUDED
+++ /dev/null
-/*
- Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-
- Stockfish is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Stockfish is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PLATFORM_H_INCLUDED
-#define PLATFORM_H_INCLUDED
-
-#ifdef _MSC_VER
-
-// Disable some silly and noisy warnings from MSVC compiler
-#pragma warning(disable: 4127) // Conditional expression is constant
-#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
-#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
-#pragma warning(disable: 4996) // Function _ftime() may be unsafe
-
-// MSVC does not support <inttypes.h>
-typedef signed __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef signed __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef signed __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-#else
-# include <inttypes.h>
-#endif
-
-#ifndef _WIN32 // Linux - Unix
-
-# include <sys/time.h>
-
-inline int64_t system_time_to_msec() {
- timeval t;
- gettimeofday(&t, NULL);
- return t.tv_sec * 1000LL + t.tv_usec / 1000;
-}
-
-# include <pthread.h>
-typedef pthread_mutex_t Lock;
-typedef pthread_cond_t WaitCondition;
-typedef pthread_t NativeHandle;
-typedef void*(*pt_start_fn)(void*);
-
-# define lock_init(x) pthread_mutex_init(&(x), NULL)
-# define lock_grab(x) pthread_mutex_lock(&(x))
-# define lock_release(x) pthread_mutex_unlock(&(x))
-# define lock_destroy(x) pthread_mutex_destroy(&(x))
-# define cond_destroy(x) pthread_cond_destroy(&(x))
-# define cond_init(x) pthread_cond_init(&(x), NULL)
-# define cond_signal(x) pthread_cond_signal(&(x))
-# define cond_wait(x,y) pthread_cond_wait(&(x),&(y))
-# define cond_timedwait(x,y,z) pthread_cond_timedwait(&(x),&(y),z)
-# define thread_create(x,f,t) pthread_create(&(x),NULL,(pt_start_fn)f,t)
-# define thread_join(x) pthread_join(x, NULL)
-
-#else // Windows and MinGW
-
-# include <sys/timeb.h>
-
-inline int64_t system_time_to_msec() {
- _timeb t;
- _ftime(&t);
- return t.time * 1000LL + t.millitm;
-}
-
-#ifndef NOMINMAX
-# define NOMINMAX // disable macros min() and max()
-#endif
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#undef NOMINMAX
-
-// We use critical sections on Windows to support Windows XP and older versions.
-// Unfortunately, cond_wait() is racy between lock_release() and WaitForSingleObject()
-// but apart from this they have the same speed performance of SRW locks.
-typedef CRITICAL_SECTION Lock;
-typedef HANDLE WaitCondition;
-typedef HANDLE NativeHandle;
-
-// On Windows 95 and 98 parameter lpThreadId may not be null
-inline DWORD* dwWin9xKludge() { static DWORD dw; return &dw; }
-
-# define lock_init(x) InitializeCriticalSection(&(x))
-# define lock_grab(x) EnterCriticalSection(&(x))
-# define lock_release(x) LeaveCriticalSection(&(x))
-# define lock_destroy(x) DeleteCriticalSection(&(x))
-# define cond_init(x) { x = CreateEvent(0, FALSE, FALSE, 0); }
-# define cond_destroy(x) CloseHandle(x)
-# define cond_signal(x) SetEvent(x)
-# define cond_wait(x,y) { lock_release(y); WaitForSingleObject(x, INFINITE); lock_grab(y); }
-# define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(x,z); lock_grab(y); }
-# define thread_create(x,f,t) (x = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)f,t,0,dwWin9xKludge()))
-# define thread_join(x) { WaitForSingleObject(x, INFINITE); CloseHandle(x); }
-
-#endif
-
-#endif // #ifndef PLATFORM_H_INCLUDED
#include <algorithm>
#include <cassert>
-#include <cstring> // For std::memset
+#include <cstring> // For std::memset, std::memcmp
#include <iomanip>
#include <sstream>
Position& Position::operator=(const Position& pos) {
std::memcpy(this, &pos, sizeof(Position));
- startState = *st;
+ std::memcpy(&startState, st, sizeof(StateInfo));
st = &startState;
nodes = 0;
else if ((idx = PieceToChar.find(token)) != string::npos)
{
- put_piece(sq, color_of(Piece(idx)), type_of(Piece(idx)));
+ put_piece(color_of(Piece(idx)), type_of(Piece(idx)), sq);
++sq;
}
}
si->psq += psq[color_of(pc)][type_of(pc)][s];
}
- if (ep_square() != SQ_NONE)
- si->key ^= Zobrist::enpassant[file_of(ep_square())];
+ if (si->epSquare != SQ_NONE)
+ si->key ^= Zobrist::enpassant[file_of(si->epSquare)];
if (sideToMove == BLACK)
si->key ^= Zobrist::side;
- si->key ^= Zobrist::castling[st->castlingRights];
+ si->key ^= Zobrist::castling[si->castlingRights];
for (Bitboard b = pieces(PAWN); b; )
{
return (attacks_from<PAWN>(s, BLACK) & pieces(WHITE, PAWN))
| (attacks_from<PAWN>(s, WHITE) & pieces(BLACK, PAWN))
| (attacks_from<KNIGHT>(s) & pieces(KNIGHT))
- | (attacks_bb<ROOK>(s, occupied) & pieces(ROOK, QUEEN))
+ | (attacks_bb<ROOK >(s, occupied) & pieces(ROOK, QUEEN))
| (attacks_bb<BISHOP>(s, occupied) & pieces(BISHOP, QUEEN))
| (attacks_from<KING>(s) & pieces(KING));
}
return MoveList<LEGAL>(*this).contains(m);
// Is not a promotion, so promotion piece must be empty
- if (promotion_type(m) - 2 != NO_PIECE_TYPE)
+ if (promotion_type(m) - KNIGHT != NO_PIECE_TYPE)
return false;
// If the 'from' square is not occupied by a piece belonging to the side to
return false;
if ( !(attacks_from<PAWN>(from, us) & pieces(~us) & to) // Not a capture
-
&& !((from + pawn_push(us) == to) && empty(to)) // Not a single push
-
&& !( (from + 2 * pawn_push(us) == to) // Not a double push
&& (rank_of(from) == relative_rank(us, RANK_2))
&& empty(to)
Square from = from_sq(m);
Square to = to_sq(m);
- PieceType pt = type_of(piece_on(from));
// Is there a direct check?
- if (ci.checkSq[pt] & to)
+ if (ci.checkSq[type_of(piece_on(from))] & to)
return true;
// Is there a discovered check?
do_move(m, newSt, ci, gives_check(m, ci));
}
-void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveIsCheck) {
+void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool givesCheck) {
assert(is_ok(m));
assert(&newSt != st);
++nodes;
- Key k = st->key;
+ Key k = st->key ^ Zobrist::side;
// Copy some fields of the old state to our new StateInfo object except the
// ones which are going to be recalculated from scratch anyway and then switch
// our state pointer to point to the new (ready to be updated) state.
- std::memcpy(&newSt, st, StateCopySize64 * sizeof(uint64_t));
-
+ std::memcpy(&newSt, st, offsetof(StateInfo, key));
newSt.previous = st;
st = &newSt;
- // Update side to move
- k ^= Zobrist::side;
-
// Increment ply counters. In particular, rule50 will be reset to zero later on
// in case of a capture or a pawn move.
++gamePly;
Color them = ~us;
Square from = from_sq(m);
Square to = to_sq(m);
- Piece pc = piece_on(from);
- PieceType pt = type_of(pc);
+ PieceType pt = type_of(piece_on(from));
PieceType captured = type_of(m) == ENPASSANT ? PAWN : type_of(piece_on(to));
- assert(color_of(pc) == us);
- assert(piece_on(to) == NO_PIECE || color_of(piece_on(to)) == them || type_of(m) == CASTLING);
+ assert(color_of(piece_on(from)) == us);
+ assert(piece_on(to) == NO_PIECE || color_of(piece_on(to)) == (type_of(m) != CASTLING ? them : us));
assert(captured != KING);
if (type_of(m) == CASTLING)
{
- assert(pc == make_piece(us, KING));
+ assert(pt == KING);
Square rfrom, rto;
- do_castling<true>(from, to, rfrom, rto);
+ do_castling<true>(us, from, to, rfrom, rto);
captured = NO_PIECE_TYPE;
st->psq += psq[us][ROOK][rto] - psq[us][ROOK][rfrom];
{
if (type_of(m) == ENPASSANT)
{
- capsq += pawn_push(them);
+ capsq -= pawn_push(us);
assert(pt == PAWN);
assert(to == st->epSquare);
assert(piece_on(to) == NO_PIECE);
assert(piece_on(capsq) == make_piece(them, PAWN));
- board[capsq] = NO_PIECE;
+ board[capsq] = NO_PIECE; // Not done by remove_piece()
}
st->pawnKey ^= Zobrist::psq[them][PAWN][capsq];
st->nonPawnMaterial[them] -= PieceValue[MG][captured];
// Update board and piece lists
- remove_piece(capsq, them, captured);
+ remove_piece(them, captured, capsq);
// Update material hash key and prefetch access to materialTable
k ^= Zobrist::psq[them][captured][capsq];
st->materialKey ^= Zobrist::psq[them][captured][pieceCount[them][captured]];
- prefetch((char*)thisThread->materialTable[st->materialKey]);
+ prefetch(thisThread->materialTable[st->materialKey]);
// Update incremental scores
st->psq -= psq[them][captured][capsq];
// Move the piece. The tricky Chess960 castling is handled earlier
if (type_of(m) != CASTLING)
- move_piece(from, to, us, pt);
+ move_piece(us, pt, from, to);
// If the moving piece is a pawn do some special extra work
if (pt == PAWN)
{
// Set en-passant square if the moved pawn can be captured
if ( (int(to) ^ int(from)) == 16
- && (attacks_from<PAWN>(from + pawn_push(us), us) & pieces(them, PAWN)))
+ && (attacks_from<PAWN>(to - pawn_push(us), us) & pieces(them, PAWN)))
{
- st->epSquare = Square((from + to) / 2);
+ st->epSquare = (from + to) / 2;
k ^= Zobrist::enpassant[file_of(st->epSquare)];
}
assert(relative_rank(us, to) == RANK_8);
assert(promotion >= KNIGHT && promotion <= QUEEN);
- remove_piece(to, us, PAWN);
- put_piece(to, us, promotion);
+ remove_piece(us, PAWN, to);
+ put_piece(us, promotion, to);
// Update hash keys
k ^= Zobrist::psq[us][PAWN][to] ^ Zobrist::psq[us][promotion][to];
// Update pawn hash key and prefetch access to pawnsTable
st->pawnKey ^= Zobrist::psq[us][PAWN][from] ^ Zobrist::psq[us][PAWN][to];
- prefetch((char*)thisThread->pawnsTable[st->pawnKey]);
+ prefetch(thisThread->pawnsTable[st->pawnKey]);
// Reset rule 50 draw counter
st->rule50 = 0;
// Update checkers bitboard: piece must be already moved due to attacks_from()
st->checkersBB = 0;
- if (moveIsCheck)
+ if (givesCheck)
{
if (type_of(m) != NORMAL)
st->checkersBB = attackers_to(king_square(them)) & pieces(us);
// Discovered checks
if (ci.dcCandidates && (ci.dcCandidates & from))
{
+ assert(pt != QUEEN);
+
if (pt != ROOK)
st->checkersBB |= attacks_from<ROOK>(king_square(them)) & pieces(us, QUEEN, ROOK);
if (type_of(m) == PROMOTION)
{
- assert(pt == promotion_type(m));
assert(relative_rank(us, to) == RANK_8);
- assert(promotion_type(m) >= KNIGHT && promotion_type(m) <= QUEEN);
+ assert(pt == promotion_type(m));
+ assert(pt >= KNIGHT && pt <= QUEEN);
- remove_piece(to, us, promotion_type(m));
- put_piece(to, us, PAWN);
+ remove_piece(us, pt, to);
+ put_piece(us, PAWN, to);
pt = PAWN;
}
if (type_of(m) == CASTLING)
{
Square rfrom, rto;
- do_castling<false>(from, to, rfrom, rto);
+ do_castling<false>(us, from, to, rfrom, rto);
}
else
{
- move_piece(to, from, us, pt); // Put the piece back at the source square
+ move_piece(us, pt, to, from); // Put the piece back at the source square
if (st->capturedType)
{
assert(to == st->previous->epSquare);
assert(relative_rank(us, to) == RANK_6);
assert(piece_on(capsq) == NO_PIECE);
+ assert(st->capturedType == PAWN);
}
- put_piece(capsq, ~us, st->capturedType); // Restore the captured piece
+ put_piece(~us, st->capturedType, capsq); // Restore the captured piece
}
}
/// Position::do_castling() is a helper used to do/undo a castling move. This
/// is a bit tricky, especially in Chess960.
template<bool Do>
-void Position::do_castling(Square from, Square& to, Square& rfrom, Square& rto) {
+void Position::do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto) {
bool kingSide = to > from;
rfrom = to; // Castling is encoded as "king captures friendly rook"
- rto = relative_square(sideToMove, kingSide ? SQ_F1 : SQ_D1);
- to = relative_square(sideToMove, kingSide ? SQ_G1 : SQ_C1);
+ rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1);
+ to = relative_square(us, kingSide ? SQ_G1 : SQ_C1);
// Remove both pieces first since squares could overlap in Chess960
- remove_piece(Do ? from : to, sideToMove, KING);
- remove_piece(Do ? rfrom : rto, sideToMove, ROOK);
+ remove_piece(us, KING, Do ? from : to);
+ remove_piece(us, ROOK, Do ? rfrom : rto);
board[Do ? from : to] = board[Do ? rfrom : rto] = NO_PIECE; // Since remove_piece doesn't do it for us
- put_piece(Do ? to : from, sideToMove, KING);
- put_piece(Do ? rto : rfrom, sideToMove, ROOK);
+ put_piece(us, KING, Do ? to : from);
+ put_piece(us, ROOK, Do ? rto : rfrom);
}
void Position::do_null_move(StateInfo& newSt) {
assert(!checkers());
+ assert(&newSt != st);
- std::memcpy(&newSt, st, sizeof(StateInfo)); // Fully copy here
-
+ std::memcpy(&newSt, st, sizeof(StateInfo));
newSt.previous = st;
st = &newSt;
}
st->key ^= Zobrist::side;
- prefetch((char*)TT.first_entry(st->key));
+ prefetch(TT.first_entry(st->key));
++st->rule50;
st->pliesFromNull = 0;
// Locate and remove the next least valuable attacker
captured = min_attacker<PAWN>(byTypeBB, to, stmAttackers, occupied, attackers);
-
- // Stop before processing a king capture
- if (captured == KING)
- {
- if (stmAttackers == attackers)
- ++slIndex;
-
- break;
- }
-
stm = ~stm;
stmAttackers = attackers & pieces(stm);
++slIndex;
- } while (stmAttackers);
+ } while (stmAttackers && (captured != KING || (--slIndex, false))); // Stop before a king capture
// Having built the swap list, we negamax through it to find the best
// achievable score from the point of view of the side to move.
/// Position::flip() flips position with the white and black sides reversed. This
/// is only useful for debugging e.g. for finding evaluation symmetry bugs.
-static char toggle_case(char c) {
- return char(islower(c) ? toupper(c) : tolower(c));
-}
-
void Position::flip() {
string f, token;
ss >> token; // Castling availability
f += token + " ";
- std::transform(f.begin(), f.end(), f.begin(), toggle_case);
+ std::transform(f.begin(), f.end(), f.begin(),
+ [](char c) { return char(islower(c) ? toupper(c) : tolower(c)); });
ss >> token; // En passant square
f += (token == "-" ? token : token.replace(1, 1, token[1] == '3' ? "6" : "3"));
/// Position::pos_is_ok() performs some consistency checks for the position object.
/// This is meant to be helpful when debugging.
-bool Position::pos_is_ok(int* step) const {
-
- // Which parts of the position should be verified?
- const bool all = false;
+bool Position::pos_is_ok(int* failedStep) const {
- const bool testBitboards = all || false;
- const bool testState = all || false;
- const bool testKingCount = all || false;
- const bool testKingCapture = all || false;
- const bool testPieceCounts = all || false;
- const bool testPieceList = all || false;
- const bool testCastlingSquares = all || false;
+ const bool Fast = true; // Quick (default) or full check?
- if (step)
- *step = 1;
-
- if ( (sideToMove != WHITE && sideToMove != BLACK)
- || piece_on(king_square(WHITE)) != W_KING
- || piece_on(king_square(BLACK)) != B_KING
- || ( ep_square() != SQ_NONE
- && relative_rank(sideToMove, ep_square()) != RANK_6))
- return false;
+ enum { Default, King, Bitboards, State, Lists, Castling };
- if (step && ++*step, testBitboards)
+ for (int step = Default; step <= (Fast ? Default : Castling); step++)
{
- // The intersection of the white and black pieces must be empty
- if (pieces(WHITE) & pieces(BLACK))
- return false;
-
- // The union of the white and black pieces must be equal to all
- // occupied squares
- if ((pieces(WHITE) | pieces(BLACK)) != pieces())
- return false;
+ if (failedStep)
+ *failedStep = step;
+
+ if (step == Default)
+ if ( (sideToMove != WHITE && sideToMove != BLACK)
+ || piece_on(king_square(WHITE)) != W_KING
+ || piece_on(king_square(BLACK)) != B_KING
+ || ( ep_square() != SQ_NONE
+ && relative_rank(sideToMove, ep_square()) != RANK_6))
+ return false;
- // Separate piece type bitboards must have empty intersections
- for (PieceType p1 = PAWN; p1 <= KING; ++p1)
- for (PieceType p2 = PAWN; p2 <= KING; ++p2)
- if (p1 != p2 && (pieces(p1) & pieces(p2)))
- return false;
- }
+ if (step == King)
+ if ( std::count(board, board + SQUARE_NB, W_KING) != 1
+ || std::count(board, board + SQUARE_NB, B_KING) != 1
+ || attackers_to(king_square(~sideToMove)) & pieces(sideToMove))
+ return false;
- if (step && ++*step, testState)
- {
- StateInfo si;
- set_state(&si);
- if ( st->key != si.key
- || st->pawnKey != si.pawnKey
- || st->materialKey != si.materialKey
- || st->nonPawnMaterial[WHITE] != si.nonPawnMaterial[WHITE]
- || st->nonPawnMaterial[BLACK] != si.nonPawnMaterial[BLACK]
- || st->psq != si.psq
- || st->checkersBB != si.checkersBB)
- return false;
- }
+ if (step == Bitboards)
+ {
+ if ( (pieces(WHITE) & pieces(BLACK))
+ ||(pieces(WHITE) | pieces(BLACK)) != pieces())
+ return false;
- if (step && ++*step, testKingCount)
- if ( std::count(board, board + SQUARE_NB, W_KING) != 1
- || std::count(board, board + SQUARE_NB, B_KING) != 1)
- return false;
+ for (PieceType p1 = PAWN; p1 <= KING; ++p1)
+ for (PieceType p2 = PAWN; p2 <= KING; ++p2)
+ if (p1 != p2 && (pieces(p1) & pieces(p2)))
+ return false;
+ }
- if (step && ++*step, testKingCapture)
- if (attackers_to(king_square(~sideToMove)) & pieces(sideToMove))
- return false;
+ if (step == State)
+ {
+ StateInfo si = *st;
+ set_state(&si);
+ if (std::memcmp(&si, st, sizeof(StateInfo)))
+ return false;
+ }
- if (step && ++*step, testPieceCounts)
- for (Color c = WHITE; c <= BLACK; ++c)
- for (PieceType pt = PAWN; pt <= KING; ++pt)
- if (pieceCount[c][pt] != popcount<Full>(pieces(c, pt)))
- return false;
-
- if (step && ++*step, testPieceList)
- for (Color c = WHITE; c <= BLACK; ++c)
- for (PieceType pt = PAWN; pt <= KING; ++pt)
- for (int i = 0; i < pieceCount[c][pt]; ++i)
- if ( board[pieceList[c][pt][i]] != make_piece(c, pt)
- || index[pieceList[c][pt][i]] != i)
+ if (step == Lists)
+ for (Color c = WHITE; c <= BLACK; ++c)
+ for (PieceType pt = PAWN; pt <= KING; ++pt)
+ {
+ if (pieceCount[c][pt] != popcount<Full>(pieces(c, pt)))
return false;
- if (step && ++*step, testCastlingSquares)
- for (Color c = WHITE; c <= BLACK; ++c)
- for (CastlingSide s = KING_SIDE; s <= QUEEN_SIDE; s = CastlingSide(s + 1))
- {
- if (!can_castle(c | s))
- continue;
-
- if ( (castlingRightsMask[king_square(c)] & (c | s)) != (c | s)
- || piece_on(castlingRookSquare[c | s]) != make_piece(c, ROOK)
- || castlingRightsMask[castlingRookSquare[c | s]] != (c | s))
- return false;
- }
+ for (int i = 0; i < pieceCount[c][pt]; ++i)
+ if ( board[pieceList[c][pt][i]] != make_piece(c, pt)
+ || index[pieceList[c][pt][i]] != i)
+ return false;
+ }
+
+ if (step == Castling)
+ for (Color c = WHITE; c <= BLACK; ++c)
+ for (CastlingSide s = KING_SIDE; s <= QUEEN_SIDE; s = CastlingSide(s + 1))
+ {
+ if (!can_castle(c | s))
+ continue;
+
+ if ( piece_on(castlingRookSquare[c | s]) != make_piece(c, ROOK)
+ || castlingRightsMask[castlingRookSquare[c | s]] != (c | s)
+ ||(castlingRightsMask[king_square(c)] & (c | s)) != (c | s))
+ return false;
+ }
+ }
return true;
}
};
-/// When making a move the current StateInfo up to 'key' excluded is copied to
-/// the new one. Here we calculate the quad words (64 bit) needed to be copied.
-const size_t StateCopySize64 = offsetof(StateInfo, key) / sizeof(uint64_t) + 1;
-
-
/// Position class stores information regarding the board representation as
/// pieces, side to move, hash keys, castling info, etc. Important methods are
/// do_move() and undo_move(), used by the search to update node info when
friend std::ostream& operator<<(std::ostream&, const Position&);
- Position(const Position&); // Disable the default copy constructor
-
public:
static void init();
- Position() {} // To define the global object RootPos
+ Position() = default; // To define the global object RootPos
+ Position(const Position&) = delete;
Position(const Position& pos, Thread* th) { *this = pos; thisThread = th; }
Position(const std::string& f, bool c960, Thread* th) { set(f, c960, th); }
Position& operator=(const Position&); // To assign RootPos from UCI
// Doing and undoing moves
void do_move(Move m, StateInfo& st);
- void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
+ void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool givesCheck);
void undo_move(Move m);
void do_null_move(StateInfo& st);
void undo_null_move();
Value non_pawn_material(Color c) const;
// Position consistency check, for debugging
- bool pos_is_ok(int* step = NULL) const;
+ bool pos_is_ok(int* failedStep = nullptr) const;
void flip();
private:
// Other helpers
Bitboard check_blockers(Color c, Color kingColor) const;
- void put_piece(Square s, Color c, PieceType pt);
- void remove_piece(Square s, Color c, PieceType pt);
- void move_piece(Square from, Square to, Color c, PieceType pt);
+ void put_piece(Color c, PieceType pt, Square s);
+ void remove_piece(Color c, PieceType pt, Square s);
+ void move_piece(Color c, PieceType pt, Square from, Square to);
template<bool Do>
- void do_castling(Square from, Square& to, Square& rfrom, Square& rto);
+ void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto);
// Data members
Piece board[SQUARE_NB];
return thisThread;
}
-inline void Position::put_piece(Square s, Color c, PieceType pt) {
+inline void Position::put_piece(Color c, PieceType pt, Square s) {
board[s] = make_piece(c, pt);
byTypeBB[ALL_PIECES] |= s;
pieceCount[c][ALL_PIECES]++;
}
-inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) {
-
- // index[from] is not updated and becomes stale. This works as long as index[]
- // is accessed just by known occupied squares.
- Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to];
- byTypeBB[ALL_PIECES] ^= from_to_bb;
- byTypeBB[pt] ^= from_to_bb;
- byColorBB[c] ^= from_to_bb;
- board[from] = NO_PIECE;
- board[to] = make_piece(c, pt);
- index[to] = index[from];
- pieceList[c][pt][index[to]] = to;
-}
-
-inline void Position::remove_piece(Square s, Color c, PieceType pt) {
+inline void Position::remove_piece(Color c, PieceType pt, Square s) {
// WARNING: This is not a reversible operation. If we remove a piece in
// do_move() and then replace it in undo_move() we will put it at the end of
pieceCount[c][ALL_PIECES]--;
}
+inline void Position::move_piece(Color c, PieceType pt, Square from, Square to) {
+
+ // index[from] is not updated and becomes stale. This works as long as index[]
+ // is accessed just by known occupied squares.
+ Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to];
+ byTypeBB[ALL_PIECES] ^= from_to_bb;
+ byTypeBB[pt] ^= from_to_bb;
+ byColorBB[c] ^= from_to_bb;
+ board[from] = NO_PIECE;
+ board[to] = make_piece(c, pt);
+ index[to] = index[from];
+ pieceList[c][pt][index[to]] = to;
+}
+
#endif // #ifndef POSITION_H_INCLUDED
// Different node types, used as template parameter
enum NodeType { Root, PV, NonPV };
- // Dynamic razoring margin based on depth
+ // Razoring and futility margin based on depth
inline Value razor_margin(Depth d) { return Value(512 + 32 * d); }
+ inline Value futility_margin(Depth d) { return Value(200 * d); }
- // Futility lookup tables (initialized at startup) and their access functions
- int FutilityMoveCounts[2][16]; // [improving][depth]
+ // Futility and reductions lookup tables, initialized at startup
+ int FutilityMoveCounts[2][16]; // [improving][depth]
+ Depth Reductions[2][2][64][64]; // [pv][improving][depth][moveNumber]
- inline Value futility_margin(Depth d) {
- return Value(200 * d);
+ template <bool PvNode> inline Depth reduction(bool i, Depth d, int mn) {
+ return Reductions[PvNode][i][std::min(d, 63 * ONE_PLY)][std::min(mn, 63)];
}
- // Reduction lookup tables (initialized at startup) and their access function
- int8_t Reductions[2][2][64][64]; // [pv][improving][depth][moveNumber]
+ // Skill struct is used to implement strength limiting
+ struct Skill {
+ Skill(int l) : level(l) {}
+ bool enabled() const { return level < 20; }
+ bool time_to_pick(Depth depth) const { return depth / ONE_PLY == 1 + level; }
+ Move best_move(size_t multiPV) { return best ? best : pick_best(multiPV); }
+ Move pick_best(size_t multiPV);
- template <bool PvNode> inline Depth reduction(bool i, Depth d, int mn) {
- return (Depth) Reductions[PvNode][i][std::min(int(d), 63)][std::min(mn, 63)];
- }
+ int level;
+ Move best = MOVE_NONE;
+ };
size_t PVIdx;
TimeManager TimeMgr;
Value value_from_tt(Value v, int ply);
void update_pv(Move* pv, Move move, Move* childPv);
void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt);
- string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta);
-
- struct Skill {
- Skill(int l, size_t rootSize) : level(l),
- candidates(l < 20 ? std::min(4, (int)rootSize) : 0),
- best(MOVE_NONE) {}
- ~Skill() {
- if (candidates) // Swap best PV line with the sub-optimal one
- std::swap(RootMoves[0], *std::find(RootMoves.begin(),
- RootMoves.end(), best ? best : pick_move()));
- }
-
- size_t candidates_size() const { return candidates; }
- bool time_to_pick(Depth depth) const { return depth / ONE_PLY == 1 + level; }
- Move pick_move();
-
- int level;
- size_t candidates;
- Move best;
- };
} // namespace
void Search::init() {
- // Init reductions array
- for (int d = 1; d < 64; ++d)
- for (int mc = 1; mc < 64; ++mc)
- {
- double pvRed = 0.00 + log(double(d)) * log(double(mc)) / 3.00;
- double nonPVRed = 0.33 + log(double(d)) * log(double(mc)) / 2.25;
+ const double K[][2] = {{ 0.83, 2.25 }, { 0.50, 3.00 }};
- Reductions[1][1][d][mc] = int8_t( pvRed >= 1.0 ? pvRed + 0.5: 0);
- Reductions[0][1][d][mc] = int8_t(nonPVRed >= 1.0 ? nonPVRed + 0.5: 0);
+ for (int pv = 0; pv <= 1; ++pv)
+ for (int imp = 0; imp <= 1; ++imp)
+ for (int d = 1; d < 64; ++d)
+ for (int mc = 1; mc < 64; ++mc)
+ {
+ double r = K[pv][0] + log(d) * log(mc) / K[pv][1];
- Reductions[1][0][d][mc] = Reductions[1][1][d][mc];
- Reductions[0][0][d][mc] = Reductions[0][1][d][mc];
+ if (r >= 1.5)
+ Reductions[pv][imp][d][mc] = int(r) * ONE_PLY;
- // Increase reduction when eval is not improving
- if (Reductions[0][0][d][mc] >= 2)
- Reductions[0][0][d][mc] += 1;
- }
+ // Increase reduction when eval is not improving
+ if (!pv && !imp && Reductions[pv][imp][d][mc] >= 2 * ONE_PLY)
+ Reductions[pv][imp][d][mc] += ONE_PLY;
+ }
- // Init futility move count array
for (int d = 0; d < 16; ++d)
{
FutilityMoveCounts[0][d] = int(2.4 + 0.773 * pow(d + 0.00, 1.8));
CheckInfo ci(pos);
const bool leaf = (depth == 2 * ONE_PLY);
- for (MoveList<LEGAL> it(pos); *it; ++it)
+ for (const auto& m : MoveList<LEGAL>(pos))
{
if (Root && depth <= ONE_PLY)
cnt = 1, nodes++;
else
{
- pos.do_move(*it, st, ci, pos.gives_check(*it, ci));
+ pos.do_move(m, st, ci, pos.gives_check(m, ci));
cnt = leaf ? MoveList<LEGAL>(pos).size() : perft<false>(pos, depth - ONE_PLY);
nodes += cnt;
- pos.undo_move(*it);
+ pos.undo_move(m);
}
if (Root)
- sync_cout << UCI::move(*it, pos.is_chess960()) << ": " << cnt << sync_endl;
+ sync_cout << UCI::move(m, pos.is_chess960()) << ": " << cnt << sync_endl;
}
return nodes;
}
if (RootMoves.empty())
{
- RootMoves.push_back(MOVE_NONE);
+ RootMoves.push_back(RootMove(MOVE_NONE));
sync_cout << "info depth 0 score "
<< UCI::value(RootPos.checkers() ? -VALUE_MATE : VALUE_DRAW)
<< sync_endl;
}
}
- for (size_t i = 0; i < Threads.size(); ++i)
- Threads[i]->maxPly = 0;
+ for (Thread* th : Threads)
+ th->maxPly = 0;
Threads.timer->run = true;
Threads.timer->notify_one(); // Wake up the recurring timer
Followupmoves.clear();
size_t multiPV = Options["MultiPV"];
- Skill skill(Options["Skill Level"], RootMoves.size());
+ Skill skill(Options["Skill Level"]);
- // Do we have to play with skill handicap? In this case enable MultiPV search
- // that we will use behind the scenes to retrieve a set of possible moves.
- multiPV = std::max(multiPV, skill.candidates_size());
+ // When playing with strength handicap enable MultiPV search that we will
+ // use behind the scenes to retrieve a set of possible moves.
+ if (skill.enabled())
+ multiPV = std::max(multiPV, (size_t)4);
+
+ multiPV = std::min(multiPV, RootMoves.size());
// Iterative deepening loop until requested to stop or target depth reached
while (++depth < DEPTH_MAX && !Signals.stop && (!Limits.depth || depth <= Limits.depth))
// Save the last iteration's scores before first PV line is searched and
// all the move scores except the (new) PV are set to -VALUE_INFINITE.
- for (size_t i = 0; i < RootMoves.size(); ++i)
- RootMoves[i].previousScore = RootMoves[i].score;
+ for (RootMove& rm : RootMoves)
+ rm.previousScore = rm.score;
// MultiPV loop. We perform a full root search for each PV line
- for (PVIdx = 0; PVIdx < std::min(multiPV, RootMoves.size()) && !Signals.stop; ++PVIdx)
+ for (PVIdx = 0; PVIdx < multiPV && !Signals.stop; ++PVIdx)
{
// Reset aspiration window starting size
if (depth >= 5 * ONE_PLY)
if ( multiPV == 1
&& (bestValue <= alpha || bestValue >= beta)
&& Time::now() - SearchTime > 3000)
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
+ sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl;
// In case of failing low/high increase aspiration window and
// re-search, otherwise exit the loop.
sync_cout << "info nodes " << RootPos.nodes_searched()
<< " time " << Time::now() - SearchTime << sync_endl;
- else if ( PVIdx + 1 == std::min(multiPV, RootMoves.size())
- || Time::now() - SearchTime > 3000)
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
+ else if (PVIdx + 1 == multiPV || Time::now() - SearchTime > 3000)
+ sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl;
}
- // If skill levels are enabled and time is up, pick a sub-optimal best move
- if (skill.candidates_size() && skill.time_to_pick(depth))
- skill.pick_move();
+ // If skill level is enabled and time is up, pick a sub-optimal best move
+ if (skill.enabled() && skill.time_to_pick(depth))
+ skill.pick_best(multiPV);
// Have we found a "mate in x"?
if ( Limits.mate
}
}
}
+
+ // If skill level is enabled, swap best PV line with the sub-optimal one
+ if (skill.enabled())
+ std::swap(RootMoves[0], *std::find(RootMoves.begin(),
+ RootMoves.end(), skill.best_move(multiPV)));
}
splitPoint = ss->splitPoint;
bestMove = splitPoint->bestMove;
bestValue = splitPoint->bestValue;
- tte = NULL;
+ tte = nullptr;
ttHit = false;
ttMove = excludedMove = MOVE_NONE;
ttValue = VALUE_NONE;
// If ttMove is quiet, update killers, history, counter move and followup move on TT hit
if (ttValue >= beta && ttMove && !pos.capture_or_promotion(ttMove) && !inCheck)
- update_stats(pos, ss, ttMove, depth, NULL, 0);
+ update_stats(pos, ss, ttMove, depth, nullptr, 0);
return ttValue;
}
}
if (PvNode)
- (ss+1)->pv = NULL;
+ (ss+1)->pv = nullptr;
extension = DEPTH_ZERO;
captureOrPromotion = pos.capture_or_promotion(move);
}
// Speculative prefetch as early as possible
- prefetch((char*)TT.first_entry(pos.key_after(move)));
+ prefetch(TT.first_entry(pos.key_after(move)));
// Check for legality just before making the move
if (!RootNode && !SpNode && !pos.legal(move, ci.pinned))
continue;
// Speculative prefetch as early as possible
- prefetch((char*)TT.first_entry(pos.key_after(move)));
+ prefetch(TT.first_entry(pos.key_after(move)));
// Check for legality just before making the move
if (!pos.legal(move, ci.pinned))
// played quiet moves.
Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY));
History.update(pos.moved_piece(move), to_sq(move), bonus);
+
for (int i = 0; i < quietsCnt; ++i)
{
Move m = quiets[i];
}
- // When playing with a strength handicap, choose best move among the first 'candidates'
- // RootMoves using a statistical rule dependent on 'level'. Idea by Heinz van Saanen.
+ // When playing with strength handicap, choose best move among a set of RootMoves
+ // using a statistical rule dependent on 'level'. Idea by Heinz van Saanen.
- Move Skill::pick_move() {
+ Move Skill::pick_best(size_t multiPV) {
// PRNG sequence should be non-deterministic, so we seed it with the time at init
static PRNG rng(Time::now());
// RootMoves are already sorted by score in descending order
- int variance = std::min(RootMoves[0].score - RootMoves[candidates - 1].score, PawnValueMg);
+ int variance = std::min(RootMoves[0].score - RootMoves[multiPV - 1].score, PawnValueMg);
int weakness = 120 - 2 * level;
int maxScore = -VALUE_INFINITE;
- best = MOVE_NONE;
// Choose best move. For each move score we add two terms both dependent on
- // weakness. One deterministic and bigger for weaker moves, and one random,
+ // weakness. One deterministic and bigger for weaker levels, and one random,
// then we choose the move with the resulting highest score.
- for (size_t i = 0; i < candidates; ++i)
+ for (size_t i = 0; i < multiPV; ++i)
{
- int score = RootMoves[i].score;
-
// This is our magic formula
- score += ( weakness * int(RootMoves[0].score - score)
- + variance * (rng.rand<unsigned>() % weakness)) / 128;
+ int push = ( weakness * int(RootMoves[0].score - RootMoves[i].score)
+ + variance * (rng.rand<unsigned>() % weakness)) / 128;
- if (score > maxScore)
+ if (RootMoves[i].score + push > maxScore)
{
- maxScore = score;
+ maxScore = RootMoves[i].score + push;
best = RootMoves[i].pv[0];
}
}
return best;
}
+} // namespace
- // uci_pv() formats PV information according to the UCI protocol. UCI
- // requires that all (if any) unsearched PV lines are sent using a previous
- // search score.
- string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta) {
+/// UCI::pv() formats PV information according to the UCI protocol. UCI requires
+/// that all (if any) unsearched PV lines are sent using a previous search score.
- std::stringstream ss;
- Time::point elapsed = Time::now() - SearchTime + 1;
- size_t uciPVSize = std::min((size_t)Options["MultiPV"], RootMoves.size());
- int selDepth = 0;
+string UCI::pv(const Position& pos, Depth depth, Value alpha, Value beta) {
- for (size_t i = 0; i < Threads.size(); ++i)
- if (Threads[i]->maxPly > selDepth)
- selDepth = Threads[i]->maxPly;
+ std::stringstream ss;
+ Time::point elapsed = Time::now() - SearchTime + 1;
+ size_t multiPV = std::min((size_t)Options["MultiPV"], RootMoves.size());
+ int selDepth = 0;
- for (size_t i = 0; i < uciPVSize; ++i)
- {
- bool updated = (i <= PVIdx);
+ for (Thread* th : Threads)
+ if (th->maxPly > selDepth)
+ selDepth = th->maxPly;
- if (depth == ONE_PLY && !updated)
- continue;
+ for (size_t i = 0; i < multiPV; ++i)
+ {
+ bool updated = (i <= PVIdx);
- Depth d = updated ? depth : depth - ONE_PLY;
- Value v = updated ? RootMoves[i].score : RootMoves[i].previousScore;
+ if (depth == ONE_PLY && !updated)
+ continue;
- bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
- v = tb ? TB::Score : v;
+ Depth d = updated ? depth : depth - ONE_PLY;
+ Value v = updated ? RootMoves[i].score : RootMoves[i].previousScore;
- if (ss.rdbuf()->in_avail()) // Not at first line
- ss << "\n";
+ bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
+ v = tb ? TB::Score : v;
- ss << "info depth " << d / ONE_PLY
- << " seldepth " << selDepth
- << " multipv " << i + 1
- << " score " << UCI::value(v);
+ if (ss.rdbuf()->in_avail()) // Not at first line
+ ss << "\n";
- if (!tb && i == PVIdx)
- ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
+ ss << "info"
+ << " depth " << d / ONE_PLY
+ << " seldepth " << selDepth
+ << " multipv " << i + 1
+ << " score " << UCI::value(v);
- ss << " nodes " << pos.nodes_searched()
- << " nps " << pos.nodes_searched() * 1000 / elapsed;
+ if (!tb && i == PVIdx)
+ ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
- if (elapsed > 1000) // Earlier makes little sense
- ss << " hashfull " << TT.hashfull();
+ ss << " nodes " << pos.nodes_searched()
+ << " nps " << pos.nodes_searched() * 1000 / elapsed;
- ss << " tbhits " << TB::Hits
- << " time " << elapsed
- << " pv";
+ if (elapsed > 1000) // Earlier makes little sense
+ ss << " hashfull " << TT.hashfull();
- for (size_t j = 0; j < RootMoves[i].pv.size(); ++j)
- ss << " " << UCI::move(RootMoves[i].pv[j], pos.is_chess960());
- }
+ ss << " tbhits " << TB::Hits
+ << " time " << elapsed
+ << " pv";
- return ss.str();
+ for (Move m : RootMoves[i].pv)
+ ss << " " << UCI::move(m, pos.is_chess960());
}
-} // namespace
+ return ss.str();
+}
/// RootMove::insert_pv_in_tt() is called at the end of a search iteration, and
void RootMove::insert_pv_in_tt(Position& pos) {
StateInfo state[MAX_PLY], *st = state;
- size_t idx = 0;
+ bool ttHit;
- for ( ; idx < pv.size(); ++idx)
+ for (Move m : pv)
{
- bool ttHit;
- TTEntry* tte = TT.probe(pos.key(), ttHit);
+ assert(MoveList<LEGAL>(pos).contains(m));
- if (!ttHit || tte->move() != pv[idx]) // Don't overwrite correct entries
- tte->save(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE, TT.generation());
+ TTEntry* tte = TT.probe(pos.key(), ttHit);
- assert(MoveList<LEGAL>(pos).contains(pv[idx]));
+ if (!ttHit || tte->move() != m) // Don't overwrite correct entries
+ tte->save(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, m, VALUE_NONE, TT.generation());
- pos.do_move(pv[idx], *st++);
+ pos.do_move(m, *st++);
}
- while (idx) pos.undo_move(pv[--idx]);
+ for (size_t i = pv.size(); i > 0; )
+ pos.undo_move(pv[--i]);
}
/// root. We try hard to have a ponder move to return to the GUI, otherwise in case of
/// 'ponder on' we have nothing to think on.
-Move RootMove::extract_ponder_from_tt(Position& pos)
+bool RootMove::extract_ponder_from_tt(Position& pos)
{
StateInfo st;
- bool found;
+ bool ttHit;
assert(pv.size() == 1);
pos.do_move(pv[0], st);
- TTEntry* tte = TT.probe(pos.key(), found);
- Move m = found ? tte->move() : MOVE_NONE;
- if (!MoveList<LEGAL>(pos).contains(m))
- m = MOVE_NONE;
-
+ TTEntry* tte = TT.probe(pos.key(), ttHit);
pos.undo_move(pv[0]);
- pv.push_back(m);
- return m;
+
+ if (ttHit)
+ {
+ Move m = tte->move(); // Local copy to be SMP safe
+ if (MoveList<LEGAL>(pos).contains(m))
+ return pv.push_back(m), true;
+ }
+
+ return false;
}
// Pointer 'this_sp' is not null only if we are called from split(), and not
// at the thread creation. This means we are the split point's master.
- SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL;
+ SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : nullptr;
assert(!this_sp || (this_sp->masterThread == this && searching));
sp->mutex.lock();
- assert(activePosition == NULL);
+ assert(activePosition == nullptr);
activePosition = &pos;
assert(searching);
searching = false;
- activePosition = NULL;
+ activePosition = nullptr;
sp->slavesMask.reset(idx);
sp->allSlavesSearching = false;
sp->nodes += pos.nodes_searched();
for (size_t i = 0; i < Threads.size(); ++i)
{
const int size = Threads[i]->splitPointsSize; // Local copy
- sp = size ? &Threads[i]->splitPoints[size - 1] : NULL;
+ sp = size ? &Threads[i]->splitPoints[size - 1] : nullptr;
if ( sp
&& sp->allSlavesSearching
}
// Grab the lock to avoid races with Thread::notify_one()
- mutex.lock();
+ std::unique_lock<std::mutex> lk(mutex);
// If we are master and all slaves have finished then exit idle_loop
if (this_sp && this_sp->slavesMask.none())
{
assert(!searching);
- mutex.unlock();
break;
}
// If we are not searching, wait for a condition to be signaled instead of
// wasting CPU time polling for work.
if (!searching && !exit)
- sleepCondition.wait(mutex);
-
- mutex.unlock();
+ sleepCondition.wait(lk);
}
}
// Loop across all split points and sum accumulated SplitPoint nodes plus
// all the currently active positions nodes.
- for (size_t i = 0; i < Threads.size(); ++i)
- for (int j = 0; j < Threads[i]->splitPointsSize; ++j)
+ for (Thread* th : Threads)
+ for (int i = 0; i < th->splitPointsSize; ++i)
{
- SplitPoint& sp = Threads[i]->splitPoints[j];
+ SplitPoint& sp = th->splitPoints[i];
sp.mutex.lock();
struct RootMove {
- RootMove(Move m) : score(-VALUE_INFINITE), previousScore(-VALUE_INFINITE), pv(1, m) {}
+ explicit RootMove(Move m) : pv(1, m) {}
bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort
bool operator==(const Move& m) const { return pv[0] == m; }
void insert_pv_in_tt(Position& pos);
- Move extract_ponder_from_tt(Position& pos);
+ bool extract_ponder_from_tt(Position& pos);
- Value score;
- Value previousScore;
+ Value score = -VALUE_INFINITE;
+ Value previousScore = -VALUE_INFINITE;
std::vector<Move> pv;
};
bool stop, stopOnPonderhit, firstRootMove, failedLowAtRoot;
};
-typedef std::auto_ptr<std::stack<StateInfo> > StateStackPtr;
+typedef std::unique_ptr<std::stack<StateInfo>> StateStackPtr;
extern volatile SignalsType Signals;
extern LimitsType Limits;
this code to other chess engines.
*/
+#define NOMINMAX
+
#include <algorithm>
#include "../position.h"
namespace {
- // start_routine() is the C function which is called when a new thread
- // is launched. It is a wrapper to the virtual function idle_loop().
-
- extern "C" { long start_routine(ThreadBase* th) { th->idle_loop(); return 0; } }
-
-
// Helpers to launch a thread after creation and joining before delete. Must be
// outside Thread c'tor and d'tor because the object must be fully initialized
// when start_routine (and hence virtual idle_loop) is called and when joining.
template<typename T> T* new_thread() {
T* th = new T();
- thread_create(th->handle, start_routine, th); // Will go to sleep
+ th->nativeThread = std::thread(&ThreadBase::idle_loop, th); // Will go to sleep
return th;
}
th->mutex.unlock();
th->notify_one();
- thread_join(th->handle); // Wait for thread termination
+ th->nativeThread.join(); // Wait for thread termination
delete th;
}
void ThreadBase::notify_one() {
- mutex.lock();
+ std::unique_lock<std::mutex>(this->mutex);
sleepCondition.notify_one();
- mutex.unlock();
}
void ThreadBase::wait_for(volatile const bool& condition) {
- mutex.lock();
- while (!condition) sleepCondition.wait(mutex);
- mutex.unlock();
+ std::unique_lock<std::mutex> lk(mutex);
+ sleepCondition.wait(lk, [&]{ return condition; });
}
searching = false;
maxPly = splitPointsSize = 0;
- activeSplitPoint = NULL;
- activePosition = NULL;
+ activeSplitPoint = nullptr;
+ activePosition = nullptr;
idx = Threads.size(); // Starts from 0
}
sp.allSlavesSearching = true; // Must be set under lock protection
++splitPointsSize;
activeSplitPoint = &sp;
- activePosition = NULL;
+ activePosition = nullptr;
Thread* slave;
- while ((slave = Threads.available_slave(this)) != NULL)
+ while ((slave = Threads.available_slave(this)) != nullptr)
{
sp.slavesMask.set(slave->idx);
slave->activeSplitPoint = &sp;
while (!exit)
{
- mutex.lock();
+ std::unique_lock<std::mutex> lk(mutex);
if (!exit)
- sleepCondition.wait_for(mutex, run ? Resolution : INT_MAX);
+ sleepCondition.wait_for(lk, std::chrono::milliseconds(run ? Resolution : INT_MAX));
- mutex.unlock();
+ lk.unlock();
if (run)
check_time();
while (!exit)
{
- mutex.lock();
+ std::unique_lock<std::mutex> lk(mutex);
thinking = false;
while (!thinking && !exit)
{
Threads.sleepCondition.notify_one(); // Wake up the UI thread if needed
- sleepCondition.wait(mutex);
+ sleepCondition.wait(lk);
}
- mutex.unlock();
+ lk.unlock();
if (!exit)
{
delete_thread(timer); // As first because check_time() accesses threads data
- for (iterator it = begin(); it != end(); ++it)
- delete_thread(*it);
+ for (Thread* th : *this)
+ delete_thread(th);
}
Thread* ThreadPool::available_slave(const Thread* master) const {
- for (const_iterator it = begin(); it != end(); ++it)
- if ((*it)->available_to(master))
- return *it;
+ for (Thread* th : *this)
+ if (th->available_to(master))
+ return th;
- return NULL;
+ return nullptr;
}
void ThreadPool::wait_for_think_finished() {
- MainThread* th = main();
- th->mutex.lock();
- while (th->thinking) sleepCondition.wait(th->mutex);
- th->mutex.unlock();
+ std::unique_lock<std::mutex> lk(main()->mutex);
+ sleepCondition.wait(lk, [&]{ return !main()->thinking; });
}
Limits = limits;
if (states.get()) // If we don't set a new position, preserve current state
{
- SetupStates = states; // Ownership transfer here
+ SetupStates = std::move(states); // Ownership transfer here
assert(!states.get());
}
- for (MoveList<LEGAL> it(pos); *it; ++it)
+ for (const auto& m : MoveList<LEGAL>(pos))
if ( limits.searchmoves.empty()
- || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), *it))
- RootMoves.push_back(RootMove(*it));
+ || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m))
+ RootMoves.push_back(RootMove(m));
main()->thinking = true;
main()->notify_one(); // Starts main thread
#define THREAD_H_INCLUDED
#include <bitset>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
#include <vector>
#include "material.h"
const int MAX_THREADS = 128;
const int MAX_SPLITPOINTS_PER_THREAD = 8;
-/// Mutex and ConditionVariable struct are wrappers of the low level locking
-/// machinery and are modeled after the corresponding C++11 classes.
-
-struct Mutex {
- Mutex() { lock_init(l); }
- ~Mutex() { lock_destroy(l); }
-
- void lock() { lock_grab(l); }
- void unlock() { lock_release(l); }
-
-private:
- friend struct ConditionVariable;
-
- Lock l;
-};
-
-struct ConditionVariable {
- ConditionVariable() { cond_init(c); }
- ~ConditionVariable() { cond_destroy(c); }
-
- void wait(Mutex& m) { cond_wait(c, m.l); }
- void wait_for(Mutex& m, int ms) { timed_wait(c, m.l, ms); }
- void notify_one() { cond_signal(c); }
-
-private:
- WaitCondition c;
-};
-
-
/// SplitPoint struct stores information shared by the threads searching in
/// parallel below the same split point. It is populated at splitting time.
SplitPoint* parentSplitPoint;
// Shared variable data
- Mutex mutex;
+ std::mutex mutex;
std::bitset<MAX_THREADS> slavesMask;
volatile bool allSlavesSearching;
volatile uint64_t nodes;
struct ThreadBase {
- ThreadBase() : handle(NativeHandle()), exit(false) {}
- virtual ~ThreadBase() {}
+ virtual ~ThreadBase() = default;
virtual void idle_loop() = 0;
void notify_one();
void wait_for(volatile const bool& b);
- Mutex mutex;
- ConditionVariable sleepCondition;
- NativeHandle handle;
- volatile bool exit;
+ std::thread nativeThread;
+ std::mutex mutex;
+ std::condition_variable sleepCondition;
+ volatile bool exit = false;
};
/// special threads: the main one and the recurring timer.
struct MainThread : public Thread {
- MainThread() : thinking(true) {} // Avoid a race with start_thinking()
virtual void idle_loop();
- volatile bool thinking;
+ volatile bool thinking = true; // Avoid a race with start_thinking()
};
struct TimerThread : public ThreadBase {
static const int Resolution = 5; // Millisec between two check_time() calls
- TimerThread() : run(false) {}
virtual void idle_loop();
- bool run;
+ bool run = false;
};
void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
Depth minimumSplitDepth;
- Mutex mutex;
- ConditionVariable sleepCondition;
+ std::mutex mutex;
+ std::condition_variable sleepCondition;
TimerThread* timer;
};
void TranspositionTable::resize(size_t mbSize) {
- assert(sizeof(Cluster) == CacheLineSize / 2);
-
size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(Cluster));
if (newClusterCount == clusterCount)
char padding[2]; // Align to the cache line size
};
+ static_assert(sizeof(Cluster) == CacheLineSize / 2, "Cluster size incorrect");
+
public:
~TranspositionTable() { free(mem); }
void new_search() { generation8 += 4; } // Lower 2 bits are used by Bound
///
/// -DUSE_POPCNT | Add runtime support for use of popcnt asm-instruction. Works
/// | only in 64-bit mode and requires hardware with popcnt support.
+///
+/// -DUSE_PEXT | Add runtime support for use of pext asm-instruction. Works
+/// | only in 64-bit mode and requires hardware with pext support.
#include <cassert>
#include <cctype>
#include <climits>
+#include <cstdint>
#include <cstdlib>
-#include "platform.h"
+#if defined(_MSC_VER)
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4127) // Conditional expression is constant
+#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#endif
/// Predefined macros hell:
///
BOUND_EXACT = BOUND_UPPER | BOUND_LOWER
};
-enum Value {
+enum Value : int {
VALUE_ZERO = 0,
VALUE_DRAW = 0,
VALUE_KNOWN_WIN = 10000,
VALUE_MATE_IN_MAX_PLY = VALUE_MATE - 2 * MAX_PLY,
VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + 2 * MAX_PLY,
- VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX,
- VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN,
-
PawnValueMg = 198, PawnValueEg = 258,
KnightValueMg = 817, KnightValueEg = 846,
BishopValueMg = 836, BishopValueEg = 857,
};
-/// Score enum stores a middlegame and an endgame value in a single integer.
-/// The least significant 16 bits are used to store the endgame value and
-/// the upper 16 bits are used to store the middlegame value. The compiler
-/// is free to choose the enum type as long as it can store the data, so we
-/// ensure that Score is an integer type by assigning some big int values.
-enum Score {
- SCORE_ZERO,
- SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
- SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
-};
+/// Score enum stores a middlegame and an endgame value in a single integer
+/// (enum). The least significant 16 bits are used to store the endgame value
+/// and the upper 16 bits are used to store the middlegame value.
+enum Score : int { SCORE_ZERO };
inline Score make_score(int mg, int eg) {
return Score((mg << 16) + eg);
}
inline PieceType promotion_type(Move m) {
- return PieceType(((m >> 12) & 3) + 2);
+ return PieceType(((m >> 12) & 3) + KNIGHT);
}
inline Move make_move(Square from, Square to) {
/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
std::string UCI::square(Square s) {
-
- char sq[] = { char('a' + file_of(s)), char('1' + rank_of(s)), 0 }; // NULL terminated
- return sq;
+ return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
}
if (str.length() == 5) // Junior could send promotion piece in uppercase
str[4] = char(tolower(str[4]));
- for (MoveList<LEGAL> it(pos); *it; ++it)
- if (str == UCI::move(*it, pos.is_chess960()))
- return *it;
+ for (const auto& m : MoveList<LEGAL>(pos))
+ if (str == UCI::move(m, pos.is_chess960()))
+ return m;
return MOVE_NONE;
}
typedef void (*OnChange)(const Option&);
public:
- Option(OnChange = NULL);
- Option(bool v, OnChange = NULL);
- Option(const char* v, OnChange = NULL);
- Option(int v, int min, int max, OnChange = NULL);
+ Option(OnChange = nullptr);
+ Option(bool v, OnChange = nullptr);
+ Option(const char* v, OnChange = nullptr);
+ Option(int v, int min, int max, OnChange = nullptr);
Option& operator=(const std::string&);
void operator<<(const Option&);
std::string value(Value v);
std::string square(Square s);
std::string move(Move m, bool chess960);
+std::string pv(const Position& pos, Depth depth, Value alpha, Value beta);
Move to_move(const Position& pos, std::string& str);
} // namespace UCI
#include <algorithm>
#include <cassert>
-#include <cstdlib>
#include <sstream>
#include "misc.h"
/// Our case insensitive less() function as required by UCI protocol
-bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
-
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
+ [](char c1, char c2) { return tolower(c1) < tolower(c2); });
}
std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
for (size_t idx = 0; idx < om.size(); ++idx)
- for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it)
- if (it->second.idx == idx)
+ for (const auto& it : om)
+ if (it.second.idx == idx)
{
- const Option& o = it->second;
- os << "\noption name " << it->first << " type " << o.type;
+ const Option& o = it.second;
+ os << "\noption name " << it.first << " type " << o.type;
if (o.type != "button")
os << " default " << o.defaultValue;
break;
}
+
return os;
}
{}
Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
-{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
-
+{ defaultValue = currentValue = std::to_string(v); }
Option::operator int() const {
assert(type == "check" || type == "spin");
- return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+ return (type == "spin" ? stoi(currentValue) : currentValue == "true");
}
Option::operator std::string() const {
if ( (type != "button" && v.empty())
|| (type == "check" && v != "true" && v != "false")
- || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+ || (type == "spin" && (stoi(v) < min || stoi(v) > max)))
return *this;
if (type != "button")
projects / stockfish / commitdiff