// Apart for the first one that has its score, following moves
// normally have score -VALUE_INFINITE, so are ordered according
// to the number of beta cutoffs occurred under their subtree during
- // the last iteration.
+ // the last iteration. The counters are per thread variables to avoid
+ // concurrent accessing under SMP case.
struct BetaCounterType {
void clear();
void add(Color us, Depth d, int threadID);
void read(Color us, int64_t& our, int64_t& their);
-
- int64_t hits[THREAD_MAX][2];
};
History H; // Should be made local?
-// The empty search stack
-SearchStack EmptySearchStack;
-
// SearchStack::init() initializes a search stack. Used at the beginning of a
// new search from the root.
// Wait until the thread has finished launching:
while (!Threads[i].running);
}
-
- // Init also the empty search stack
- EmptySearchStack.init(0);
- EmptySearchStack.initKillers();
}
// Initialize a MovePicker object for the current position, and prepare
// to search all moves
- MovePicker mp = MovePicker(pos, true, ttMove, ss[ply], depth);
+ MovePicker mp = MovePicker(pos, true, ttMove, depth, &ss[ply]);
Move move, movesSearched[256];
int moveCount = 0;
// Initialize a MovePicker object for the current position, and prepare
// to search all moves:
- MovePicker mp = MovePicker(pos, false, ttMove, ss[ply], depth);
+ MovePicker mp = MovePicker(pos, false, ttMove, depth, &ss[ply]);
Move move, movesSearched[256];
int moveCount = 0;
// Initialize a MovePicker object for the current position, and prepare
// to search the moves. Because the depth is <= 0 here, only captures,
// queen promotions and checks (only if depth == 0) will be generated.
- MovePicker mp = MovePicker(pos, pvNode, ttMove, EmptySearchStack, depth);
+ MovePicker mp = MovePicker(pos, pvNode, ttMove, depth);
Move move;
int moveCount = 0;
Bitboard dcCandidates = mp.discovered_check_candidates();
void BetaCounterType::clear() {
for (int i = 0; i < THREAD_MAX; i++)
- hits[i][WHITE] = hits[i][BLACK] = 0ULL;
+ Threads[i].betaCutOffs[WHITE] = Threads[i].betaCutOffs[BLACK] = 0ULL;
}
void BetaCounterType::add(Color us, Depth d, int threadID) {
// Weighted count based on depth
- hits[threadID][us] += int(d);
+ Threads[threadID].betaCutOffs[us] += unsigned(d);
}
void BetaCounterType::read(Color us, int64_t& our, int64_t& their) {
our = their = 0UL;
for (int i = 0; i < THREAD_MAX; i++)
{
- our += hits[i][us];
- their += hits[i][opposite_color(us)];
+ our += Threads[i].betaCutOffs[us];
+ their += Threads[i].betaCutOffs[opposite_color(us)];
}
}
return false;
// Case 4: Don't prune moves with good history.
- if (!H.ok_to_prune(pos.piece_on(move_from(m)), m, d))
+ if (!H.ok_to_prune(pos.piece_on(mfrom), mto, d))
return false;
// Case 5: If the moving piece in the threatened move is a slider, don't
void update_history(const Position& pos, Move m, Depth depth,
Move movesSearched[], int moveCount) {
- H.success(pos.piece_on(move_from(m)), m, depth);
+ H.success(pos.piece_on(move_from(m)), move_to(m), depth);
for (int i = 0; i < moveCount - 1; i++)
{
assert(m != movesSearched[i]);
if (ok_to_history(pos, movesSearched[i]))
- H.failure(pos.piece_on(move_from(movesSearched[i])), movesSearched[i]);
+ H.failure(pos.piece_on(move_from(movesSearched[i])), move_to(movesSearched[i]));
}
}