X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=2f6ffd28e7029718e468db6df2efafa9898c8462;hb=8a912951de6d4bff78d3ff5258213a0c7e6f494e;hp=7d848d32693e2091b3ced5eab4820c8e210cfeb1;hpb=5a30b087c3a3c4435e680e6c61082d5432fa0ace;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 7d848d32..2f6ffd28 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -16,6 +16,8 @@
along with this program. If not, see .
*/
+#include "misc.h"
+
#ifdef _WIN32
#if _WIN32_WINNT < 0x0601
#undef _WIN32_WINNT
@@ -32,26 +34,31 @@
// the calls at compile time), try to load them at runtime. To do this we need
// first to define the corresponding function pointers.
extern "C" {
-typedef bool(*fun1_t)(LOGICAL_PROCESSOR_RELATIONSHIP,
- PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, PDWORD);
-typedef bool(*fun2_t)(USHORT, PGROUP_AFFINITY);
-typedef bool(*fun3_t)(HANDLE, CONST GROUP_AFFINITY*, PGROUP_AFFINITY);
-typedef bool(*fun4_t)(USHORT, PGROUP_AFFINITY, USHORT, PUSHORT);
-typedef WORD(*fun5_t)();
+using fun1_t = bool(*)(LOGICAL_PROCESSOR_RELATIONSHIP,
+ PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, PDWORD);
+using fun2_t = bool(*)(USHORT, PGROUP_AFFINITY);
+using fun3_t = bool(*)(HANDLE, CONST GROUP_AFFINITY*, PGROUP_AFFINITY);
+using fun4_t = bool(*)(USHORT, PGROUP_AFFINITY, USHORT, PUSHORT);
+using fun5_t = WORD(*)();
+using fun6_t = bool(*)(HANDLE, DWORD, PHANDLE);
+using fun7_t = bool(*)(LPCSTR, LPCSTR, PLUID);
+using fun8_t = bool(*)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
}
#endif
+#include
#include
#include
#include
#include
#include
+#include
#include
#include
-#include
+
+#include "types.h"
#if defined(__linux__) && !defined(__ANDROID__)
-#include
#include
#endif
@@ -60,17 +67,12 @@ typedef WORD(*fun5_t)();
#include
#endif
-#include "misc.h"
-#include "thread.h"
-
-using namespace std;
-
namespace Stockfish {
namespace {
/// Version number or dev.
-constexpr string_view version = "dev";
+constexpr std::string_view version = "dev";
/// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
/// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We
@@ -78,16 +80,16 @@ constexpr string_view version = "dev";
/// usual I/O functionality, all without changing a single line of code!
/// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
-struct Tie: public streambuf { // MSVC requires split streambuf for cin and cout
+struct Tie: public std::streambuf { // MSVC requires split streambuf for cin and cout
- Tie(streambuf* b, streambuf* l) : buf(b), logBuf(l) {}
+ Tie(std::streambuf* b, std::streambuf* l) : buf(b), logBuf(l) {}
int sync() override { return logBuf->pubsync(), buf->pubsync(); }
- int overflow(int c) override { return log(buf->sputc((char)c), "<< "); }
+ int overflow(int c) override { return log(buf->sputc(char(c)), "<< "); }
int underflow() override { return buf->sgetc(); }
int uflow() override { return log(buf->sbumpc(), ">> "); }
- streambuf *buf, *logBuf;
+ std::streambuf *buf, *logBuf;
int log(int c, const char* prefix) {
@@ -96,16 +98,16 @@ struct Tie: public streambuf { // MSVC requires split streambuf for cin and cout
if (last == '\n')
logBuf->sputn(prefix, 3);
- return last = logBuf->sputc((char)c);
+ return last = logBuf->sputc(char(c));
}
};
class Logger {
- Logger() : in(cin.rdbuf(), file.rdbuf()), out(cout.rdbuf(), file.rdbuf()) {}
+ Logger() : in(std::cin.rdbuf(), file.rdbuf()), out(std::cout.rdbuf(), file.rdbuf()) {}
~Logger() { start(""); }
- ofstream file;
+ std::ofstream file;
Tie in, out;
public:
@@ -115,23 +117,23 @@ public:
if (l.file.is_open())
{
- cout.rdbuf(l.out.buf);
- cin.rdbuf(l.in.buf);
+ std::cout.rdbuf(l.out.buf);
+ std::cin.rdbuf(l.in.buf);
l.file.close();
}
if (!fname.empty())
{
- l.file.open(fname, ifstream::out);
+ l.file.open(fname, std::ifstream::out);
if (!l.file.is_open())
{
- cerr << "Unable to open debug log file " << fname << endl;
+ std::cerr << "Unable to open debug log file " << fname << std::endl;
exit(EXIT_FAILURE);
}
- cin.rdbuf(&l.in);
- cout.rdbuf(&l.out);
+ std::cin.rdbuf(&l.in);
+ std::cout.rdbuf(&l.out);
}
}
};
@@ -149,28 +151,28 @@ public:
/// For releases (non dev builds) we only include the version number:
/// Stockfish version
-string engine_info(bool to_uci) {
- stringstream ss;
- ss << "Stockfish " << version << setfill('0');
+std::string engine_info(bool to_uci) {
+ std::stringstream ss;
+ ss << "Stockfish " << version << std::setfill('0');
if constexpr (version == "dev")
{
ss << "-";
#ifdef GIT_DATE
- ss << GIT_DATE;
+ ss << stringify(GIT_DATE);
#else
- constexpr string_view months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
- string month, day, year;
- stringstream date(__DATE__); // From compiler, format is "Sep 21 2008"
+ constexpr std::string_view months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
+ std::string month, day, year;
+ std::stringstream date(__DATE__); // From compiler, format is "Sep 21 2008"
date >> month >> day >> year;
- ss << year << setw(2) << setfill('0') << (1 + months.find(month) / 4) << setw(2) << setfill('0') << day;
+ ss << year << std::setw(2) << std::setfill('0') << (1 + months.find(month) / 4) << std::setw(2) << std::setfill('0') << day;
#endif
ss << "-";
#ifdef GIT_SHA
- ss << GIT_SHA;
+ ss << stringify(GIT_SHA);
#else
ss << "nogit";
#endif
@@ -187,28 +189,25 @@ string engine_info(bool to_uci) {
std::string compiler_info() {
- #define stringify2(x) #x
- #define stringify(x) stringify2(x)
#define make_version_string(major, minor, patch) stringify(major) "." stringify(minor) "." stringify(patch)
/// Predefined macros hell:
///
-/// __GNUC__ Compiler is gcc, Clang or Intel on Linux
-/// __INTEL_COMPILER Compiler is Intel
-/// _MSC_VER Compiler is MSVC or Intel on Windows
-/// _WIN32 Building on Windows (any)
-/// _WIN64 Building on Windows 64 bit
-
- std::string compiler = "\nCompiled by ";
-
- #ifdef __clang__
+/// __GNUC__ Compiler is GCC, Clang or ICX
+/// __clang__ Compiler is Clang or ICX
+/// __INTEL_LLVM_COMPILER Compiler is ICX
+/// _MSC_VER Compiler is MSVC
+/// _WIN32 Building on Windows (any)
+/// _WIN64 Building on Windows 64 bit
+
+ std::string compiler = "\nCompiled by : ";
+
+ #if defined(__INTEL_LLVM_COMPILER)
+ compiler += "ICX ";
+ compiler += stringify(__INTEL_LLVM_COMPILER);
+ #elif defined(__clang__)
compiler += "clang++ ";
compiler += make_version_string(__clang_major__, __clang_minor__, __clang_patchlevel__);
- #elif __INTEL_COMPILER
- compiler += "Intel compiler ";
- compiler += "(version ";
- compiler += stringify(__INTEL_COMPILER) " update " stringify(__INTEL_COMPILER_UPDATE);
- compiler += ")";
#elif _MSC_VER
compiler += "MSVC ";
compiler += "(version ";
@@ -216,9 +215,9 @@ std::string compiler_info() {
compiler += ")";
#elif defined(__e2k__) && defined(__LCC__)
#define dot_ver2(n) \
- compiler += (char)'.'; \
- compiler += (char)('0' + (n) / 10); \
- compiler += (char)('0' + (n) % 10);
+ compiler += char('.'); \
+ compiler += char('0' + (n) / 10); \
+ compiler += char('0' + (n) % 10);
compiler += "MCST LCC ";
compiler += "(version ";
@@ -254,8 +253,15 @@ std::string compiler_info() {
compiler += " on unknown system";
#endif
- compiler += "\nCompilation settings include: ";
- compiler += (Is64Bit ? " 64bit" : " 32bit");
+ compiler += "\nCompilation architecture : ";
+ #if defined(ARCH)
+ compiler += stringify(ARCH);
+ #else
+ compiler += "(undefined architecture)";
+ #endif
+
+ compiler += "\nCompilation settings : ";
+ compiler += (Is64Bit ? "64bit" : "32bit");
#if defined(USE_VNNI)
compiler += " VNNI";
#endif
@@ -276,10 +282,9 @@ std::string compiler_info() {
compiler += " SSE2";
#endif
compiler += (HasPopCnt ? " POPCNT" : "");
- #if defined(USE_MMX)
- compiler += " MMX";
- #endif
- #if defined(USE_NEON)
+ #if defined(USE_NEON_DOTPROD)
+ compiler += " NEON_DOTPROD";
+ #elif defined(USE_NEON)
compiler += " NEON";
#endif
@@ -287,12 +292,13 @@ std::string compiler_info() {
compiler += " DEBUG";
#endif
- compiler += "\n__VERSION__ macro expands to: ";
+ compiler += "\nCompiler __VERSION__ macro : ";
#ifdef __VERSION__
compiler += __VERSION__;
#else
compiler += "(undefined macro)";
#endif
+
compiler += "\n";
return compiler;
@@ -372,7 +378,7 @@ void dbg_print() {
for (int i = 0; i < MaxDebugSlots; ++i)
if ((n = stdev[i][0]))
{
- double r = sqrtl(E(stdev[i][2]) - sqr(E(stdev[i][1])));
+ double r = sqrt(E(stdev[i][2]) - sqr(E(stdev[i][1])));
std::cerr << "Stdev #" << i
<< ": Total " << n << " Stdev " << r
<< std::endl;
@@ -382,8 +388,8 @@ void dbg_print() {
if ((n = correl[i][0]))
{
double r = (E(correl[i][5]) - E(correl[i][1]) * E(correl[i][3]))
- / ( sqrtl(E(correl[i][2]) - sqr(E(correl[i][1])))
- * sqrtl(E(correl[i][4]) - sqr(E(correl[i][3]))));
+ / ( sqrt(E(correl[i][2]) - sqr(E(correl[i][1])))
+ * sqrt(E(correl[i][4]) - sqr(E(correl[i][3]))));
std::cerr << "Correl. #" << i
<< ": Total " << n << " Coefficient " << r
<< std::endl;
@@ -423,13 +429,7 @@ void prefetch(void*) {}
void prefetch(void* addr) {
-# if defined(__INTEL_COMPILER)
- // This hack prevents prefetches from being optimized away by
- // Intel compiler. Both MSVC and gcc seem not be affected by this.
- __asm__ ("");
-# endif
-
-# if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+# if defined(_MSC_VER)
_mm_prefetch((char*)addr, _MM_HINT_T0);
# else
__builtin_prefetch(addr);
@@ -448,8 +448,10 @@ void* std_aligned_alloc(size_t alignment, size_t size) {
#if defined(POSIXALIGNEDALLOC)
void *mem;
return posix_memalign(&mem, alignment, size) ? nullptr : mem;
-#elif defined(_WIN32)
+#elif defined(_WIN32) && !defined(_M_ARM) && !defined(_M_ARM64)
return _mm_malloc(size, alignment);
+#elif defined(_WIN32)
+ return _aligned_malloc(size, alignment);
#else
return std::aligned_alloc(alignment, size);
#endif
@@ -459,8 +461,10 @@ void std_aligned_free(void* ptr) {
#if defined(POSIXALIGNEDALLOC)
free(ptr);
-#elif defined(_WIN32)
+#elif defined(_WIN32) && !defined(_M_ARM) && !defined(_M_ARM64)
_mm_free(ptr);
+#elif defined(_WIN32)
+ _aligned_free(ptr);
#else
free(ptr);
#endif
@@ -484,11 +488,30 @@ static void* aligned_large_pages_alloc_windows([[maybe_unused]] size_t allocSize
if (!largePageSize)
return nullptr;
- // We need SeLockMemoryPrivilege, so try to enable it for the process
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hProcessToken))
+ // Dynamically link OpenProcessToken, LookupPrivilegeValue and AdjustTokenPrivileges
+
+ HMODULE hAdvapi32 = GetModuleHandle(TEXT("advapi32.dll"));
+
+ if (!hAdvapi32)
+ hAdvapi32 = LoadLibrary(TEXT("advapi32.dll"));
+
+ auto fun6 = fun6_t((void(*)())GetProcAddress(hAdvapi32, "OpenProcessToken"));
+ if (!fun6)
+ return nullptr;
+ auto fun7 = fun7_t((void(*)())GetProcAddress(hAdvapi32, "LookupPrivilegeValueA"));
+ if (!fun7)
return nullptr;
+ auto fun8 = fun8_t((void(*)())GetProcAddress(hAdvapi32, "AdjustTokenPrivileges"));
+ if (!fun8)
+ return nullptr;
+
+ // We need SeLockMemoryPrivilege, so try to enable it for the process
+ if (!fun6( // OpenProcessToken()
+ GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hProcessToken))
+ return nullptr;
- if (LookupPrivilegeValue(nullptr, SE_LOCK_MEMORY_NAME, &luid))
+ if (fun7( // LookupPrivilegeValue(nullptr, SE_LOCK_MEMORY_NAME, &luid)
+ nullptr, "SeLockMemoryPrivilege", &luid))
{
TOKEN_PRIVILEGES tp { };
TOKEN_PRIVILEGES prevTp { };
@@ -500,7 +523,7 @@ static void* aligned_large_pages_alloc_windows([[maybe_unused]] size_t allocSize
// Try to enable SeLockMemoryPrivilege. Note that even if AdjustTokenPrivileges() succeeds,
// we still need to query GetLastError() to ensure that the privileges were actually obtained.
- if (AdjustTokenPrivileges(
+ if (fun8( // AdjustTokenPrivileges()
hProcessToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prevTp, &prevTpLen) &&
GetLastError() == ERROR_SUCCESS)
{
@@ -510,7 +533,8 @@ static void* aligned_large_pages_alloc_windows([[maybe_unused]] size_t allocSize
nullptr, allocSize, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
// Privilege no longer needed, restore previous state
- AdjustTokenPrivileges(hProcessToken, FALSE, &prevTp, 0, nullptr, nullptr);
+ fun8( // AdjustTokenPrivileges ()
+ hProcessToken, FALSE, &prevTp, 0, nullptr, nullptr);
}
}
@@ -601,7 +625,7 @@ static int best_node(size_t idx) {
DWORD byteOffset = 0;
// Early exit if the needed API is not available at runtime
- HMODULE k32 = GetModuleHandle("Kernel32.dll");
+ HMODULE k32 = GetModuleHandle(TEXT("Kernel32.dll"));
auto fun1 = (fun1_t)(void(*)())GetProcAddress(k32, "GetLogicalProcessorInformationEx");
if (!fun1)
return -1;
@@ -671,11 +695,11 @@ void bindThisThread(size_t idx) {
return;
// Early exit if the needed API are not available at runtime
- HMODULE k32 = GetModuleHandle("Kernel32.dll");
- auto fun2 = (fun2_t)(void(*)())GetProcAddress(k32, "GetNumaNodeProcessorMaskEx");
- auto fun3 = (fun3_t)(void(*)())GetProcAddress(k32, "SetThreadGroupAffinity");
- auto fun4 = (fun4_t)(void(*)())GetProcAddress(k32, "GetNumaNodeProcessorMask2");
- auto fun5 = (fun5_t)(void(*)())GetProcAddress(k32, "GetMaximumProcessorGroupCount");
+ HMODULE k32 = GetModuleHandle(TEXT("Kernel32.dll"));
+ auto fun2 = fun2_t((void(*)())GetProcAddress(k32, "GetNumaNodeProcessorMaskEx"));
+ auto fun3 = fun3_t((void(*)())GetProcAddress(k32, "SetThreadGroupAffinity"));
+ auto fun4 = fun4_t((void(*)())GetProcAddress(k32, "GetNumaNodeProcessorMask2"));
+ auto fun5 = fun5_t((void(*)())GetProcAddress(k32, "GetMaximumProcessorGroupCount"));
if (!fun2 || !fun3)
return;
@@ -713,12 +737,12 @@ void bindThisThread(size_t idx) {
namespace CommandLine {
-string argv0; // path+name of the executable binary, as given by argv[0]
-string binaryDirectory; // path of the executable directory
-string workingDirectory; // path of the working directory
+std::string argv0; // path+name of the executable binary, as given by argv[0]
+std::string binaryDirectory; // path of the executable directory
+std::string workingDirectory; // path of the working directory
void init([[maybe_unused]] int argc, char* argv[]) {
- string pathSeparator;
+ std::string pathSeparator;
// extract the path+name of the executable binary
argv0 = argv[0];