Merge pull request FEX-Emu#3570 from bylaws/ec_pt8

Enable jemalloc for ARM64EC
pmatos · Apr 11, 2024 · a9b7ad8 · a9b7ad8
2 parents ae5e388 + 7ff4cd9
commit a9b7ad8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,6 +124,9 @@ endif()
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm64ec")
   set(_M_ARM_64EC 1)
   add_definitions(-D_M_ARM_64EC=1)
+
+  # Required as FEX is not allowed to lock the CRT heap lock during compilation or callbacks
+  set(ENABLE_JEMALLOC TRUE)
 endif()
 
 if (ENABLE_CCACHE)

diff --git a/External/jemalloc b/External/jemalloc
diff --git a/FEXCore/include/FEXCore/Utils/AllocatorHooks.h b/FEXCore/include/FEXCore/Utils/AllocatorHooks.h
@@ -90,7 +90,18 @@ namespace FEXCore::Allocator {
 #endif
 
   // Memory allocation routines aliased to jemalloc functions.
-#ifdef _WIN32
+#ifdef ENABLE_JEMALLOC
+  inline void *malloc(size_t size) { return ::je_malloc(size); }
+  inline void *calloc(size_t n, size_t size) { return ::je_calloc(n, size); }
+  inline void *memalign(size_t align, size_t s) { return ::je_memalign(align, s); }
+  inline void *valloc(size_t size) { return ::je_valloc(size); }
+  inline int posix_memalign(void** r, size_t a, size_t s) { return ::je_posix_memalign(r, a, s); }
+  inline void *realloc(void* ptr, size_t size) { return ::je_realloc(ptr, size); }
+  inline void free(void* ptr) { return ::je_free(ptr); }
+  inline size_t malloc_usable_size(void *ptr) { return ::je_malloc_usable_size(ptr); }
+  inline void *aligned_alloc(size_t a, size_t s) { return ::je_aligned_alloc(a, s); }
+  inline void aligned_free(void* ptr) { return ::je_free(ptr); }
+#elif defined(_WIN32)
   inline void *malloc(size_t size) { return ::malloc(size); }
   inline void *calloc(size_t n, size_t size) { return ::calloc(n, size); }
   inline void *memalign(size_t align, size_t s) { return ::_aligned_malloc(s, align); }
@@ -110,17 +121,6 @@ namespace FEXCore::Allocator {
   inline size_t malloc_usable_size(void *ptr) { return ::_msize(ptr); }
   inline void *aligned_alloc(size_t a, size_t s) { return ::_aligned_malloc(s, a); }
   inline void aligned_free(void* ptr) { return ::_aligned_free(ptr); }
-#elif defined(ENABLE_JEMALLOC)
-  inline void *malloc(size_t size) { return ::je_malloc(size); }
-  inline void *calloc(size_t n, size_t size) { return ::je_calloc(n, size); }
-  inline void *memalign(size_t align, size_t s) { return ::je_memalign(align, s); }
-  inline void *valloc(size_t size) { return ::je_valloc(size); }
-  inline int posix_memalign(void** r, size_t a, size_t s) { return ::je_posix_memalign(r, a, s); }
-  inline void *realloc(void* ptr, size_t size) { return ::je_realloc(ptr, size); }
-  inline void free(void* ptr) { return ::je_free(ptr); }
-  inline size_t malloc_usable_size(void *ptr) { return ::je_malloc_usable_size(ptr); }
-  inline void *aligned_alloc(size_t a, size_t s) { return ::je_aligned_alloc(a, s); }
-  inline void aligned_free(void* ptr) { return ::je_free(ptr); }
 #else
   inline void *malloc(size_t size) { return ::malloc(size); }
   inline void *calloc(size_t n, size_t size) { return ::calloc(n, size); }
+10 −2		CMakeLists.txt
+428 −0		pregen-arm64ec/include/jemalloc/internal/jemalloc_internal_defs.h
+263 −0		pregen-arm64ec/include/jemalloc/internal/jemalloc_preamble.h
+726 −0		pregen-arm64ec/include/jemalloc/internal/private_namespace.gen.h
+726 −0		pregen-arm64ec/include/jemalloc/internal/private_namespace.h
+54 −0		pregen-arm64ec/include/jemalloc/internal/private_symbols.awk
+54 −0		pregen-arm64ec/include/jemalloc/internal/private_symbols_jet.awk
+24 −0		pregen-arm64ec/include/jemalloc/internal/public_namespace.h
+24 −0		pregen-arm64ec/include/jemalloc/internal/public_symbols.txt
+24 −0		pregen-arm64ec/include/jemalloc/internal/public_unnamespace.h
+469 −0		pregen-arm64ec/include/jemalloc/jemalloc.h
+149 −0		pregen-arm64ec/include/jemalloc/jemalloc_macros.h
+70 −0		pregen-arm64ec/include/jemalloc/jemalloc_mangle.h
+70 −0		pregen-arm64ec/include/jemalloc/jemalloc_mangle_jet.h
+72 −0		pregen-arm64ec/include/jemalloc/jemalloc_protos.h
+72 −0		pregen-arm64ec/include/jemalloc/jemalloc_protos_jet.h
+31 −0		pregen-arm64ec/include/jemalloc/jemalloc_rename.h
+77 −0		pregen-arm64ec/include/jemalloc/jemalloc_typedefs.h
+2 −0		src/pages.c