Re-add "Cache line aligned TT"

But this time do not play with pointers, in
particular do not assume that size_t is an
unsigned type of the same width as pointers.

This code should be fully portable.

No functional change.
This commit is contained in:
Marco Costalba
2013-05-01 22:55:23 +02:00
parent e381951a24
commit 481eda4ca0
4 changed files with 10 additions and 8 deletions

View File

@@ -237,10 +237,8 @@ void prefetch(char* addr) {
# if defined(__INTEL_COMPILER) || defined(_MSC_VER) # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
_mm_prefetch(addr, _MM_HINT_T0); _mm_prefetch(addr, _MM_HINT_T0);
_mm_prefetch(addr+64, _MM_HINT_T0); // 64 bytes ahead
# else # else
__builtin_prefetch(addr); __builtin_prefetch(addr);
__builtin_prefetch(addr+64);
# endif # endif
} }

View File

@@ -40,16 +40,18 @@ void TranspositionTable::set_size(size_t mbSize) {
return; return;
hashMask = size - ClusterSize; hashMask = size - ClusterSize;
delete [] table; free(mem);
table = new (std::nothrow) TTEntry[size]; mem = malloc(size * sizeof(TTEntry) + CACHE_LINE_SIZE - 1);
if (!table) if (!mem)
{ {
std::cerr << "Failed to allocate " << mbSize std::cerr << "Failed to allocate " << mbSize
<< "MB for transposition table." << std::endl; << "MB for transposition table." << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// Align table start address to a cache line
for (char* c = (char*)mem; unsigned(table = (TTEntry*)(c)) % CACHE_LINE_SIZE; c++) {}
clear(); // Operator new is not guaranteed to initialize memory to zero clear(); // Operator new is not guaranteed to initialize memory to zero
} }

View File

@@ -85,7 +85,7 @@ class TranspositionTable {
static const unsigned ClusterSize = 4; // A cluster is 64 Bytes static const unsigned ClusterSize = 4; // A cluster is 64 Bytes
public: public:
~TranspositionTable() { delete [] table; } ~TranspositionTable() { free(mem); }
void new_search() { generation++; } void new_search() { generation++; }
TTEntry* probe(const Key key) const; TTEntry* probe(const Key key) const;
@@ -98,6 +98,7 @@ public:
private: private:
uint32_t hashMask; uint32_t hashMask;
TTEntry* table; TTEntry* table;
void* mem;
uint8_t generation; // Size must be not bigger then TTEntry::generation8 uint8_t generation; // Size must be not bigger then TTEntry::generation8
}; };

View File

@@ -56,10 +56,11 @@
# include <xmmintrin.h> // Intel and Microsoft header for _mm_prefetch() # include <xmmintrin.h> // Intel and Microsoft header for _mm_prefetch()
# endif # endif
#define CACHE_LINE_SIZE 64
#if defined(_MSC_VER) || defined(__INTEL_COMPILER) #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
# define CACHE_LINE_ALIGNMENT __declspec(align(64)) # define CACHE_LINE_ALIGNMENT __declspec(align(CACHE_LINE_SIZE))
#else #else
# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(64))) # define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(CACHE_LINE_SIZE)))
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)