kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Retire TTCluster and simplify TT

Browse source 
Also some renaming while there.

No functional change.
This commit is contained in:
Marco Costalba 2013-02-09 08:17:03 +01:00
parent 3f44be9baa
commit fe3352665b
3 changed files with 38 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/search.cpp
View file

@ -594,8 +594,8 @@ namespace {
else if (tte) else if (tte)
{ {
// Never assume anything on values stored in TT // Never assume anything on values stored in TT
if ( (ss->staticEval = eval = tte->static_value()) == VALUE_NONE if ( (ss->staticEval = eval = tte->eval_value()) == VALUE_NONE
||(ss->evalMargin = tte->static_value_margin()) == VALUE_NONE) ||(ss->evalMargin = tte->eval_margin()) == VALUE_NONE)
eval = ss->staticEval = evaluate(pos, ss->evalMargin); eval = ss->staticEval = evaluate(pos, ss->evalMargin);
// Can ttValue be used as a better position evaluation? // Can ttValue be used as a better position evaluation?
@ -1164,8 +1164,8 @@ split_point_start: // At split points actual search starts from here
if (tte) if (tte)
{ {
// Never assume anything on values stored in TT // Never assume anything on values stored in TT
if ( (ss->staticEval = bestValue = tte->static_value()) == VALUE_NONE if ( (ss->staticEval = bestValue = tte->eval_value()) == VALUE_NONE
||(ss->evalMargin = tte->static_value_margin()) == VALUE_NONE) ||(ss->evalMargin = tte->eval_margin()) == VALUE_NONE)
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin); ss->staticEval = bestValue = evaluate(pos, ss->evalMargin);
} }
else else

36
src/tt.cpp
View file

@ -25,33 +25,21 @@
TranspositionTable TT; // Our global transposition table TranspositionTable TT; // Our global transposition table
TranspositionTable::TranspositionTable() {
size = generation = 0;
entries = NULL;
}
TranspositionTable::~TranspositionTable() {
delete [] entries;
}
/// TranspositionTable::set_size() sets the size of the transposition table, /// TranspositionTable::set_size() sets the size of the transposition table,
/// measured in megabytes. Transposition table consists of a power of 2 number of /// measured in megabytes. Transposition table consists of a power of 2 number
/// TTCluster and each cluster consists of ClusterSize number of TTEntries. Each /// of clusters and each cluster consists of ClusterSize number of TTEntry.
/// non-empty entry contains information of exactly one position.
void TranspositionTable::set_size(size_t mbSize) { void TranspositionTable::set_size(size_t mbSize) {
size_t newSize = 1ULL << msb((mbSize << 20) / sizeof(TTCluster)); size_t newSize = 1ULL << msb((mbSize << 20) / sizeof(TTEntry[ClusterSize]));
if (newSize == size) if (newSize == size)
return; return;
size = newSize; size = newSize;
delete [] entries; delete [] entries;
entries = new (std::nothrow) TTCluster[size]; entries = new (std::nothrow) TTEntry[size * ClusterSize];
if (!entries) if (!entries)
{ {
@ -70,7 +58,7 @@ void TranspositionTable::set_size(size_t mbSize) {
void TranspositionTable::clear() { void TranspositionTable::clear() {
memset(entries, 0, size * sizeof(TTCluster)); memset(entries, 0, size * sizeof(TTEntry[ClusterSize]));
} }
@ -90,7 +78,7 @@ void TranspositionTable::store(const Key key, Value v, Bound t, Depth d, Move m,
tte = replace = first_entry(key); tte = replace = first_entry(key);
for (int i = 0; i < ClusterSize; i++, tte++) for (unsigned i = 0; i < ClusterSize; i++, tte++)
{ {
if (!tte->key() || tte->key() == key32) // Empty or overwrite old if (!tte->key() || tte->key() == key32) // Empty or overwrite old
{ {
@ -123,19 +111,9 @@ TTEntry* TranspositionTable::probe(const Key key) const {
TTEntry* tte = first_entry(key); TTEntry* tte = first_entry(key);
uint32_t key32 = key >> 32; uint32_t key32 = key >> 32;
for (int i = 0; i < ClusterSize; i++, tte++) for (unsigned i = 0; i < ClusterSize; i++, tte++)
if (tte->key() == key32) if (tte->key() == key32)
return tte; return tte;
return NULL; return NULL;
} }
/// TranspositionTable::new_search() is called at the beginning of every new
/// search. It increments the "generation" variable, which is used to
/// distinguish transposition table entries from previous searches from
/// entries from the current search.
void TranspositionTable::new_search() {
generation++;
}

65
src/tt.h
View file

@ -44,7 +44,7 @@
class TTEntry { class TTEntry {
public: public:
void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value statV, Value statM) { void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev, Value em) {
key32 = (uint32_t)k; key32 = (uint32_t)k;
move16 = (uint16_t)m; move16 = (uint16_t)m;
@ -52,63 +52,52 @@ public:
generation8 = (uint8_t)g; generation8 = (uint8_t)g;
value16 = (int16_t)v; value16 = (int16_t)v;
depth16 = (int16_t)d; depth16 = (int16_t)d;
staticValue = (int16_t)statV; evalValue = (int16_t)ev;
staticMargin = (int16_t)statM; evalMargin = (int16_t)em;
} }
void set_generation(int g) { generation8 = (uint8_t)g; } void set_generation(int g) { generation8 = (uint8_t)g; }
uint32_t key() const { return key32; } uint32_t key() const { return key32; }
Depth depth() const { return (Depth)depth16; } Depth depth() const { return (Depth)depth16; }
Move move() const { return (Move)move16; } Move move() const { return (Move)move16; }
Value value() const { return (Value)value16; } Value value() const { return (Value)value16; }
Bound type() const { return (Bound)bound; } Bound type() const { return (Bound)bound; }
int generation() const { return (int)generation8; } int generation() const { return (int)generation8; }
Value static_value() const { return (Value)staticValue; } Value eval_value() const { return (Value)evalValue; }
Value static_value_margin() const { return (Value)staticMargin; } Value eval_margin() const { return (Value)evalMargin; }
private: private:
uint32_t key32; uint32_t key32;
uint16_t move16; uint16_t move16;
uint8_t bound, generation8; uint8_t bound, generation8;
int16_t value16, depth16, staticValue, staticMargin; int16_t value16, depth16, evalValue, evalMargin;
}; };
/// This is the number of TTEntry slots for each cluster /// A TranspositionTable consists of a power of 2 number of clusters and each
const int ClusterSize = 4; /// cluster consists of ClusterSize number of TTEntry. Each non-empty entry
/// contains information of exactly one position. Size of a cluster shall not be
/// bigger than a cache line size. In case it is less, it should be padded to
/// TTCluster consists of ClusterSize number of TTEntries. Size of TTCluster /// guarantee always aligned accesses.
/// must not be bigger than a cache line size. In case it is less, it should
/// be padded to guarantee always aligned accesses.
struct TTCluster {
TTEntry data[ClusterSize];
};
/// The transposition table class. This is basically just a huge array containing
/// TTCluster objects, and a few methods for writing and reading entries.
class TranspositionTable { class TranspositionTable {
TranspositionTable(const TranspositionTable&); static const unsigned ClusterSize = 4; // A cluster is 64 Bytes
TranspositionTable& operator=(const TranspositionTable&);
public: public:
TranspositionTable(); ~TranspositionTable() { delete [] entries; }
~TranspositionTable(); void new_search() { generation++; }
TTEntry* probe(const Key key) const;
TTEntry* first_entry(const Key key) const;
void refresh(const TTEntry* tte) const;
void set_size(size_t mbSize); void set_size(size_t mbSize);
void clear(); void clear();
void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV, Value kingD); void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV, Value kingD);
TTEntry* probe(const Key key) const;
void new_search();
TTEntry* first_entry(const Key posKey) const;
void refresh(const TTEntry* tte) const;
private: private:
size_t size; size_t size;
TTCluster* entries; TTEntry* entries;
uint8_t generation; // Size must be not bigger then TTEntry::generation8 uint8_t generation; // Size must be not bigger then TTEntry::generation8
}; };
@ -119,9 +108,9 @@ extern TranspositionTable TT;
/// a cluster given a position. The lowest order bits of the key are used to /// a cluster given a position. The lowest order bits of the key are used to
/// get the index of the cluster. /// get the index of the cluster.
inline TTEntry* TranspositionTable::first_entry(const Key posKey) const { inline TTEntry* TranspositionTable::first_entry(const Key key) const {
return entries[((uint32_t)posKey) & (size - 1)].data; return entries + ((uint32_t)key & (size - 1)) * ClusterSize;
} }