Auto merge of rust-lang#138764 - Zoxc:win-mimalloc, r=<try>

Use mimalloc as the global allocator on `x86_64-pc-windows-msvc`

This adds using mimalloc as the global allocator for the compiler as an option to `bootstrap.toml` and enables it for the `x86_64-pc-windows-msvc` dist builder.

try-job: dist-x86_64-msvc

Author: bors

Cargo.lock

@@ -2030,6 +2030,16 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
+[[package]]
+name = "libmimalloc-sys"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -2217,6 +2227,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mimalloc"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1"
+dependencies = [
+ "libmimalloc-sys",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3518,6 +3537,7 @@ version = "0.0.0"
 dependencies = [
  "ctrlc",
  "libc",
+ "mimalloc",
  "rustc_abi",
  "rustc_ast",
  "rustc_ast_lowering",

bootstrap.example.toml

@@ -748,6 +748,12 @@
 # [target.<tuple>] section.
 #jemalloc = false
 
+# Use mimalloc as the global allocator for the compiler. Rust code will prefer `mimalloc` over
+# `jemalloc` if that is also enabled.
+# This option is only tested on Windows. It can also be configured per-target in the
+# [target.<tuple>] section.
+#mimalloc = false
+
 # Run tests in various test suites with the "nll compare mode" in addition to
 # running the tests in normal mode. Largely only used on CI and during local
 # development of NLL

compiler/rustc/Cargo.toml

@@ -30,5 +30,6 @@ features = ['unprefixed_malloc_on_supported_platforms']
 jemalloc = ['dep:tikv-jemalloc-sys']
 llvm = ['rustc_driver_impl/llvm']
 max_level_info = ['rustc_driver_impl/max_level_info']
+mimalloc = ['rustc_driver_impl/mimalloc']
 rustc_randomized_layouts = ['rustc_driver_impl/rustc_randomized_layouts']
 # tidy-alphabetical-end

compiler/rustc_driver_impl/Cargo.toml

@@ -54,6 +54,10 @@ time = { version = "0.3.36", default-features = false, features = ["alloc", "for
 tracing = { version = "0.1.35" }
 # tidy-alphabetical-end
 
+[dependencies.mimalloc]
+version = "0.1.44"
+optional = true
+
 [target.'cfg(all(unix, any(target_env = "gnu", target_os = "macos")))'.dependencies]
 # tidy-alphabetical-start
 libc = "0.2"
@@ -74,6 +78,7 @@ ctrlc = "3.4.4"
 # tidy-alphabetical-start
 llvm = ['rustc_interface/llvm']
 max_level_info = ['rustc_log/max_level_info']
+mimalloc = ['dep:mimalloc']
 rustc_randomized_layouts = [
     'rustc_index/rustc_randomized_layouts',
     'rustc_middle/rustc_randomized_layouts'

compiler/rustc_driver_impl/src/lib.rs

@@ -70,6 +70,10 @@ use time::OffsetDateTime;
 use time::macros::format_description;
 use tracing::trace;
 
+#[cfg(feature = "mimalloc")]
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 #[allow(unused_macros)]
 macro do_not_use_print($($t:tt)*) {
     std::compile_error!(

src/bootstrap/src/core/config/config.rs

@@ -346,6 +346,7 @@ pub struct Config {
     jemalloc: bool,
     #[cfg(test)]
     pub jemalloc: bool,
+    pub mimalloc: bool,
     pub control_flow_guard: bool,
     pub ehcont_guard: bool,
 
@@ -666,6 +667,7 @@ pub struct Target {
     pub codegen_backends: Option<Vec<String>>,
     pub optimized_compiler_builtins: Option<bool>,
     pub jemalloc: Option<bool>,
+    pub mimalloc: Option<bool>,
 }
 
 impl Target {
@@ -1228,6 +1230,7 @@ define_config! {
         thin_lto_import_instr_limit: Option<u32> = "thin-lto-import-instr-limit",
         remap_debuginfo: Option<bool> = "remap-debuginfo",
         jemalloc: Option<bool> = "jemalloc",
+        mimalloc: Option<bool> = "mimalloc",
         test_compare_mode: Option<bool> = "test-compare-mode",
         llvm_libunwind: Option<String> = "llvm-libunwind",
         control_flow_guard: Option<bool> = "control-flow-guard",
@@ -1270,6 +1273,7 @@ define_config! {
         runner: Option<String> = "runner",
         optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins",
         jemalloc: Option<bool> = "jemalloc",
+        mimalloc: Option<bool> = "mimalloc",
     }
 }
 
@@ -1895,6 +1899,7 @@ impl Config {
                 thin_lto_import_instr_limit,
                 remap_debuginfo,
                 jemalloc,
+                mimalloc,
                 test_compare_mode,
                 llvm_libunwind,
                 control_flow_guard,
@@ -1967,6 +1972,7 @@ impl Config {
             set(&mut config.rust_frame_pointers, frame_pointers);
             config.rust_stack_protector = stack_protector;
             set(&mut config.jemalloc, jemalloc);
+            set(&mut config.mimalloc, mimalloc);
             set(&mut config.test_compare_mode, test_compare_mode);
             set(&mut config.backtrace, backtrace);
             if rust_description.is_some() {
@@ -2234,6 +2240,7 @@ impl Config {
                 target.rpath = cfg.rpath;
                 target.optimized_compiler_builtins = cfg.optimized_compiler_builtins;
                 target.jemalloc = cfg.jemalloc;
+                target.mimalloc = cfg.mimalloc;
 
                 if let Some(ref backends) = cfg.codegen_backends {
                     let available_backends = ["llvm", "cranelift", "gcc"];
@@ -2815,6 +2822,10 @@ impl Config {
         self.target_config.get(&target).and_then(|cfg| cfg.jemalloc).unwrap_or(self.jemalloc)
     }
 
+    pub fn mimalloc(&self, target: TargetSelection) -> bool {
+        self.target_config.get(&target).and_then(|cfg| cfg.mimalloc).unwrap_or(self.mimalloc)
+    }
+
     pub fn default_codegen_backend(&self, target: TargetSelection) -> Option<String> {
         self.codegen_backends(target).first().cloned()
     }
@@ -3392,6 +3403,7 @@ fn check_incompatible_options_for_ci_rustc(
         strip,
         lld_mode,
         jemalloc,
+        mimalloc,
         rpath,
         channel,
         description,
@@ -3455,6 +3467,7 @@ fn check_incompatible_options_for_ci_rustc(
     err!(current_rust_config.llvm_tools, llvm_tools, "rust");
     err!(current_rust_config.llvm_bitcode_linker, llvm_bitcode_linker, "rust");
     err!(current_rust_config.jemalloc, jemalloc, "rust");
+    err!(current_rust_config.mimalloc, mimalloc, "rust");
     err!(current_rust_config.default_linker, default_linker, "rust");
     err!(current_rust_config.stack_protector, stack_protector, "rust");
     err!(current_rust_config.lto, lto, "rust");

src/bootstrap/src/lib.rs

@@ -713,6 +713,9 @@ impl Build {
         if self.config.jemalloc(target) && check("jemalloc") {
             features.push("jemalloc");
         }
+        if self.config.mimalloc(target) && check("mimalloc") {
+            features.push("mimalloc");
+        }
         if (self.config.llvm_enabled(target) || kind == Kind::Check) && check("llvm") {
             features.push("llvm");
         }

src/ci/github-actions/jobs.yml

@@ -584,6 +584,7 @@ auto:
         --enable-full-tools
         --enable-profiler
         --set rust.codegen-units=1
+        --set rust.mimalloc
       SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
       DIST_REQUIRE_ALL_TOOLS: 1
       CODEGEN_BACKENDS: llvm,cranelift

src/tools/tidy/src/deps.rs

@@ -316,6 +316,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
     "leb128",
     "libc",
     "libloading",
+    "libmimalloc-sys",
     "linux-raw-sys",
     "litemap",
     "lock_api",
@@ -325,6 +326,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
     "measureme",
     "memchr",
     "memmap2",
+    "mimalloc",
     "miniz_oxide",
     "nix",
     "nu-ansi-term",