From 675672cfc1a0a8059ae1389584f09e8841027a2c Mon Sep 17 00:00:00 2001 From: Dariusz Orzechowski Date: Mon, 20 Jul 2020 06:20:31 +0200 Subject: [PATCH] Use std::aligned_alloc --- src/misc.cpp | 16 ---------------- src/misc.h | 3 --- src/nnue/evaluate_nnue.cpp | 2 +- src/nnue/evaluate_nnue.h | 2 +- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index f46c5dd2..1a102a50 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -525,19 +525,3 @@ void bindThisThread(size_t idx) { #endif } // namespace WinProcGroup - -void* aligned_malloc(size_t size, size_t align) -{ - void* p = _mm_malloc(size, align); - if (p == nullptr) - { - std::cout << "info string can't allocate memory. sise = " << size << std::endl; - exit(1); - } - return p; -} - -void aligned_free(void* ptr) -{ - _mm_free(ptr); -} diff --git a/src/misc.h b/src/misc.h index 090f7186..373f1b77 100644 --- a/src/misc.h +++ b/src/misc.h @@ -134,7 +134,4 @@ namespace WinProcGroup { void bindThisThread(size_t idx); } -extern void* aligned_malloc(size_t size, size_t align); -extern void aligned_free(void* ptr); - #endif // #ifndef MISC_H_INCLUDED diff --git a/src/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp index 61c7d444..a3f49b87 100644 --- a/src/nnue/evaluate_nnue.cpp +++ b/src/nnue/evaluate_nnue.cpp @@ -57,7 +57,7 @@ namespace Eval::NNUE { template void Initialize(AlignedPtr& pointer) { - pointer.reset(reinterpret_cast(aligned_malloc(sizeof(T), alignof(T)))); + pointer.reset(reinterpret_cast(std::aligned_alloc(alignof(T), sizeof(T)))); std::memset(pointer.get(), 0, sizeof(T)); } diff --git a/src/nnue/evaluate_nnue.h b/src/nnue/evaluate_nnue.h index f35779e2..1e13aa2c 100644 --- a/src/nnue/evaluate_nnue.h +++ b/src/nnue/evaluate_nnue.h @@ -19,7 +19,7 @@ namespace Eval::NNUE { struct AlignedDeleter { void operator()(T* ptr) const { ptr->~T(); - aligned_free(ptr); + std::free(ptr); } };