From abd3d58d57be909b0a03462e279fc5e762bd12e5 Mon Sep 17 00:00:00 2001 From: daMaex Date: Thu, 31 Oct 2019 08:02:20 +0100 Subject: [PATCH] added jemalloc configuration to CMake for CPU_SINWAIT (#23898) --- dep/jemalloc/CMakeLists.txt | 8 ++++++++ dep/jemalloc/jemalloc_internal_defs.h.in.cmake | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt index 1e8e63929c2..5398b6097d7 100644 --- a/dep/jemalloc/CMakeLists.txt +++ b/dep/jemalloc/CMakeLists.txt @@ -28,6 +28,14 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM) set(JEM_MADFREE_DEF "#undef") endif() + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(JEM_CPU_SPINWAIT "") + set(JEM_HAVE_CPU_SPINWAIT 0) + else() + set(JEM_CPU_SPINWAIT "__asm__ volatile\(\"pause\"\)") + set(JEM_HAVE_CPU_SPINWAIT 1) + endif() + # Create the header, so we can use it configure_file( "${CMAKE_SOURCE_DIR}/dep/jemalloc/jemalloc_internal_defs.h.in.cmake" diff --git a/dep/jemalloc/jemalloc_internal_defs.h.in.cmake b/dep/jemalloc/jemalloc_internal_defs.h.in.cmake index 0c592eaa7f6..28f7e9386fe 100644 --- a/dep/jemalloc/jemalloc_internal_defs.h.in.cmake +++ b/dep/jemalloc/jemalloc_internal_defs.h.in.cmake @@ -33,9 +33,9 @@ * Hyper-threaded CPUs may need a special instruction inside spin loops in * order to yield to another virtual CPU. */ -#define CPU_SPINWAIT __asm__ volatile("pause") +#define CPU_SPINWAIT @JEM_CPU_SPINWAIT@ /* 1 if CPU_SPINWAIT is defined, 0 otherwise. */ -#define HAVE_CPU_SPINWAIT 1 +#define HAVE_CPU_SPINWAIT @JEM_HAVE_CPU_SPINWAIT@ /* * Number of significant bits in virtual addresses. This may be less than the