Skip to content

Commit b90cfc8

Browse files
fee1-deadfee1-dead
committed
Replace jemalloc with mimalloc
1 parent 59337cd commit b90cfc8

File tree

15 files changed

+79
-107
lines changed

15 files changed

+79
-107
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ jobs:
288288
- name: dist-x86_64-apple
289289
env:
290290
SCRIPT: "./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended"
291-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
291+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.mimalloc --set llvm.ninja=false"
292292
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
293293
MACOSX_DEPLOYMENT_TARGET: 10.7
294294
NO_LLVM_ASSERTIONS: 1
@@ -299,7 +299,7 @@ jobs:
299299
- name: dist-x86_64-apple-alt
300300
env:
301301
SCRIPT: "./x.py dist"
302-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
302+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.mimalloc --set llvm.ninja=false"
303303
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
304304
MACOSX_DEPLOYMENT_TARGET: 10.7
305305
NO_LLVM_ASSERTIONS: 1
@@ -309,7 +309,7 @@ jobs:
309309
- name: x86_64-apple
310310
env:
311311
SCRIPT: "./x.py --stage 2 test"
312-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
312+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.mimalloc --set llvm.ninja=false"
313313
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
314314
MACOSX_DEPLOYMENT_TARGET: 10.8
315315
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
@@ -320,7 +320,7 @@ jobs:
320320
- name: dist-aarch64-apple
321321
env:
322322
SCRIPT: "./x.py dist --stage 2"
323-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
323+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.mimalloc --set llvm.ninja=false"
324324
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
325325
USE_XCODE_CLANG: 1
326326
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -329,7 +329,6 @@ jobs:
329329
NO_DEBUG_ASSERTIONS: 1
330330
NO_OVERFLOW_CHECKS: 1
331331
DIST_REQUIRE_ALL_TOOLS: 1
332-
JEMALLOC_SYS_WITH_LG_PAGE: 14
333332
os: macos-latest
334333
- name: x86_64-msvc-1
335334
env:

‎Cargo.lock

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,12 @@ dependencies = [
888888
"syn",
889889
]
890890

891+
[[package]]
892+
name = "cty"
893+
version = "0.2.2"
894+
source = "registry+https://github.com/rust-lang/crates.io-index"
895+
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
896+
891897
[[package]]
892898
name = "curl"
893899
version = "0.4.41"
@@ -1238,12 +1244,6 @@ version = "2.5.0"
12381244
source = "registry+https://github.com/rust-lang/crates.io-index"
12391245
checksum = "bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431"
12401246

1241-
[[package]]
1242-
name = "fs_extra"
1243-
version = "1.1.0"
1244-
source = "registry+https://github.com/rust-lang/crates.io-index"
1245-
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
1246-
12471247
[[package]]
12481248
name = "fst"
12491249
version = "0.4.5"
@@ -1942,6 +1942,16 @@ version = "0.1.4"
19421942
source = "registry+https://github.com/rust-lang/crates.io-index"
19431943
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
19441944

1945+
[[package]]
1946+
name = "libmimalloc-sys"
1947+
version = "0.1.23"
1948+
source = "registry+https://github.com/rust-lang/crates.io-index"
1949+
checksum = "9636c194f9db483f4d0adf2f99a65011a99f904bd222bbd67fb4df4f37863c30"
1950+
dependencies = [
1951+
"cc",
1952+
"cty",
1953+
]
1954+
19451955
[[package]]
19461956
name = "libnghttp2-sys"
19471957
version = "0.1.4+1.41.0"
@@ -3479,10 +3489,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
34793489
name = "rustc-main"
34803490
version = "0.0.0"
34813491
dependencies = [
3492+
"libmimalloc-sys",
34823493
"rustc_codegen_ssa",
34833494
"rustc_driver",
3484-
"tikv-jemalloc-sys",
3485-
"tikv-jemallocator",
34863495
]
34873496

