kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Code style cleanup in transposition table code

Browse source 
Assorted fixes but no functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-04-27 13:21:49 +01:00
parent 2550c6383b
commit 2f2e48fad2
3 changed files with 73 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/search.cpp
View file

@ -315,7 +315,7 @@ namespace {
//// ////
// The main transposition table // The main transposition table
TranspositionTable TT = TranspositionTable(TTDefaultSize); TranspositionTable TT;
// Number of active threads: // Number of active threads:
@ -1191,7 +1191,7 @@ namespace {
return bestValue; return bestValue;
if (bestValue <= oldAlpha) if (bestValue <= oldAlpha)
TT.store(pos, value_to_tt(bestValue, ply), depth, MOVE_NONE, VALUE_TYPE_UPPER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, depth, MOVE_NONE);
else if (bestValue >= beta) else if (bestValue >= beta)
{ {
@ -1202,10 +1202,10 @@ namespace {
update_history(pos, m, depth, movesSearched, moveCount); update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]); update_killers(m, ss[ply]);
} }
TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
} }
else else
TT.store(pos, value_to_tt(bestValue, ply), depth, ss[ply].pv[ply], VALUE_TYPE_EXACT); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, depth, ss[ply].pv[ply]);
return bestValue; return bestValue;
} }
@ -1455,7 +1455,7 @@ namespace {
return bestValue; return bestValue;
if (bestValue < beta) if (bestValue < beta)
TT.store(pos, value_to_tt(bestValue, ply), depth, MOVE_NONE, VALUE_TYPE_UPPER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, depth, MOVE_NONE);
else else
{ {
BetaCounter.add(pos.side_to_move(), depth, threadID); BetaCounter.add(pos.side_to_move(), depth, threadID);
@ -1465,7 +1465,7 @@ namespace {
update_history(pos, m, depth, movesSearched, moveCount); update_history(pos, m, depth, movesSearched, moveCount);
update_killers(m, ss[ply]); update_killers(m, ss[ply]);
} }
TT.store(pos, value_to_tt(bestValue, ply), depth, m, VALUE_TYPE_LOWER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, m);
} }
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
@ -1544,7 +1544,7 @@ namespace {
{ {
// Store the score to avoid a future costly evaluation() call // Store the score to avoid a future costly evaluation() call
if (!isCheck && !tte && ei.futilityMargin == 0) if (!isCheck && !tte && ei.futilityMargin == 0)
TT.store(pos, value_to_tt(bestValue, ply), Depth(-127*OnePly), MOVE_NONE, VALUE_TYPE_EVAL); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_EVAL, Depth(-127*OnePly), MOVE_NONE);
return bestValue; return bestValue;
} }
@ -1637,9 +1637,9 @@ namespace {
{ {
Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1)); Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1));
if (bestValue < beta) if (bestValue < beta)
TT.store(pos, value_to_tt(bestValue, ply), d, MOVE_NONE, VALUE_TYPE_UPPER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, d, MOVE_NONE);
else else
TT.store(pos, value_to_tt(bestValue, ply), d, m, VALUE_TYPE_LOWER); TT.store(pos, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, d, m);
} }
// Update killers only for good check moves // Update killers only for good check moves

124
src/tt.cpp
View file

