X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=39c161df1660575a8017e3e368337476b040c3e8;hp=fe4cee62ae39a83ec94ad3d232289daa94a7d395;hb=b76c04c0975326d3274d7d7fb6df4edef7a040b5;hpb=2f1935078da225c90f7887ed8c345cc7baebcfcc diff --git a/src/tt.h b/src/tt.h index fe4cee62..39c161df 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 @@ -22,43 +22,11 @@ #include -#include "move.h" +#include "misc.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. - -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)); } - void prefetch(Key key) const { ::prefetch((char*)find(key)); } -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 /// @@ -79,11 +47,11 @@ protected: class TTEntry { public: - void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value statM) { + void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value statV, Value statM) { key32 = (uint32_t)k; move16 = (uint16_t)m; - valueType = (uint8_t)t; + bound = (uint8_t)b; generation8 = (uint8_t)g; value16 = (int16_t)v; depth16 = (int16_t)d; @@ -92,42 +60,38 @@ public: } 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); } + 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 static_value() const { return (Value)staticValue; } + Value static_value_margin() const { return (Value)staticMargin; } private: uint32_t key32; uint16_t move16; - uint8_t valueType; - uint8_t generation8; - int16_t value16; - int16_t depth16; - int16_t staticValue; - int16_t staticMargin; + uint8_t bound, generation8; + int16_t value16, depth16, staticValue, staticMargin; }; /// 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 { @@ -139,8 +103,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 type, Depth d, Move m, Value statV, Value kingD); + TTEntry* probe(const Key posKey) const; void new_search(); TTEntry* first_entry(const Key posKey) const; void refresh(const TTEntry* tte) const; @@ -148,15 +112,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 { @@ -164,12 +128,46 @@ 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 { const_cast(tte)->set_generation(generation); } + +/// 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 +struct SimpleHash { + + typedef SimpleHash Base; + + void init() { + + if (entries) + return; + + entries = new (std::nothrow) Entry[HashSize]; + if (!entries) + { + std::cerr << "Failed to allocate " << HashSize * sizeof(Entry) + << " bytes for hash table." << std::endl; + exit(EXIT_FAILURE); + } + memset(entries, 0, HashSize * sizeof(Entry)); + } + + virtual ~SimpleHash() { delete [] entries; } + + Entry* probe(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); } + void prefetch(Key key) const { ::prefetch((char*)probe(key)); } + +protected: + Entry* entries; +}; + #endif // !defined(TT_H_INCLUDED)