X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=271b98b74009eaf8f7e5e6601c5225c33a5be7f5;hp=2445f79420692c870922e7c88e77906af3ff0144;hb=481eda4ca0121cfa16f5a29f364ca30ee2852409;hpb=fe3352665b2dfc6c339136856c782057a5c5476e diff --git a/src/tt.cpp b/src/tt.cpp index 2445f794..271b98b7 100644 --- a/src/tt.cpp +++ b/src/tt.cpp @@ -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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 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 @@ -32,22 +32,26 @@ TranspositionTable TT; // Our global transposition table void TranspositionTable::set_size(size_t mbSize) { - size_t newSize = 1ULL << msb((mbSize << 20) / sizeof(TTEntry[ClusterSize])); + assert(msb((mbSize << 20) / sizeof(TTEntry)) < 32); - if (newSize == size) + uint32_t size = ClusterSize << msb((mbSize << 20) / sizeof(TTEntry[ClusterSize])); + + if (hashMask == size - ClusterSize) return; - size = newSize; - delete [] entries; - entries = new (std::nothrow) TTEntry[size * ClusterSize]; + hashMask = size - ClusterSize; + free(mem); + mem = malloc(size * sizeof(TTEntry) + CACHE_LINE_SIZE - 1); - if (!entries) + if (!mem) { std::cerr << "Failed to allocate " << mbSize << "MB for transposition table." << std::endl; 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 } @@ -58,7 +62,7 @@ void TranspositionTable::set_size(size_t mbSize) { void TranspositionTable::clear() { - memset(entries, 0, size * sizeof(TTEntry[ClusterSize])); + memset(table, 0, (hashMask + ClusterSize) * sizeof(TTEntry)); }