@ -33,20 +33,13 @@
//// Functions //// Functions
//// ////
/// Constructor TranspositionTable::TranspositionTable() {
TranspositionTable::TranspositionTable(unsigned mbSize) { size = writes = 0;
size = 0;
generation = 0;
writes = 0;
entries = 0; entries = 0;
set_size(mbSize); generation = 0;
} }
/// Destructor
TranspositionTable::~TranspositionTable() { TranspositionTable::~TranspositionTable() {
delete [] entries; delete [] entries;
@ -64,27 +57,27 @@ void TranspositionTable::set_size(unsigned mbSize) {
// We store a cluster of 4 TTEntry for each position and newSize is // We store a cluster of 4 TTEntry for each position and newSize is
// the maximum number of storable positions // the maximum number of storable positions
for ( ; newSize * 4 * (sizeof(TTEntry)) <= (mbSize << 20); newSize *= 2); while ((2 * newSize) * 4 * (sizeof(TTEntry)) <= (mbSize << 20))
newSize /= 2; newSize *= 2;
if (newSize != size) if (newSize != size)
{ {
size = newSize; size = newSize;
delete [] entries; delete [] entries;
entries = new TTEntry[size * 4]; entries = new TTEntry[size * 4];
if (!entries) if (!entries)
{ {
std::cerr << "Failed to allocate " << mbSize std::cerr << "Failed to allocate " << mbSize
<< " MB for transposition table." << " MB for transposition table." << std::endl;
<< std::endl; exit(EXIT_FAILURE);
exit(EXIT_FAILURE); }
} clear();
clear();
} }
} }
/// TranspositionTable::clear overwrites the entire transposition table /// TranspositionTable::clear overwrites the entire transposition table
/// with zeroes. It is called whenever the table is resized, or when the /// with zeroes. It is called whenever the table is resized, or when the
/// user asks the program to clear the table (from the UCI interface). /// user asks the program to clear the table (from the UCI interface).
/// Perhaps we should also clear it when the "ucinewgame" command is recieved? /// Perhaps we should also clear it when the "ucinewgame" command is recieved?
@ -96,45 +89,44 @@ void TranspositionTable::clear() {
/// TranspositionTable::store writes a new entry containing a position, /// TranspositionTable::store writes a new entry containing a position,
/// a value, a value type, a search depth, and a best move to the /// a value, a value type, a search depth, and a best move to the
/// transposition table. The transposition table is organized in clusters /// transposition table. Transposition table is organized in clusters of
/// of four TTEntry objects, and when a new entry is written, it replaces /// four TTEntry objects, and when a new entry is written, it replaces
/// the least valuable of the four entries in a cluster. A TTEntry t1 is /// the least valuable of the four entries in a cluster. A TTEntry t1 is
/// considered to be more valuable than a TTEntry t2 if t1 is from the /// considered to be more valuable than a TTEntry t2 if t1 is from the
/// current search and t2 is from a previous search, or if the depth of t1 /// current search and t2 is from a previous search, or if the depth of t1
/// is bigger than the depth of t2. A TTEntry of type VALUE_TYPE_EVAL /// is bigger than the depth of t2. A TTEntry of type VALUE_TYPE_EVAL
/// never replaces another entry for the same position. /// never replaces another entry for the same position.
void TranspositionTable::store(const Position &pos, Value v, Depth d, void TranspositionTable::store(const Position& p, Value v, ValueType t, Depth d, Move m) {
Move m, ValueType type) {
TTEntry *tte, *replace; TTEntry *tte, *replace;
tte = replace = first_entry(pos); tte = replace = first_entry(p);
for (int i = 0; i < 4; i++, tte++) for (int i = 0; i < 4; i++, tte++)
{ {
if (!tte->key() || tte->key() == pos.get_key()) // empty or overwrite old if (!tte->key() || tte->key() == p.get_key()) // empty or overwrite old
{ {
// Do not overwrite position entry when VALUE_TYPE_EVAL // Do not overwrite when new type is VALUE_TYPE_EVAL
if ( tte->key() if (tte->key() && t == VALUE_TYPE_EVAL)
&& type == VALUE_TYPE_EVAL) return;
return;
if (m == MOVE_NONE) if (m == MOVE_NONE)
m = tte->move(); m = tte->move();
*tte = TTEntry(pos.get_key(), v, type, d, m, generation); *tte = TTEntry(p.get_key(), v, t, d, m, generation);
return; return;
} }
else if (i == 0) // replace would be a no-op in this common case else if (i == 0) // replace would be a no-op in this common case
continue; continue;
int c1 = (replace->generation() == generation ? 2 : 0); int c1 = (replace->generation() == generation ? 2 : 0);
int c2 = (tte->generation() == generation ? -2 : 0); int c2 = (tte->generation() == generation ? -2 : 0);
int c3 = (tte->depth() < replace->depth() ? 1 : 0); int c3 = (tte->depth() < replace->depth() ? 1 : 0);
if (c1 + c2 + c3 > 0) if (c1 + c2 + c3 > 0)
replace = tte; replace = tte;
} }
*replace = TTEntry(pos.get_key(), v, type, d, m, generation); *replace = TTEntry(p.get_key(), v, t, d, m, generation);
writes++; writes++;
} }
@ -143,15 +135,14 @@ void TranspositionTable::store(const Position &pos, Value v, Depth d,
/// transposition table. Returns a pointer to the TTEntry or NULL /// transposition table. Returns a pointer to the TTEntry or NULL
/// if position is not found. /// if position is not found.
TTEntry* TranspositionTable::retrieve(const Position &pos) const { TTEntry* TranspositionTable::retrieve(const Position& pos) const {
TTEntry *tte = first_entry(pos); TTEntry *tte = first_entry(pos);
for (int i = 0; i < 4; i++, tte++) for (int i = 0; i < 4; i++, tte++)
{
if (tte->key() == pos.get_key()) if (tte->key() == pos.get_key())
return tte; return tte;
}
return NULL; return NULL;
} }
@ -159,13 +150,13 @@ TTEntry* TranspositionTable::retrieve(const Position &pos) const {
/// TranspositionTable::first_entry returns a pointer to the first /// TranspositionTable::first_entry returns a pointer to the first
/// entry of a cluster given a position. /// entry of a cluster given a position.
inline TTEntry* TranspositionTable::first_entry(const Position &pos) const { inline TTEntry* TranspositionTable::first_entry(const Position& pos) const {
return entries + (int(pos.get_key() & (size - 1)) << 2); return entries + (int(pos.get_key() & (size - 1)) << 2);
} }
/// TranspositionTable::new_search() is called at the beginning of every new /// TranspositionTable::new_search() is called at the beginning of every new
/// search. It increments the "generation" variable, which is used to /// search. It increments the "generation" variable, which is used to
/// distinguish transposition table entries from previous searches from /// distinguish transposition table entries from previous searches from
/// entries from the current search. /// entries from the current search.
@ -177,19 +168,19 @@ void TranspositionTable::new_search() {
/// TranspositionTable::insert_pv() is called at the end of a search /// TranspositionTable::insert_pv() is called at the end of a search
/// iteration, and inserts the PV back into the PV. This makes sure the /// iteration, and inserts the PV back into the PV. This makes sure
/// old PV moves are searched first, even if the old TT entries have been /// the old PV moves are searched first, even if the old TT entries
/// overwritten. /// have been overwritten.
void TranspositionTable::insert_pv(const Position &pos, Move pv[]) { void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
StateInfo st; StateInfo st;
Position p(pos); Position p(pos);
for (int i = 0; pv[i] != MOVE_NONE; i++) for (int i = 0; pv[i] != MOVE_NONE; i++)
{ {
store(p, VALUE_NONE, Depth(-127*OnePly), pv[i], VALUE_TYPE_NONE); store(p, VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i]);
p.do_move(pv[i], st); p.do_move(pv[i], st);
} }
} }
@ -198,19 +189,8 @@ void TranspositionTable::insert_pv(const Position &pos, Move pv[]) {
/// entries which have received at least one write during the current search. /// entries which have received at least one write during the current search.
/// It is used to display the "info hashfull ..." information in UCI. /// It is used to display the "info hashfull ..." information in UCI.
int TranspositionTable::full() { int TranspositionTable::full() const {
double N = double(size) * 4.0; double N = double(size) * 4.0;
return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N)))); return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N))));
} }
/// Constructors
TTEntry::TTEntry() {
}
TTEntry::TTEntry(Key k, Value v, ValueType t, Depth d, Move m,
int generation) :
key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
value_(int16_t(v)), depth_(int16_t(d)) {}

