kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Document sympat

Browse source 
Assorted renaming and reformat while there.

Hopefully it is more clear now!
This commit is contained in:
Marco Costalba 2016-05-14 11:12:04 +02:00
parent a6ede54d59
commit 976581339f
1 changed files with 50 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/syzygy/tbprobe.cpp
View file

@ -55,7 +55,7 @@ inline Square operator^(Square s, int i) { return Square(int(s) ^ i); }
// Each table has a set of flags: all of them refer to DTZ tables, the last one to WDL tables // Each table has a set of flags: all of them refer to DTZ tables, the last one to WDL tables
enum TBFlag { STM = 1, Mapped = 2, WinPlies = 4, LossPlies = 8, SingleValue = 128 }; enum TBFlag { STM = 1, Mapped = 2, WinPlies = 4, LossPlies = 8, SingleValue = 128 };
// Little endian numbers of index in blockLengths[] and offet within the block // Little endian numbers of one index in blockLengths[] and the offset within the block
struct SparseEntry { struct SparseEntry {
char block[4]; char block[4];
char offset[2]; char offset[2];
@ -63,6 +63,29 @@ struct SparseEntry {
static_assert(sizeof(SparseEntry) == 6, "SparseEntry must be 6 bytes"); static_assert(sizeof(SparseEntry) == 6, "SparseEntry must be 6 bytes");
struct LR {
enum Side { Left, Right, Value };
uint8_t lr[3]; // The first 12 bits is the left-hand symbol,
// the second 12 bits is the right-hand symbol.
// If symbol has length 1, then the first byte
// is the stored value.
template<Side S>
int get() {
if (S == Left)
return ((lr[1] & 0xF) << 8) | lr[0];
if (S == Right)
return (lr[2] << 4) | (lr[1] >> 4);
if (S == Value)
return lr[0];
assert(0);
}
};
static_assert(sizeof(LR) == 3, "LR tree entry must be 3 bytes");
struct PairsData { struct PairsData {
int flags; int flags;
size_t sizeofBlock; // Block size in bytes size_t sizeofBlock; // Block size in bytes
@ -71,7 +94,7 @@ struct PairsData {
int max_sym_len; // Maximum length in bits of the Huffman symbols int max_sym_len; // Maximum length in bits of the Huffman symbols
int min_sym_len; // Minimum length in bits of the Huffman symbols int min_sym_len; // Minimum length in bits of the Huffman symbols
uint16_t* lowestSym; // Value of the lowest symbol of length l is lowestSym[l] uint16_t* lowestSym; // Value of the lowest symbol of length l is lowestSym[l]
uint8_t* sympat; LR* btree; // btree[sym] stores the left and right symbols that expand sym
uint16_t* blockLengths; // Number of stored positions (minus one) for each block uint16_t* blockLengths; // Number of stored positions (minus one) for each block
int blockLengthsSize; // Size of blockLengths[] table int blockLengthsSize; // Size of blockLengths[] table
SparseEntry* sparseIndex; // Partial indices into blockLengths[] SparseEntry* sparseIndex; // Partial indices into blockLengths[]
@ -507,8 +530,8 @@ int decompress_pairs(PairsData* d, uint64_t idx)
// Sum to idxOffset to find the offset corresponding to our idx // Sum to idxOffset to find the offset corresponding to our idx
idxOffset += diff; idxOffset += diff;
// Move to previous or next block, until we reach the correct block that contains idx, // Move to previous/next block, until we reach the correct block that contains idx,
// that is when 0 <= idxOffset <= d->sizetable[block] // that is when 0 <= idxOffset <= d->blockLengths[block]
while (idxOffset < 0) while (idxOffset < 0)
idxOffset += d->blockLengths[--block] + 1; idxOffset += d->blockLengths[--block] + 1;
@ -556,21 +579,26 @@ int decompress_pairs(PairsData* d, uint64_t idx)
} }
} }
uint8_t *sympat = d->sympat; // Ok, now we have our symbol that stores d->symlen[sym] values, the score we are
// looking for is among those values. We binary-search for it expanding the symbol
// in a pair of left and right child symbols and continue recursively until we are
// at a symbol of length 1 (symlen[sym] + 1 == 1), which is the value we need.
while (d->symlen[sym]) {
while (d->symlen[sym] != 0) { // Each btree[] entry expand in a left-handed and right-handed pair of
uint8_t* w = sympat + (3 * sym); // additional symbols. We keep expanding recursively picking the symbol
int s1 = ((w[1] & 0xf) << 8) | w[0]; // that contains our idxOffset.
int sl = d->btree[sym].get<LR::Left>();
if (idxOffset < (int)d->symlen[s1] + 1) if (idxOffset < (int)d->symlen[sl] + 1)
sym = s1; sym = sl;
else { else {
idxOffset -= (int)d->symlen[s1] + 1; idxOffset -= d->symlen[sl] + 1;
sym = (w[2] << 4) | (w[1] >> 4); sym = d->btree[sym].get<LR::Right>();
} }
} }
return sympat[3 * sym]; return d->btree[sym].get<LR::Value>();
} }
template<typename Entry> template<typename Entry>
@ -900,23 +928,20 @@ void set_norms(T* p, int num, const uint8_t pawns[])
void calc_symlen(PairsData* d, size_t s, std::vector<uint8_t>& tmp) void calc_symlen(PairsData* d, size_t s, std::vector<uint8_t>& tmp)
{ {
int s1, s2; int sr = d->btree[s].get<LR::Right>();
uint8_t* w = d->sympat + 3 * s; if (sr == 0xFFF)
s2 = (w[2] << 4) | (w[1] >> 4);
if (s2 == 0xFFF)
d->symlen[s] = 0; d->symlen[s] = 0;
else { else {
s1 = ((w[1] & 0xF) << 8) | w[0]; int sl = d->btree[s].get<LR::Left>();
if (!tmp[s1]) if (!tmp[sl])
calc_symlen(d, s1, tmp); calc_symlen(d, sl, tmp);
if (!tmp[s2]) if (!tmp[sr])
calc_symlen(d, s2, tmp); calc_symlen(d, sr, tmp);
d->symlen[s] = d->symlen[s1] + d->symlen[s2] + 1; d->symlen[s] = d->symlen[sl] + d->symlen[sr] + 1;
} }
tmp[s] = 1; tmp[s] = 1;
@ -955,7 +980,7 @@ uint8_t* set_sizes(PairsData* d, uint8_t* data, uint64_t tb_size)
data += d->base.size() * sizeof(*d->lowestSym); data += d->base.size() * sizeof(*d->lowestSym);
d->symlen.resize(number<uint16_t, LittleEndian>(data)); data += sizeof(uint16_t); d->symlen.resize(number<uint16_t, LittleEndian>(data)); data += sizeof(uint16_t);
d->sympat = data; d->btree = (LR*)data;
std::vector<uint8_t> tmp(d->symlen.size()); std::vector<uint8_t> tmp(d->symlen.size());