Rollup merge of #135081 - mrkajetanp:jemalloc-64k, r=Kobzol

GuillaumeGomez · web-flow · commit 2b97db2ff759 · 2025-01-07T15:30:23.000+01:00
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 #134563 Potentially resolves #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,15 @@ pub fn rustc_cargo_env(
             rustc_llvm_env(builder, cargo, target)
         }
     }
+
+    // Build jemalloc on AArch64 with support for page sizes up to 64K
+    // See: https://github.com/rust-lang/rust/pull/135081
+    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,15 @@ pub fn rustc_cargo_env(`
`1207`	`1207`	`rustc_llvm_env(builder, cargo, target)`
`1208`	`1208`	`}`
`1209`	`1209`	`}`
	`1210`	`+`
	`1211`	`+ // Build jemalloc on AArch64 with support for page sizes up to 64K`
	`1212`	`+ // See: https://github.com/rust-lang/rust/pull/135081`
	`1213`	`+ if builder.config.jemalloc`
	`1214`	`+ && target.starts_with("aarch64")`
	`1215`	`+ && env::var_os("JEMALLOC_SYS_WITH_LG_PAGE").is_none()`
	`1216`	`+ {`
	`1217`	`+ cargo.env("JEMALLOC_SYS_WITH_LG_PAGE", "16");`
	`1218`	`+ }`
`1210`	`1219`	`}`
`1211`	`1220`
`1212`	`1221`	`/// Pass down configuration from the LLVM build into the build of`