llvm: Use mimalloc for lld/llvm/clang

EXPERIMENTAL Signed-off-by: Reilly Brogan <[email protected]>
getsolus · Dec 18, 2024 · fc990aa · fc990aa
1 parent 6a72601
commit fc990aa
Show file tree

Hide file tree

Showing 5 changed files with 358 additions and 51 deletions.
diff --git a/packages/l/llvm/abi_symbols b/packages/l/llvm/abi_symbols
@@ -1152,6 +1152,7 @@ clang-19:_Z10clang_mainiPPcRKN4llvm11ToolContextE
 clang-19:_Z17GetExecutablePathB5cxx11PKcb
 clang-19:_Z22cc1gen_reproducer_mainN4llvm8ArrayRefIPKcEES2_PvRKNS_11ToolContextE
 clang-19:_Z8cc1_mainN4llvm8ArrayRefIPKcEES2_Pv
+clang-19:_ZN4llvm8mimalloc20set_mimalloc_optionsEv
 clang-19:__data_start
 clang-19:_start
 clang-19:main
@@ -139979,6 +139980,7 @@ llc:_start
 llc:main
 lld:_IO_stdin_used
 lld:_Z8lld_mainiPPcRKN4llvm11ToolContextE
+lld:_ZN4llvm8mimalloc20set_mimalloc_optionsEv
 lld:__data_start
 lld:_start
 lld:main

diff --git a/packages/l/llvm/abi_used_libs b/packages/l/llvm/abi_used_libs
@@ -5,6 +5,7 @@ libedit.so.0
 libffi.so.8
 libgcc_s.so.1
 libm.so.6
+libmimalloc.so.2
 libstdc++.so.6
 libxml2.so.2
 libz.so.1