34883497
[[package]]
@@ -5303,27 +5312,6 @@ dependencies = [
53035312
name = "tier-check"
53045313
version = "0.1.0"
53055314

5306-
[[package]]
5307-
name = "tikv-jemalloc-sys"
5308-
version = "0.4.1+5.2.1-patched"
5309-
source = "registry+https://github.com/rust-lang/crates.io-index"
5310-
checksum = "8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3"
5311-
dependencies = [
5312-
"cc",
5313-
"fs_extra",
5314-
"libc",
5315-
]
5316-
5317-
[[package]]
5318-
name = "tikv-jemallocator"
5319-
version = "0.4.1"
5320-
source = "registry+https://github.com/rust-lang/crates.io-index"
5321-
checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
5322-
dependencies = [
5323-
"libc",
5324-
"tikv-jemalloc-sys",
5325-
]
5326-
53275315
[[package]]
53285316
name = "time"
53295317
version = "0.1.43"

‎compiler/rustc/Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ rustc_driver = { path = "../rustc_driver" }
1010
# crate is intended to be used by codegen backends, which may not be in-tree.
1111
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
1212

13-
[dependencies.tikv-jemalloc-sys]
14-
version = '0.4.0'
15-
optional = true
16-
features = ['unprefixed_malloc_on_supported_platforms']
17-
18-
[dependencies.tikv-jemallocator]
19-
version = '0.4.0'
13+
[dependencies.libmimalloc-sys]
14+
version = '0.1.20'
2015
optional = true
16+
default-features = false
17+
features = ['extended', 'override']
2118

2219
[features]
23-
jemalloc = ['tikv-jemalloc-sys', 'tikv-jemallocator']
20+
mimalloc = ['libmimalloc-sys']
2421
llvm = ['rustc_driver/llvm']
2522
max_level_info = ['rustc_driver/max_level_info']

‎compiler/rustc/src/main.rs

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,57 @@
1-
// A note about jemalloc: rustc uses jemalloc when built for CI and
1+
// A note about mimalloc: rustc uses mimalloc when built for CI and
22
// distribution. The obvious way to do this is with the `#[global_allocator]`
33
// mechanism. However, for complicated reasons (see
44
// https://github.com/rust-lang/rust/pull/81782#issuecomment-784438001 for some
55
// details) that mechanism doesn't work here. Also, we must use a consistent
66
// allocator across the rustc <-> llvm boundary, and `#[global_allocator]`
77
// wouldn't provide that.
88
//
9-
// Instead, we use a lower-level mechanism. rustc is linked with jemalloc in a
10-
// way such that jemalloc's implementation of `malloc`, `free`, etc., override
9+
// Instead, we use a lower-level mechanism. rustc is linked with mimalloc in a
10+
// way such that mimalloc's implementation of `malloc`, `free`, etc., override
1111
// the libc allocator's implementation. This means that Rust's `System`
1212
// allocator, which calls `libc::malloc()` et al., is actually calling into
13-
// jemalloc.
14-
//
15-
// A consequence of not using `GlobalAlloc` (and the `tikv-jemallocator` crate
16-
// provides an impl of that trait, which is called `Jemalloc`) is that we
17-
// cannot use the sized deallocation APIs (`sdallocx`) that jemalloc provides.
18-
// It's unclear how much performance is lost because of this.
13+
// mimalloc.
1914
//
2015
// As for the symbol overrides in `main` below: we're pulling in a static copy
21-
// of jemalloc. We need to actually reference its symbols for it to get linked.
16+
// of mimalloc. We need to actually reference its symbols for it to get linked.
2217
// The two crates we link to here, `std` and `rustc_driver`, are both dynamic
23-
// libraries. So we must reference jemalloc symbols one way or another, because
18+
// libraries. So we must reference mimalloc symbols one way or another, because
2419
// this file is the only object code in the rustc executable.
25-
#[cfg(feature = "tikv-jemalloc-sys")]
26-
use tikv_jemalloc_sys as jemalloc_sys;
2720

2821
fn main() {
2922
// See the comment at the top of this file for an explanation of this.
30-
#[cfg(feature = "tikv-jemalloc-sys")]
23+
#[cfg(feature = "libmimalloc-sys")]
3124
{
3225
use std::os::raw::{c_int, c_void};
3326

3427
#[used]
35-
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
28+
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = libmimalloc_sys::mi_calloc;
3629
#[used]
3730
static _F2: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
38-
jemalloc_sys::posix_memalign;
31+
libmimalloc_sys::mi_posix_memalign;
3932
#[used]
40-
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::aligned_alloc;
33+
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void =
34+
libmimalloc_sys::mi_aligned_alloc;
4135
#[used]
42-
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = jemalloc_sys::malloc;
36+
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = libmimalloc_sys::mi_malloc;
4337
#[used]
44-
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = jemalloc_sys::realloc;
38+
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void =
39+
libmimalloc_sys::mi_realloc;
4540
#[used]
46-
static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
41+
static _F6: unsafe extern "C" fn(*mut c_void) = libmimalloc_sys::mi_free;
4742

48-
// On OSX, jemalloc doesn't directly override malloc/free, but instead
43+
// On OSX, mimalloc doesn't directly override malloc/free, but instead
4944
// registers itself with the allocator's zone APIs in a ctor. However,
5045
// the linker doesn't seem to consider ctors as "used" when statically
5146
// linking, so we need to explicitly depend on the function.
5247
#[cfg(target_os = "macos")]
5348
{
5449
extern "C" {
55-
fn _rjem_je_zone_register();
50+
fn _mi_macos_override_malloc();
5651
}
5752

5853
#[used]
59-
static _F7: unsafe extern "C" fn() = _rjem_je_zone_register;
54+
static _F7: unsafe extern "C" fn() = _mi_macos_override_malloc;
6055
}
6156
}
6257

‎config.toml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,9 @@ changelog-seen = 2
582582
# Map debuginfo paths to `/rust/$sha/...`, generally only set for releases
583583
#remap-debuginfo = false
584584

585-
# Link the compiler against `jemalloc`, where on Linux and OSX it should
585+
# Link the compiler against `mimalloc`, where on Linux and OSX it should
586586
# override the default allocator for rustc and LLVM.
587-
#jemalloc = false
587+
#mimalloc = false
588588

589589
# Run tests in various test suites with the "nll compare mode" in addition to
590590
# running the tests in normal mode. Largely only used on CI and during local

‎src/bootstrap/config.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ pub struct Config {
151151
pub hosts: Vec<TargetSelection>,
152152
pub targets: Vec<TargetSelection>,
153153
pub local_rebuild: bool,
154-
pub jemalloc: bool,
154+
pub mimalloc: bool,
155155
pub control_flow_guard: bool,
156156

157157
// dist misc
@@ -512,7 +512,7 @@ struct Rust {
512512
verify_llvm_ir: Option<bool>,
513513
thin_lto_import_instr_limit: Option<u32>,
514514
remap_debuginfo: Option<bool>,
515-
jemalloc: Option<bool>,
515+
mimalloc: Option<bool>,
516516
test_compare_mode: Option<bool>,
517517
llvm_libunwind: Option<String>,
518518
control_flow_guard: Option<bool>,
@@ -878,7 +878,7 @@ impl Config {
878878
set(&mut config.rust_optimize_tests, rust.optimize_tests);
879879
set(&mut config.codegen_tests, rust.codegen_tests);
880880
set(&mut config.rust_rpath, rust.rpath);
881-
set(&mut config.jemalloc, rust.jemalloc);
881+
set(&mut config.mimalloc, rust.mimalloc);
882882
set(&mut config.test_compare_mode, rust.test_compare_mode);
883883
config.llvm_libunwind = rust
884884
.llvm_libunwind

‎src/bootstrap/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ impl Build {
677677
/// Gets the space-separated set of activated features for the compiler.
678678
fn rustc_features(&self) -> String {
679679
let mut features = String::new();
680-
if self.config.jemalloc {
681-
features.push_str("jemalloc");
680+
if self.config.mimalloc {
681+
features.push_str("mimalloc");
682682
}
683683
if self.config.llvm_enabled() {
684684
features.push_str(" llvm");

‎src/bootstrap/tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,8 @@ impl Step for Rustdoc {
536536
// to build rustdoc.
537537
//
538538
let mut features = Vec::new();
539-
if builder.config.jemalloc {
540-
features.push("jemalloc".to_string());
539+
if builder.config.mimalloc {
540+
features.push("mimalloc".to_string());
541541
}
542542

543543
let cargo = prepare_tool_cargo(

‎src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ RUN sh /scripts/sccache.sh
4343
ENV HOST=x86_64-unknown-haiku
4444
ENV TARGET=target.$HOST
4545

46-
ENV RUST_CONFIGURE_ARGS --disable-jemalloc \
47-
--set=$TARGET.cc=x86_64-unknown-haiku-gcc \
46+
ENV RUST_CONFIGURE_ARGS --set=$TARGET.cc=x86_64-unknown-haiku-gcc \
4847
--set=$TARGET.cxx=x86_64-unknown-haiku-g++ \
4948
--set=$TARGET.llvm-config=/bin/llvm-config-haiku
5049
ENV SCRIPT python3 ../x.py dist --host=$HOST --target=$HOST

‎src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ ENV RUST_CONFIGURE_ARGS \
110110
--set target.i686-unknown-linux-gnu.linker=clang \
111111
--build=i686-unknown-linux-gnu \
112112
--set llvm.ninja=false \
113-
--set rust.jemalloc
113+
--set rust.mimalloc
114114
ENV SCRIPT python3 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS
115115
ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
116116

‎src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ENV RUST_CONFIGURE_ARGS \
121121
--set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
122122
--set llvm.thin-lto=true \
123123
--set llvm.ninja=false \
124-
--set rust.jemalloc
124+
--set rust.mimalloc
125125
ENV SCRIPT ../src/ci/pgo.sh python3 ../x.py dist \
126126
--host $HOSTS --target $HOSTS \
127127
--include-default-paths \

‎src/ci/github-actions/ci.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ jobs:
453453
- name: dist-x86_64-apple
454454
env:
455455
SCRIPT: ./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended
456-
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
456+
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.mimalloc --set llvm.ninja=false
457457
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
458458
MACOSX_DEPLOYMENT_TARGET: 10.7
459459
NO_LLVM_ASSERTIONS: 1
@@ -465,7 +465,7 @@ jobs:
465465
- name: dist-x86_64-apple-alt
466466
env:
467467
SCRIPT: ./x.py dist
468-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
468+
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.mimalloc --set llvm.ninja=false
469469
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
470470
MACOSX_DEPLOYMENT_TARGET: 10.7
471471
NO_LLVM_ASSERTIONS: 1
@@ -476,7 +476,7 @@ jobs:
476476
- name: x86_64-apple
477477
env:
478478
SCRIPT: ./x.py --stage 2 test
479-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
479+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.mimalloc --set llvm.ninja=false
480480
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
481481
MACOSX_DEPLOYMENT_TARGET: 10.8
482482
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
@@ -496,7 +496,7 @@ jobs:
496496
--enable-full-tools
497497
--enable-sanitizers
498498
--enable-profiler
499-
--set rust.jemalloc
499+
--set rust.mimalloc
500500
--set llvm.ninja=false
501501
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
502502
USE_XCODE_CLANG: 1
@@ -506,14 +506,6 @@ jobs:
506506
NO_DEBUG_ASSERTIONS: 1
507507
NO_OVERFLOW_CHECKS: 1
508508
DIST_REQUIRE_ALL_TOOLS: 1
509-
# Corresponds to 16K page size
510-
#
511-
# Shouldn't be needed if jemalloc-sys is updated to
512-
# handle this platform like iOS or if we build on
513-
# aarch64-apple-darwin itself.
514-
#
515-
# https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237
516-
JEMALLOC_SYS_WITH_LG_PAGE: 14
517509
<<: *job-macos-xl
518510

519511
######################

‎src/librustdoc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"]
3131
expect-test = "1.0"
3232

3333
[features]
34-
jemalloc = []
34+
mimalloc = []
3535

3636
[package.metadata.rust-analyzer]
3737
rustc_private = true

0 commit comments

Comments
 (0)