X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=6c7caf75fce19bbab5c55886a26e6d75f27f47c1;hp=272e752b3157c6237fd62fb5fc3cc992cef86740;hb=feeafb0a50556654e345a09d16529a5eb7715dc0;hpb=65c2715d9a49c8a6119bb1e03fcd7f54cfa1d4b8
diff --git a/src/tt.h b/src/tt.h
index 272e752b..6c7caf75 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-2012 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,108 +17,140 @@
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 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)
- : key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
- value_(int16_t(v)), depth_(int16_t(d)) {}
-
- 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); }
+ void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g) {
+
+ key32 = (uint32_t)k;
+ move16 = (uint16_t)m;
+ bound = (uint8_t)b;
+ generation8 = (uint8_t)g;
+ valueUpper = (int16_t)(b & BOUND_UPPER ? v : VALUE_NONE);
+ depthUpper = (int16_t)(b & BOUND_UPPER ? d : DEPTH_NONE);
+ valueLower = (int16_t)(b & BOUND_LOWER ? v : VALUE_NONE);
+ depthLower = (int16_t)(b & BOUND_LOWER ? d : DEPTH_NONE);
+ }
+
+ void update(Value v, Bound b, Depth d, Move m, int g) {
+
+ move16 = (uint16_t)m;
+ bound |= (uint8_t)b;
+ generation8 = (uint8_t)g;
+
+ if (b & BOUND_UPPER)
+ {
+ valueUpper = (int16_t)v;
+ depthUpper = (int16_t)d;
+ }
+
+ if (b & BOUND_LOWER)
+ {
+ valueLower = (int16_t)v;
+ depthLower = (int16_t)d;
+ }
+ }
+
+ void set_generation(int g) { generation8 = (uint8_t)g; }
+
+ uint32_t key() const { return key32; }
+ Depth depth() const { return (Depth)depthLower; }
+ Depth depth_upper() const { return (Depth)depthUpper; }
+ Move move() const { return (Move)move16; }
+ Value value() const { return (Value)valueLower; }
+ Value value_upper() const { return (Value)valueUpper; }
+ Bound type() const { return (Bound)bound; }
+ int generation() const { return (int)generation8; }
private:
- uint32_t key_;
- uint32_t data;
- int16_t value_;
- int16_t depth_;
+ uint32_t key32;
+ uint16_t move16;
+ uint8_t bound, generation8;
+ int16_t valueLower, depthLower, valueUpper, depthUpper;
};
-/// This is the number of TTEntry slots for each position
-const int ClusterSize = 5;
+/// 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
-/// and reading new ones.
+/// 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 {
+ TranspositionTable(const TranspositionTable&);
+ TranspositionTable& operator=(const TranspositionTable&);
+
public:
TranspositionTable();
~TranspositionTable();
void set_size(size_t mbSize);
void clear();
- void store(const Key posKey, Value v, ValueType type, Depth d, Move m);
- TTEntry* retrieve(const Key posKey) const;
- void prefetch(const Key posKey) const;
+ void store(const Key posKey, Value v, Bound b, Depth d, Move m);
+ TTEntry* probe(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; // 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 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.
+
+inline void TranspositionTable::refresh(const TTEntry* tte) const {
+
+ const_cast(tte)->set_generation(generation);
+}
+
#endif // !defined(TT_H_INCLUDED)