diff --git a/packages/l/llvm/files/0001-Use-mimalloc-for-clang-lld-llvm.patch b/packages/l/llvm/files/0001-Use-mimalloc-for-clang-lld-llvm.patch
@@ -0,0 +1,296 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Reilly Brogan <[email protected]>
+Date: Mon, 16 Dec 2024 16:52:13 -0600
+Subject: [PATCH] Use mimalloc for clang/lld/llvm
+
+---
+ bolt/tools/driver/CMakeLists.txt             |  1 +
+ bolt/tools/driver/llvm-bolt.cpp              |  3 +++
+ clang/tools/driver/CMakeLists.txt            |  5 ++++
+ clang/tools/driver/driver.cpp                |  2 ++
+ lld/tools/lld/CMakeLists.txt                 |  5 ++++
+ lld/tools/lld/lld.cpp                        |  2 ++
+ llvm/CMakeLists.txt                          |  2 ++
+ llvm/cmake/config-ix.cmake                   | 17 ++++++++++++++
+ llvm/include/llvm/Config/llvm-config.h.cmake |  3 +++
+ llvm/include/llvm/Mimalloc/Mimalloc.h        | 12 ++++++++++
+ llvm/lib/CMakeLists.txt                      |  1 +
+ llvm/lib/Mimalloc/CMakeLists.txt             | 10 ++++++++
+ llvm/lib/Mimalloc/Mimalloc.cpp               | 24 ++++++++++++++++++++
+ llvm/tools/llvm-ar/CMakeLists.txt            |  2 ++
+ llvm/tools/llvm-ar/llvm-ar.cpp               |  3 +++
+ 15 files changed, 92 insertions(+)
+ create mode 100644 llvm/include/llvm/Mimalloc/Mimalloc.h
+ create mode 100644 llvm/lib/Mimalloc/CMakeLists.txt
+ create mode 100644 llvm/lib/Mimalloc/Mimalloc.cpp
+
+diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
+index 9bf9ff85edc7..612a81e16849 100644
+--- a/bolt/tools/driver/CMakeLists.txt
++++ b/bolt/tools/driver/CMakeLists.txt
+@@ -25,6 +25,7 @@ target_link_libraries(llvm-bolt
+   LLVMBOLTProfile
+   LLVMBOLTRewrite
+   LLVMBOLTUtils
++  LLVMMimalloc
+   )
+
+ add_bolt_tool_symlink(perf2bolt llvm-bolt)
+diff --git a/bolt/tools/driver/llvm-bolt.cpp b/bolt/tools/driver/llvm-bolt.cpp
+index 9b03524e9f18..09a0bfafe9c4 100644
+--- a/bolt/tools/driver/llvm-bolt.cpp
++++ b/bolt/tools/driver/llvm-bolt.cpp
+@@ -17,6 +17,7 @@
+ #include "bolt/Rewrite/RewriteInstance.h"
+ #include "bolt/Utils/CommandLineOpts.h"
+ #include "llvm/MC/TargetRegistry.h"
++#include "llvm/Mimalloc/Mimalloc.h"
+ #include "llvm/Object/Binary.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/Errc.h"
+@@ -187,6 +188,8 @@ int main(int argc, char **argv) {
+   sys::PrintStackTraceOnErrorSignal(argv[0]);
+   PrettyStackTraceProgram X(argc, argv);
+
++  llvm::mimalloc::set_mimalloc_options();
++
+   llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
+
+   std::string ToolPath = GetExecutablePath(argv[0]);
+diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
+index a46d0df0d5df..6e9e303440fb 100644
+--- a/clang/tools/driver/CMakeLists.txt
++++ b/clang/tools/driver/CMakeLists.txt
+@@ -48,6 +48,11 @@ clang_target_link_libraries(clang
+   clangSerialization
+   )
+
++target_link_libraries(clang
++  PRIVATE
++  LLVMMimalloc
++  )
++
+ if(WIN32 AND NOT CYGWIN)
+   # Prevent versioning if the buildhost is targeting for Win32.
+ else()
+diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
+index 83b5bbb71f52..8e0ac5d9dccf 100644
+--- a/clang/tools/driver/driver.cpp
++++ b/clang/tools/driver/driver.cpp
+@@ -29,6 +29,7 @@
+ #include "llvm/ADT/SmallString.h"
+ #include "llvm/ADT/SmallVector.h"
+ #include "llvm/ADT/StringSet.h"
++#include "llvm/Mimalloc/Mimalloc.h"
+ #include "llvm/Option/ArgList.h"
+ #include "llvm/Option/OptTable.h"
+ #include "llvm/Option/Option.h"
+@@ -227,6 +228,7 @@ static int ExecuteCC1Tool(SmallVectorImpl<const char *> &ArgV,
+
+ int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContext) {
+   noteBottomOfStack();
++  llvm::mimalloc::set_mimalloc_options();
+   llvm::setBugReportMsg("PLEASE submit a bug report to " BUG_REPORT_URL
+                         " and include the crash backtrace, preprocessed "
+                         "source, and associated run script.\n");
+diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
+index 3e7b95c3953a..90a39b2e8d0d 100644
+--- a/lld/tools/lld/CMakeLists.txt
++++ b/lld/tools/lld/CMakeLists.txt
+@@ -34,6 +34,11 @@ lld_target_link_libraries(lld
+   lldWasm
+   )
+
++target_link_libraries(lld
++  PRIVATE
++  LLVMMimalloc
++  )
++
+ if(NOT LLD_SYMLINKS_TO_CREATE)
+   set(LLD_SYMLINKS_TO_CREATE
+       lld-link ld.lld ld64.lld wasm-ld)
+diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
+index d6800fa1eea4..4a134e337011 100644
+--- a/lld/tools/lld/lld.cpp
++++ b/lld/tools/lld/lld.cpp
+@@ -31,6 +31,7 @@
+ #include "llvm/ADT/STLExtras.h"
+ #include "llvm/ADT/SmallVector.h"
+ #include "llvm/ADT/Twine.h"
++#include "llvm/Mimalloc/Mimalloc.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/CrashRecoveryContext.h"
+ #include "llvm/Support/LLVMDriver.h"
+@@ -73,6 +74,7 @@ LLD_HAS_DRIVER(macho)
+ LLD_HAS_DRIVER(wasm)
+
+ int lld_main(int argc, char **argv, const llvm::ToolContext &) {
++  llvm::mimalloc::set_mimalloc_options();
+   sys::Process::UseANSIEscapeCodes(true);
+
+   if (::getenv("FORCE_LLD_DIAGNOSTICS_CRASH")) {
+diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
+index 12618966c4ad..4920467fdb40 100644
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -552,6 +552,8 @@ else()
+   option(LLVM_ENABLE_THREADS "Use threads if available." ON)
+ endif()
+
++set(LLVM_ENABLE_MIMALLOC "ON" CACHE STRING "Use mimalloc for memory allocations. Can be ON, OFF, or FORCE_ON")
++
+ set(LLVM_ENABLE_ZLIB "ON" CACHE STRING "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON")
+
+ set(LLVM_ENABLE_ZSTD "ON" CACHE STRING "Use zstd for compression/decompression if available. Can be ON, OFF, or FORCE_ON")
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index 0aae13e30f2a..cce8f3e6689e 100644
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -126,6 +126,23 @@ if(HAVE_LIBPTHREAD)
+   set(LLVM_PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
+ endif()
+
++# Mimalloc will set the PACKAGE_VERSION in it's cmake files, which breaks other parts of the build.
++# Temporarily store the current value and set it back afterwards.
++set(TEMP_VERSION ${PACKAGE_VERSION})
++set(mimalloc_FOUND 0)
++if(LLVM_ENABLE_MIMALLOC)
++  if(LLVM_ENABLE_MIMALLOC STREQUAL FORCE_ON)
++    find_package(mimalloc REQUIRED)
++    if(NOT mimalloc_FOUND)
++      message(FATAL_ERROR "Failed to configure mimalloc, but LLVM_ENABLE_MIMALLOC is FORCE_ON")
++    endif()
++  elseif(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
++    find_package(mimalloc QUIET)
++  endif()
++endif()
++set(LLVM_ENABLE_MIMALLOC ${mimalloc_FOUND})
++set(PACKAGE_VERSION ${TEMP_VERSION})
++
+ if(LLVM_ENABLE_ZLIB)
+   if(LLVM_ENABLE_ZLIB STREQUAL FORCE_ON)
+     find_package(ZLIB REQUIRED)
+diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
+index 629977cc11d6..530c46d2bd69 100644
+--- a/llvm/include/llvm/Config/llvm-config.h.cmake
++++ b/llvm/include/llvm/Config/llvm-config.h.cmake
+@@ -167,6 +167,9 @@
+ /* Define if we have cpp-httplib and want to use it */
+ #cmakedefine LLVM_ENABLE_HTTPLIB ${LLVM_ENABLE_HTTPLIB}
+
++/* Define if mimalloc is available */
++#cmakedefine01 LLVM_ENABLE_MIMALLOC
++
+ /* Define if zlib compression is available */
+ #cmakedefine01 LLVM_ENABLE_ZLIB
+
+diff --git a/llvm/include/llvm/Mimalloc/Mimalloc.h b/llvm/include/llvm/Mimalloc/Mimalloc.h
+new file mode 100644
+index 000000000000..e9bf4ef87b16
+--- /dev/null
++++ b/llvm/include/llvm/Mimalloc/Mimalloc.h
+@@ -0,0 +1,12 @@
++#ifndef LLVM_SUPPORT_MIMALLOC
++#define LLVM_SUPPORT_MIMALLOC
++
++namespace llvm {
++
++namespace mimalloc {
++
++void set_mimalloc_options();
++}
++}
++
++#endif
+diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
+index 638c3bd6f90f..c08331ab87ec 100644
+--- a/llvm/lib/CMakeLists.txt
++++ b/llvm/lib/CMakeLists.txt
+@@ -24,6 +24,7 @@ add_subdirectory(Analysis)
+ add_subdirectory(LTO)
+ add_subdirectory(MC)
+ add_subdirectory(MCA)
++add_subdirectory(Mimalloc)
+ add_subdirectory(ObjCopy)
+ add_subdirectory(Object)
+ add_subdirectory(ObjectYAML)
+diff --git a/llvm/lib/Mimalloc/CMakeLists.txt b/llvm/lib/Mimalloc/CMakeLists.txt
+new file mode 100644
+index 000000000000..b7adccb8a8e1
+--- /dev/null
++++ b/llvm/lib/Mimalloc/CMakeLists.txt
+@@ -0,0 +1,10 @@
++if(LLVM_ENABLE_MIMALLOC)
++  list(APPEND imported_libs mimalloc)
++endif()
++
++add_llvm_library(LLVMMimalloc
++  Mimalloc.cpp
++
++  LINK_LIBS
++  ${imported_libs}
++  )
+diff --git a/llvm/lib/Mimalloc/Mimalloc.cpp b/llvm/lib/Mimalloc/Mimalloc.cpp
+new file mode 100644
+index 000000000000..918e9c3778eb
+--- /dev/null
++++ b/llvm/lib/Mimalloc/Mimalloc.cpp
+@@ -0,0 +1,24 @@
++#if LLVM_ENABLE_MIMALLOC
++// Including mimalloc-new-delete.h overrides new/delete operators.
++// We need it only when we are using mimalloc as a dynamic library.
++# include <mimalloc-new-delete.h>
++
++
++// Silence mimalloc warning messages that users can just ignore.
++# include <mimalloc.h>
++#endif
++
++namespace llvm {
++
++namespace mimalloc {
++
++#if LLVM_ENABLE_MIMALLOC
++void set_mimalloc_options() {
++  mi_option_disable(mi_option_verbose);
++  mi_option_disable(mi_option_show_errors);
++}
++#else
++void set_mimalloc_options() {}
++#endif
++}
++}
+diff --git a/llvm/tools/llvm-ar/CMakeLists.txt b/llvm/tools/llvm-ar/CMakeLists.txt
+index 4d0718f8cefe..763512760a46 100644
+--- a/llvm/tools/llvm-ar/CMakeLists.txt
++++ b/llvm/tools/llvm-ar/CMakeLists.txt
+@@ -19,6 +19,8 @@ add_llvm_tool(llvm-ar
+   GENERATE_DRIVER
+   )
+
++target_link_libraries(llvm-ar PRIVATE LLVMMimalloc)
++
+ add_llvm_tool_symlink(llvm-ranlib llvm-ar)
+ add_llvm_tool_symlink(llvm-lib llvm-ar)
+ add_llvm_tool_symlink(llvm-dlltool llvm-ar)
+diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
+index 3b842b76d5c8..d7a167d04b77 100644
+--- a/llvm/tools/llvm-ar/llvm-ar.cpp
++++ b/llvm/tools/llvm-ar/llvm-ar.cpp
+@@ -18,6 +18,7 @@
+ #include "llvm/Object/Archive.h"
+ #include "llvm/Object/ArchiveWriter.h"
+ #include "llvm/Object/SymbolicFile.h"
++#include "llvm/Mimalloc/Mimalloc.h"
+ #include "llvm/Support/Chrono.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/ConvertUTF.h"
+@@ -1511,6 +1512,8 @@ static int ranlib_main(int argc, char **argv) {
+ int llvm_ar_main(int argc, char **argv, const llvm::ToolContext &) {
+   ToolName = argv[0];
+
++  llvm::mimalloc::set_mimalloc_options();
++
+   llvm::InitializeAllTargetInfos();
+   llvm::InitializeAllTargetMCs();
+   llvm::InitializeAllAsmParsers();
diff --git a/packages/l/llvm/package.yml b/packages/l/llvm/package.yml
@@ -1,6 +1,6 @@
 name       : llvm
 version    : 19.1.6
-release    : 129
+release    : 130
 source     :
     - https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.6/llvm-project-19.1.6.src.tar.xz : e3f79317adaa9196d2cfffe1c869d7c100b7540832bc44fe0d3f44a12861fa34
 homepage   : http://llvm.org/
@@ -72,6 +72,7 @@ builddeps  :
     - pkgconfig32(libxml-2.0)
     - pkgconfig32(libzstd)
     - pkgconfig32(zlib)
+    - pkgconfig(mimalloc)
     - binutils-devel
     - doxygen
     - glibc-32bit-devel
@@ -409,6 +410,7 @@ environment: |
          -DLIBCXX_INSTALL_LIBRARY_DIR=lib%LIBSUFFIX% \
          -DLIBCXXABI_INSTALL_LIBRARY_DIR=lib%LIBSUFFIX% \
          -DLLVM_DEFAULT_TARGET_TRIPLE=%HOST% \
+         -DLLVM_ENABLE_MIMALLOC=ON \
          -DLLVM_TARGET_ARCH=x86_64 \
          -DLLVM_LIBDIR_SUFFIX=%LIBSUFFIX% \
          -DOFFLOAD_INSTALL_LIBDIR=/usr/lib64 \
@@ -462,6 +464,8 @@ setup      : |
     %patch -p1 -i $pkgfiles/0001-lld-Always-enable-build-id-and-use-20-byte-hashes.patch
     %patch -p1 -i $pkgfiles/0001-Solus-Use-zstd-compression-for-debug-symbols-by-defa.patch
 
+    %patch -p1 -i $pkgfiles/0001-Use-mimalloc-for-clang-lld-llvm.patch
+
     # Set the Solus version string
     sed -i "s|@@SOLUS_VERSION_STRING@@|Solus ${version}-${release}|g" clang/CMakeLists.txt
 
@@ -531,6 +535,7 @@ build      : |
           -DLLVM_LIBDIR_SUFFIX=32 \
           -DLLVM_TARGET_ARCH=i686 \
           -DLLVM_DEFAULT_TARGET_TRIPLE=i686-pc-linux-gnu \
+          -DLLVM_ENABLE_MIMALLOC=OFF \
           -DLLVM_ENABLE_PROJECTS="clang;llvm" \
           -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;compiler-rt" \
           -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \