X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=1caa277e821ac0463110fe0df6487b74f7e20f79;hp=1c32ddc1872211e0150987d079942d8fef5bf3be;hb=481eda4ca0121cfa16f5a29f364ca30ee2852409;hpb=6f6f59ea6a066eac291eac5ad0369cd2e0daf739
diff --git a/src/tt.h b/src/tt.h
index 1c32ddc1..1caa277e 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,24 +17,13 @@
along with this program. If not, see .
*/
-
#if !defined(TT_H_INCLUDED)
#define TT_H_INCLUDED
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "position.h"
-#include "value.h"
-
-
-////
-//// Types
-////
+#include "misc.h"
+#include "types.h"
-/// The TTEntry class is the class of transposition table entries
+/// The TTEntry is the class of transposition table entries
///
/// A TTEntry needs 128 bits to be stored
///
@@ -43,92 +32,95 @@
/// bit 64-79: value
/// bit 80-95: depth
/// bit 96-111: static value
-/// bit 112-127: king danger 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:
- void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value kd) {
-
- key32 = k;
- data = (m & 0x1FFFF) | (t << 20) | (g << 23);
- value16 = int16_t(v);
- depth16 = int16_t(d);
- staticValue = int16_t(statV);
- kingDanger = int16_t(kd);
+ void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev, Value em) {
+
+ key32 = (uint32_t)k;
+ move16 = (uint16_t)m;
+ bound = (uint8_t)b;
+ generation8 = (uint8_t)g;
+ value16 = (int16_t)v;
+ depth16 = (int16_t)d;
+ evalValue = (int16_t)ev;
+ evalMargin = (int16_t)em;
}
+ 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(data & 0x1FFFF); }
- Value value() const { return Value(value16); }
- 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); }
+ uint32_t key() const { return key32; }
+ Depth depth() const { return (Depth)depth16; }
+ Move move() const { return (Move)move16; }
+ Value value() const { return (Value)value16; }
+ Bound type() const { return (Bound)bound; }
+ int generation() const { return (int)generation8; }
+ Value eval_value() const { return (Value)evalValue; }
+ Value eval_margin() const { return (Value)evalMargin; }
private:
uint32_t key32;
- uint32_t data;
- int16_t value16;
- int16_t depth16;
- int16_t staticValue;
- int16_t kingDanger;
-};
-
-
-/// This is the number of TTEntry slots for each position
-const int ClusterSize = 4;
-
-/// Each group of ClusterSize number of TTEntry form a TTCluster
-/// that is indexed by a single position key. TTCluster size must
-/// be not bigger then a cache line size, in case it is less then
-/// it should be padded to guarantee always aligned accesses.
-
-struct TTCluster {
- TTEntry data[ClusterSize];
+ uint16_t move16;
+ uint8_t bound, generation8;
+ int16_t value16, depth16, evalValue, evalMargin;
};
-/// The transposition table class. This is basically just a huge array
-/// containing TTEntry objects, and a few methods for writing new entries
-/// and reading new ones.
+/// A TranspositionTable consists of a power of 2 number of clusters and each
+/// 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
+/// guarantee always aligned accesses.
class TranspositionTable {
+ static const unsigned ClusterSize = 4; // A cluster is 64 Bytes
+
public:
- TranspositionTable();
- ~TranspositionTable();
+ ~TranspositionTable() { free(mem); }
+ 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 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 new_search();
- TTEntry* first_entry(const Key posKey) const;
+ void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV, Value kingD);
private:
- size_t size;
- TTCluster* entries;
- uint8_t generation;
+ uint32_t hashMask;
+ TTEntry* table;
+ void* mem;
+ uint8_t generation; // Size must be not bigger then TTEntry::generation8
};
extern TranspositionTable TT;
-/// TranspositionTable::first_entry returns a pointer to the first
-/// entry of a cluster given a position. The low 32 bits of the key
-/// are used to get the index in the table.
+/// 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 key) const {
+
+ return table + ((uint32_t)key & hashMask);
+}
+
+
+/// TranspositionTable::refresh() updates the 'generation' value of the TTEntry
+/// to avoid aging. Normally called after a TT hit.
-inline TTEntry* TranspositionTable::first_entry(const Key posKey) const {
+inline void TranspositionTable::refresh(const TTEntry* tte) const {
- return entries[uint32_t(posKey) & (size - 1)].data;
+ const_cast(tte)->set_generation(generation);
}
#endif // !defined(TT_H_INCLUDED)