31
src/tt.h
View file

@ -53,8 +53,11 @@
class TTEntry { class TTEntry {
public: public:
TTEntry(); TTEntry() {}
TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation); TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation)
: key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
value_(int16_t(v)), depth_(int16_t(d)) {}
Key key() const { return key_; } Key key() const { return key_; }
Depth depth() const { return Depth(depth_); } Depth depth() const { return Depth(depth_); }
Move move() const { return Move(data & 0x1FFFF); } Move move() const { return Move(data & 0x1FFFF); }
@ -76,32 +79,22 @@ private:
class TranspositionTable { class TranspositionTable {
public: public:
TranspositionTable(unsigned mbSize); TranspositionTable();
~TranspositionTable(); ~TranspositionTable();
void set_size(unsigned mbSize); void set_size(unsigned mbSize);
void clear(); void clear();
void store(const Position &pos, Value v, Depth d, Move m, ValueType type); void store(const Position& pos, Value v, ValueType type, Depth d, Move m);
TTEntry* retrieve(const Position &pos) const; TTEntry* retrieve(const Position& pos) const;
void new_search(); void new_search();
void insert_pv(const Position &pos, Move pv[]); void insert_pv(const Position& pos, Move pv[]);
int full(); int full() const;
private: private:
inline TTEntry* first_entry(const Position &pos) const; inline TTEntry* first_entry(const Position& pos) const;
unsigned size; unsigned size, writes;
int writes;
TTEntry* entries; TTEntry* entries;
uint8_t generation; uint8_t generation;
}; };
////
//// Constants and variables
////
// Default transposition table size, in megabytes:
const int TTDefaultSize = 32;
#endif // !defined(TT_H_INCLUDED) #endif // !defined(TT_H_INCLUDED)