X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Ftt.h;h=5ca5c237d82f7ec38974b56944b267c5c688a76b;hb=a617b038759f6abd1b33f71ef6d1938fa3588c3d;hp=c8f7d548fbda4a663fec02014fba347cf2d79ab6;hpb=226bd540642a5f091a80e4b01ea4d4c160558a22;p=stockfish
diff --git a/src/tt.h b/src/tt.h
index c8f7d548..5ca5c237 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -17,87 +17,122 @@
along with this program. If not, see .
*/
-
#if !defined(TT_H_INCLUDED)
#define TT_H_INCLUDED
-////
-//// Includes
-////
+#include
+
+#include "move.h"
+#include "types.h"
+
+/// A simple fixed size hash table used to store pawns and material
+/// configurations. It is basically just an array of Entry objects.
+/// Without cluster concept or overwrite policy.
-#include "depth.h"
-#include "position.h"
-#include "value.h"
+template
+class SimpleHash {
+
+ SimpleHash(const SimpleHash&);
+ SimpleHash& operator=(const SimpleHash&);
+
+public:
+ SimpleHash() {
+ entries = new (std::nothrow) Entry[HashSize];
+ if (!entries)
+ {
+ std::cerr << "Failed to allocate " << HashSize * sizeof(Entry)
+ << " bytes for material hash table." << std::endl;
+ exit(EXIT_FAILURE);
+ }
+ memset(entries, 0, HashSize * sizeof(Entry));
+ }
+
+ virtual ~SimpleHash() { delete [] entries; }
+
+ Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
+
+protected:
+ Entry* entries;
+};
-////
-//// Types
-////
/// The TTEntry class is the class of transposition table entries
///
-/// A TTEntry needs 96 bits to be stored
+/// A TTEntry needs 128 bits to be stored
///
/// bit 0-31: key
/// bit 32-63: data
/// bit 64-79: value
/// bit 80-95: depth
+/// bit 96-111: static value
+/// bit 112-127: margin of static value
///
/// the 32 bits of the data field are so defined
///
-/// bit 0-16: move
-/// bit 17-19: not used
-/// bit 20-22: value type
+/// bit 0-15: move
+/// bit 16-20: not used
+/// bit 21-22: value type
/// bit 23-31: generation
class TTEntry {
public:
- TTEntry() {}
- TTEntry(uint32_t k, Value v, ValueType t, Depth d, Move m, int generation,
- Value statV, Value kingD)
- : key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
- value_(int16_t(v)), depth_(int16_t(d)),
- staticValue_(int16_t(statV)), kingDanger_(int16_t(kingD)) {}
-
- uint32_t key() const { return key_; }
- Depth depth() const { return Depth(depth_); }
- Move move() const { return Move(data & 0x1FFFF); }
- Value value() const { return Value(value_); }
- ValueType type() const { return ValueType((data >> 20) & 7); }
- int generation() const { return (data >> 23); }
- Value static_value() const { return Value(staticValue_); }
- Value king_danger() const { return Value(kingDanger_); }
+ void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value statM) {
+
+ key32 = (uint32_t)k;
+ move16 = (uint16_t)m;
+ valueType = (uint8_t)t;
+ generation8 = (uint8_t)g;
+ value16 = (int16_t)v;
+ depth16 = (int16_t)d;
+ staticValue = (int16_t)statV;
+ staticMargin = (int16_t)statM;
+ }
+ void set_generation(int g) { generation8 = (uint8_t)g; }
+
+ uint32_t key() const { return key32; }
+ Depth depth() const { return Depth(depth16); }
+ Move move() const { return Move(move16); }
+ Value value() const { return Value(value16); }
+ ValueType type() const { return ValueType(valueType); }
+ int generation() const { return generation8; }
+ Value static_value() const { return Value(staticValue); }
+ Value static_value_margin() const { return Value(staticMargin); }
private:
- uint32_t key_;
- uint32_t data;
- int16_t value_;
- int16_t depth_;
- int16_t staticValue_;
- int16_t kingDanger_;
+ uint32_t key32;
+ uint16_t move16;
+ uint8_t valueType;
+ uint8_t generation8;
+ int16_t value16;
+ int16_t depth16;
+ int16_t staticValue;
+ int16_t staticMargin;
};
-/// This is the number of TTEntry slots for each position
+/// This is the number of TTEntry slots for each cluster
const int ClusterSize = 4;
-/// Each group of ClusterSize number of TTEntry form a TTCluster
-/// that is indexed by a single position key. Cluster is padded
-/// to a cache line size so to guarantee always aligned accesses.
+/// TTCluster consists of ClusterSize number of TTEntries.
+/// Size of TTCluster 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];
- char cache_line_padding[64 - sizeof(TTEntry[ClusterSize])];
};
/// The transposition table class. This is basically just a huge array
-/// containing TTEntry objects, and a few methods for writing new entries
+/// containing TTCluster objects, and a few methods for writing new entries
/// and reading new ones.
class TranspositionTable {
+ TranspositionTable(const TranspositionTable&);
+ TranspositionTable& operator=(const TranspositionTable&);
+
public:
TranspositionTable();
~TranspositionTable();
@@ -105,26 +140,35 @@ public:
void clear();
void store(const Key posKey, Value v, ValueType type, Depth d, Move m, Value statV, Value kingD);
TTEntry* retrieve(const Key posKey) const;
- void prefetch(const Key posKey) const;
void new_search();
- void insert_pv(const Position& pos, Move pv[]);
- void extract_pv(const Position& pos, Move pv[], const int PLY_MAX);
- int full() const;
+ TTEntry* first_entry(const Key posKey) const;
+ void refresh(const TTEntry* tte) const;
private:
- inline TTEntry* first_entry(const Key posKey) const;
-
- // Be sure 'writes' is at least one cache line away
- // from read only variables.
- unsigned char pad_before[64 - sizeof(unsigned)];
- unsigned writes; // heavy SMP read/write access here
- unsigned char pad_after[64];
-
size_t size;
TTCluster* entries;
- uint8_t generation;
+ uint8_t generation; // To properly compare, size must be smaller then TT stored value
};
extern TranspositionTable TT;
+
+/// TranspositionTable::first_entry returns a pointer to the first
+/// entry of a cluster given a position. The lowest order bits of the key
+/// are used to get the index of the cluster.
+
+inline TTEntry* TranspositionTable::first_entry(const Key posKey) const {
+
+ return entries[((uint32_t)posKey) & (size - 1)].data;
+}
+
+
+/// TranspositionTable::refresh updates the 'generation' value of the TTEntry
+/// to avoid aging. Normally called after a TT hit, before to return.
+
+inline void TranspositionTable::refresh(const TTEntry* tte) const {
+
+ const_cast(tte)->set_generation(generation);
+}
+
#endif // !defined(TT_H_INCLUDED)