X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=c41f231e2a251ec8f3035a5509abdca3e6232635;hp=fa77f72829c5e8062cc5a2bd51c6a87f5e1e1aee;hb=9edc7d6958fd616daecb0ab9ae2aa92042b3d34a;hpb=1e7aaed8bc4247a742d515811f0e484ff40309b8
diff --git a/src/tt.h b/src/tt.h
index fa77f728..c41f231e 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,55 +17,13 @@
along with this program. If not, see .
*/
-
#if !defined(TT_H_INCLUDED)
#define TT_H_INCLUDED
-#include
-
-#include "depth.h"
-#include "move.h"
-#include "value.h"
-
-
-////
-//// Types
-////
-
-
-/// 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.
-
-template
-class SimpleHash {
-
- SimpleHash(const SimpleHash&);
- SimpleHash& operator=(const SimpleHash&);
-
-public:
- SimpleHash() {
-
- entries = new 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));
- }
-
- ~SimpleHash() { delete [] entries; }
-
- Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
+#include "misc.h"
+#include "types.h"
-protected:
- Entry* entries;
-};
-
-
-/// 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
///
@@ -86,51 +44,89 @@ protected:
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 & 0xFFFF) | (t << 21) | (g << 23);
- value16 = (int16_t)v;
- depth16 = (int16_t)d;
- staticValue = (int16_t)statV;
- staticValueMargin = (int16_t)kd;
+ 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;
+ generation8 = (uint8_t)g;
+
+ if (bound == BOUND_EXACT)
+ bound = BOUND_UPPER | BOUND_LOWER; // Drop 'EXACT' flag
+
+ if (b & BOUND_UPPER)
+ {
+ valueUpper = (int16_t)v;
+ depthUpper = (int16_t)d;
+
+ if ((bound & BOUND_LOWER) && v < valueLower)
+ {
+ bound ^= BOUND_LOWER;
+ valueLower = VALUE_NONE;
+ depthLower = DEPTH_NONE;
+ }
+ }
+
+ if (b & BOUND_LOWER)
+ {
+ valueLower = (int16_t)v;
+ depthLower = (int16_t)d;
+
+ if ((bound & BOUND_UPPER) && v > valueUpper)
+ {
+ bound ^= BOUND_UPPER;
+ valueUpper = VALUE_NONE;
+ depthUpper = DEPTH_NONE;
+ }
+ }
+
+ bound |= (uint8_t)b;
}
- void set_generation(int g) { data = move() | (type() << 21) | (g << 23); }
- uint32_t key() const { return key32; }
- Depth depth() const { return Depth(depth16); }
- Move move() const { return Move(data & 0xFFFF); }
- Value value() const { return Value(value16); }
- ValueType type() const { return ValueType((data >> 21) & 3); }
- int generation() const { return data >> 23; }
- Value static_value() const { return Value(staticValue); }
- Value static_value_margin() const { return Value(staticValueMargin); }
+ 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 key32;
- uint32_t data;
- int16_t value16;
- int16_t depth16;
- int16_t staticValue;
- int16_t staticValueMargin;
+ uint16_t move16;
+ uint8_t bound, generation8;
+ int16_t valueLower, depthLower, valueUpper, depthUpper;
};
/// This is the number of TTEntry slots for each cluster
const int ClusterSize = 4;
-/// 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.
+
+/// 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];
};
-/// The transposition table class. This is basically just a huge array
-/// containing TTCluster 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 {
@@ -142,8 +138,8 @@ public:
~TranspositionTable();
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 store(const Key posKey, Value v, Bound b, Depth d, Move m);
+ TTEntry* probe(const Key posKey) const;
void new_search();
TTEntry* first_entry(const Key posKey) const;
void refresh(const TTEntry* tte) const;
@@ -151,15 +147,15 @@ public:
private:
size_t size;
TTCluster* entries;
- uint8_t generation; // To properly compare, size must be smaller then TT stored value
+ 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.
+/// 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 {
@@ -167,8 +163,8 @@ inline TTEntry* TranspositionTable::first_entry(const Key posKey) const {
}
-/// TranspositionTable::refresh updates the 'generation' value of the TTEntry
-/// to avoid aging. Normally called after a TT hit, before to return.
+/// 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 {