mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 16:53:09 +00:00
Revert per-thread history tables
Testing on Joona QUAD failed to give any advantage. Actually we had a little loss: Mod - Orig: 342.0 - 374.0 No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
d39ddb9077
commit
b45936a8c7
2 changed files with 15 additions and 16 deletions
|
@ -271,6 +271,9 @@ namespace {
|
||||||
int NodesSincePoll;
|
int NodesSincePoll;
|
||||||
int NodesBetweenPolls = 30000;
|
int NodesBetweenPolls = 30000;
|
||||||
|
|
||||||
|
// History table
|
||||||
|
History H;
|
||||||
|
|
||||||
|
|
||||||
/// Functions
|
/// Functions
|
||||||
|
|
||||||
|
@ -289,10 +292,10 @@ namespace {
|
||||||
bool move_is_killer(Move m, const SearchStack& ss);
|
bool move_is_killer(Move m, const SearchStack& ss);
|
||||||
Depth extension(const Position& pos, Move m, bool pvNode, bool capture, bool check, bool singleReply, bool mateThreat, bool* dangerous);
|
Depth extension(const Position& pos, Move m, bool pvNode, bool capture, bool check, bool singleReply, bool mateThreat, bool* dangerous);
|
||||||
bool ok_to_do_nullmove(const Position& pos);
|
bool ok_to_do_nullmove(const Position& pos);
|
||||||
bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d, const History& H);
|
bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d);
|
||||||
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
|
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
|
||||||
bool ok_to_history(const Position& pos, Move m);
|
bool ok_to_history(const Position& pos, Move m);
|
||||||
void update_history(const Position& pos, Move m, Depth depth, History& H, Move movesSearched[], int moveCount);
|
void update_history(const Position& pos, Move m, Depth depth, Move movesSearched[], int moveCount);
|
||||||
void update_killers(Move m, SearchStack& ss);
|
void update_killers(Move m, SearchStack& ss);
|
||||||
|
|
||||||
bool fail_high_ply_1();
|
bool fail_high_ply_1();
|
||||||
|
@ -629,9 +632,7 @@ namespace {
|
||||||
|
|
||||||
// Initialize
|
// Initialize
|
||||||
TT.new_search();
|
TT.new_search();
|
||||||
for (int i = 0; i < THREAD_MAX; i++)
|
H.clear();
|
||||||
Threads[i].H.clear();
|
|
||||||
|
|
||||||
for (int i = 0; i < 3; i++)
|
for (int i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
ss[i].init(i);
|
ss[i].init(i);
|
||||||
|
@ -1043,7 +1044,7 @@ namespace {
|
||||||
|
|
||||||
// Initialize a MovePicker object for the current position, and prepare
|
// Initialize a MovePicker object for the current position, and prepare
|
||||||
// to search all moves
|
// to search all moves
|
||||||
MovePicker mp = MovePicker(pos, ttMove, depth, Threads[threadID].H, &ss[ply]);
|
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
|
||||||
|
|
||||||
Move move, movesSearched[256];
|
Move move, movesSearched[256];
|
||||||
int moveCount = 0;
|
int moveCount = 0;
|
||||||
|
@ -1172,7 +1173,7 @@ namespace {
|
||||||
Move m = ss[ply].pv[ply];
|
Move m = ss[ply].pv[ply];
|
||||||
if (ok_to_history(pos, m)) // Only non capture moves are considered
|
if (ok_to_history(pos, m)) // Only non capture moves are considered
|
||||||
{
|
{
|
||||||
update_history(pos, m, depth, Threads[threadID].H, movesSearched, moveCount);
|
update_history(pos, m, depth, movesSearched, moveCount);
|
||||||
update_killers(m, ss[ply]);
|
update_killers(m, ss[ply]);
|
||||||
}
|
}
|
||||||
TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
|
TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
|
||||||
|
@ -1304,7 +1305,7 @@ namespace {
|
||||||
|
|
||||||
// Initialize a MovePicker object for the current position, and prepare
|
// Initialize a MovePicker object for the current position, and prepare
|
||||||
// to search all moves.
|
// to search all moves.
|
||||||
MovePicker mp = MovePicker(pos, ttMove, depth, Threads[threadID].H, &ss[ply]);
|
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
|
||||||
|
|
||||||
Move move, movesSearched[256];
|
Move move, movesSearched[256];
|
||||||
int moveCount = 0;
|
int moveCount = 0;
|
||||||
|
@ -1341,7 +1342,7 @@ namespace {
|
||||||
{
|
{
|
||||||
// History pruning. See ok_to_prune() definition
|
// History pruning. See ok_to_prune() definition
|
||||||
if ( moveCount >= 2 + int(depth)
|
if ( moveCount >= 2 + int(depth)
|
||||||
&& ok_to_prune(pos, move, ss[ply].threatMove, depth, Threads[threadID].H))
|
&& ok_to_prune(pos, move, ss[ply].threatMove, depth))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Value based pruning
|
// Value based pruning
|
||||||
|
@ -1431,7 +1432,7 @@ namespace {
|
||||||
Move m = ss[ply].pv[ply];
|
Move m = ss[ply].pv[ply];
|
||||||
if (ok_to_history(pos, m)) // Only non capture moves are considered
|
if (ok_to_history(pos, m)) // Only non capture moves are considered
|
||||||
{
|
{
|
||||||
update_history(pos, m, depth, Threads[threadID].H, movesSearched, moveCount);
|
update_history(pos, m, depth, movesSearched, moveCount);
|
||||||
update_killers(m, ss[ply]);
|
update_killers(m, ss[ply]);
|
||||||
}
|
}
|
||||||
TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
|
TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
|
||||||
|
@ -1524,7 +1525,7 @@ namespace {
|
||||||
// Initialize a MovePicker object for the current position, and prepare
|
// Initialize a MovePicker object for the current position, and prepare
|
||||||
// to search the moves. Because the depth is <= 0 here, only captures,
|
// to search the moves. Because the depth is <= 0 here, only captures,
|
||||||
// queen promotions and checks (only if depth == 0) will be generated.
|
// queen promotions and checks (only if depth == 0) will be generated.
|
||||||
MovePicker mp = MovePicker(pos, ttMove, depth, Threads[threadID].H);
|
MovePicker mp = MovePicker(pos, ttMove, depth, H);
|
||||||
Move move;
|
Move move;
|
||||||
int moveCount = 0;
|
int moveCount = 0;
|
||||||
Bitboard dcCandidates = mp.discovered_check_candidates();
|
Bitboard dcCandidates = mp.discovered_check_candidates();
|
||||||
|
@ -1665,7 +1666,7 @@ namespace {
|
||||||
&& !moveIsCapture
|
&& !moveIsCapture
|
||||||
&& !move_is_promotion(move)
|
&& !move_is_promotion(move)
|
||||||
&& moveCount >= 2 + int(sp->depth)
|
&& moveCount >= 2 + int(sp->depth)
|
||||||
&& ok_to_prune(pos, move, ss[sp->ply].threatMove, sp->depth, Threads[threadID].H))
|
&& ok_to_prune(pos, move, ss[sp->ply].threatMove, sp->depth))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Make and search the move.
|
// Make and search the move.
|
||||||
|
@ -2274,7 +2275,7 @@ namespace {
|
||||||
// non-tactical moves late in the move list close to the leaves are
|
// non-tactical moves late in the move list close to the leaves are
|
||||||
// candidates for pruning.
|
// candidates for pruning.
|
||||||
|
|
||||||
bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d, const History& H) {
|
bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d) {
|
||||||
|
|
||||||
assert(move_is_ok(m));
|
assert(move_is_ok(m));
|
||||||
assert(threat == MOVE_NONE || move_is_ok(threat));
|
assert(threat == MOVE_NONE || move_is_ok(threat));
|
||||||
|
@ -2354,7 +2355,7 @@ namespace {
|
||||||
// update_history() registers a good move that produced a beta-cutoff
|
// update_history() registers a good move that produced a beta-cutoff
|
||||||
// in history and marks as failures all the other moves of that ply.
|
// in history and marks as failures all the other moves of that ply.
|
||||||
|
|
||||||
void update_history(const Position& pos, Move m, Depth depth, History& H,
|
void update_history(const Position& pos, Move m, Depth depth,
|
||||||
Move movesSearched[], int moveCount) {
|
Move movesSearched[], int moveCount) {
|
||||||
|
|
||||||
H.success(pos.piece_on(move_from(m)), move_to(m), depth);
|
H.success(pos.piece_on(move_from(m)), move_to(m), depth);
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
//// Includes
|
//// Includes
|
||||||
////
|
////
|
||||||
|
|
||||||
#include "history.h"
|
|
||||||
#include "lock.h"
|
#include "lock.h"
|
||||||
#include "movepick.h"
|
#include "movepick.h"
|
||||||
#include "position.h"
|
#include "position.h"
|
||||||
|
@ -74,7 +73,6 @@ struct Thread {
|
||||||
volatile bool idle;
|
volatile bool idle;
|
||||||
volatile bool workIsWaiting;
|
volatile bool workIsWaiting;
|
||||||
volatile bool printCurrentLine;
|
volatile bool printCurrentLine;
|
||||||
History H;
|
|
||||||
unsigned char pad[64]; // set some distance among local data for each thread
|
unsigned char pad[64]; // set some distance among local data for each thread
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue