Auto merge of rust-lang#135081 - mrkajetanp:jemalloc-64k, r=<try>

bors · bors · commit 5917c7b5c110 · 2025-01-06T16:35:15.000Z
bootstrap: Build jemalloc with support for 64K pages By default, jemalloc is built to only support the same page size as the host machine. Set an env variable so that jemalloc is built with support for page sizes up to 64K regardless of the host machine. r? `@Kobzol` Resolves rust-lang#134563 Potentially resolves rust-lang#133748 (needs verification) ---- Results from local rustc-perf testing below, within 0.5% on every metric except max-rss. AArch64: ![Screenshot 2025-01-03 at 5 53 13 pm](https://github.com/user-attachments/assets/71705c59-7d7b-4753-a184-8c784233e603) x86_64: ![Screenshot 2025-01-03 at 5 54 16 pm](https://github.com/user-attachments/assets/ea28aded-3b90-43f4-a965-b081b07b95ab)
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1207,6 +1207,13 @@ pub fn rustc_cargo_env(
             rustc_llvm_env(builder, cargo, target)
         }
     }
+
+    if builder.config.jemalloc
+        && target.starts_with("aarch64")
+        && env::var_os("JEMALLOC_SYS_WITH_LG_PAGE").is_none()
+    {
+        cargo.env("JEMALLOC_SYS_WITH_LG_PAGE", "16");
+    }
 }
 
 /// Pass down configuration from the LLVM build into the build of

Original file line number	Diff line number	Diff line change
`@@ -1207,6 +1207,13 @@ pub fn rustc_cargo_env(`
`1207`	`1207`	`rustc_llvm_env(builder, cargo, target)`
`1208`	`1208`	`}`
`1209`	`1209`	`}`
	`1210`	`+`
	`1211`	`+ if builder.config.jemalloc`
	`1212`	`+ && target.starts_with("aarch64")`
	`1213`	`+ && env::var_os("JEMALLOC_SYS_WITH_LG_PAGE").is_none()`
	`1214`	`+ {`
	`1215`	`+ cargo.env("JEMALLOC_SYS_WITH_LG_PAGE", "16");`
	`1216`	`+ }`
`1210`	`1217`	`}`
`1211`	`1218`
`1212`	`1219`	`/// Pass down configuration from the LLVM build into the build of`