X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=534409f32800bfc34110d931cac3bd29e0827cfe;hp=5f34957c95e5e4414ecc8e7490f9ed249815ef53;hb=d9caede3249698440b7579e31d92aaa9984a128b;hpb=2c7ab488a8d49e95b7c129be3dd9122b1785eb09
diff --git a/src/tt.h b/src/tt.h
index 5f34957c..534409f3 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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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,82 +17,86 @@
along with this program. If not, see .
*/
-#if !defined(TT_H_INCLUDED)
+#ifndef TT_H_INCLUDED
#define TT_H_INCLUDED
#include "misc.h"
#include "types.h"
-/// The TTEntry is the 128 bit transposition table entry, defined as below:
+/// The TTEntry is the 10 bytes transposition table entry, defined as below:
///
-/// key: 32 bit
-/// move: 16 bit
-/// bound type: 8 bit
-/// generation: 8 bit
-/// value: 16 bit
-/// depth: 16 bit
-/// static value: 16 bit
-/// static margin: 16 bit
+/// key 16 bit
+/// move 16 bit
+/// value 16 bit
+/// eval value 16 bit
+/// generation 6 bit
+/// bound type 2 bit
+/// depth 8 bit
+
+struct TTEntry {
+
+ Move move() const { return (Move )move16; }
+ Value value() const { return (Value)value16; }
+ Value eval_value() const { return (Value)evalValue; }
+ Depth depth() const { return (Depth)depth8; }
+ Bound bound() const { return (Bound)(genBound8 & 0x3); }
-class TTEntry {
+private:
+ friend class TranspositionTable;
-public:
- 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; }
+ void save(uint16_t k, Value v, Bound b, Depth d, Move m, uint8_t g, Value ev) {
- 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; }
+ key16 = (uint16_t)k;
+ move16 = (uint16_t)m;
+ value16 = (int16_t)v;
+ evalValue = (int16_t)ev;
+ genBound8 = (uint8_t)(g | b);
+ depth8 = (int8_t)d;
+ }
-private:
- uint32_t key32;
+ uint16_t key16;
uint16_t move16;
- uint8_t bound, generation8;
- int16_t value16, depth16, evalValue, evalMargin;
+ int16_t value16;
+ int16_t evalValue;
+ uint8_t genBound8;
+ int8_t depth8;
};
+/// TTCluster is a 32 bytes cluster of TT entries consisting of:
+///
+/// 3 x TTEntry (3 x 10 bytes)
+/// padding (2 bytes)
+
+const unsigned TTClusterSize = 3;
+
+struct TTCluster {
+ TTEntry entry[TTClusterSize];
+ char padding[2];
+};
/// 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.
+/// cluster consists of TTClusterSize number of TTEntry. Each non-empty entry
+/// contains information of exactly one position. The size of a cluster should
+/// 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() { free(mem); }
- void new_search() { generation++; }
+ void new_search() { generation += 4; } // Lower 2 bits are used by Bound
- TTEntry* probe(const Key key) const;
+ const 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 resize(size_t mbSize);
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);
private:
- uint32_t hashMask;
- TTEntry* table;
+ size_t clusterCount;
+ TTCluster* table;
void* mem;
- uint8_t generation; // Size must be not bigger then TTEntry::generation8
+ uint8_t generation; // Size must be not bigger than TTEntry::genBound8
};
extern TranspositionTable TT;
@@ -100,20 +104,11 @@ 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.
+/// get the index of the cluster inside the table.
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 void TranspositionTable::refresh(const TTEntry* tte) const {
-
- const_cast(tte)->set_generation(generation);
+ return &table[(size_t)key & (clusterCount - 1)].entry[0];
}
-#endif // !defined(TT_H_INCLUDED)
+#endif // #ifndef TT_H_INCLUDED