Skip to content

Commit 549803c

Browse files
lqdlqd
committed
tmp: test mimalloc 2.0.6
swap out jemalloc for mimalloc 2.x to have up to date numbers for comparison
1 parent 160b194 commit 549803c

File tree

4 files changed

+45
-60
lines changed

4 files changed

+45
-60
lines changed

‎Cargo.lock‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,12 @@ dependencies = [
10341034
"quote",
10351035
]
10361036

1037+
[[package]]
1038+
name = "cty"
1039+
version = "0.2.2"
1040+
source = "registry+https://github.com/rust-lang/crates.io-index"
1041+
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
1042+
10371043
[[package]]
10381044
name = "curl"
10391045
version = "0.4.44"
@@ -1388,12 +1394,6 @@ version = "2.8.1"
13881394
source = "registry+https://github.com/rust-lang/crates.io-index"
13891395
checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"
13901396

1391-
[[package]]
1392-
name = "fs_extra"
1393-
version = "1.1.0"
1394-
source = "registry+https://github.com/rust-lang/crates.io-index"
1395-
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
1396-
13971397
[[package]]
13981398
name = "futf"
13991399
version = "0.1.5"
@@ -1867,17 +1867,6 @@ version = "1.0.2"
18671867
source = "registry+https://github.com/rust-lang/crates.io-index"
18681868
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
18691869

1870-
[[package]]
1871-
name = "jemalloc-sys"
1872-
version = "0.5.0+5.3.0"
1873-
source = "registry+https://github.com/rust-lang/crates.io-index"
1874-
checksum = "f655c3ecfa6b0d03634595b4b54551d4bd5ac208b9e0124873949a7ab168f70b"
1875-
dependencies = [
1876-
"cc",
1877-
"fs_extra",
1878-
"libc",
1879-
]
1880-
18811870
[[package]]
18821871
name = "jobserver"
18831872
version = "0.1.24"
@@ -2002,6 +1991,16 @@ version = "0.1.4"
20021991
source = "registry+https://github.com/rust-lang/crates.io-index"
20031992
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
20041993

1994+
[[package]]
1995+
name = "libmimalloc-sys"
1996+
version = "0.1.26"
1997+
source = "registry+https://github.com/rust-lang/crates.io-index"
1998+
checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48"
1999+
dependencies = [
2000+
"cc",
2001+
"cty",
2002+
]
2003+
20052004
[[package]]
20062005
name = "libnghttp2-sys"
20072006
version = "0.1.4+1.41.0"
@@ -3070,7 +3069,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
30703069
name = "rustc-main"
30713070
version = "0.0.0"
30723071
dependencies = [
3073-
"jemalloc-sys",
3072+
"libmimalloc-sys",
30743073
"rustc_codegen_ssa",
30753074
"rustc_driver",
30763075
"rustc_smir",

‎compiler/rustc/Cargo.toml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
1313
# crate is intended to be used by stable MIR consumers, which are not in-tree
1414
rustc_smir = { path = "../rustc_smir" }
1515

16-
[dependencies.jemalloc-sys]
17-
version = "0.5.0"
16+
# [dependencies.jemalloc-sys]
17+
# version = "0.5.0"
18+
# optional = true
19+
# features = ['unprefixed_malloc_on_supported_platforms']
20+
21+
[dependencies.libmimalloc-sys]
22+
version = '0.1.26'
1823
optional = true
19-
features = ['unprefixed_malloc_on_supported_platforms']
24+
default-features = false
25+
features = ['extended', 'override']
2026

2127
[features]
22-
jemalloc = ['jemalloc-sys']
28+
jemalloc = ['libmimalloc-sys']
2329
llvm = ['rustc_driver/llvm']
2430
max_level_info = ['rustc_driver/max_level_info']
2531
rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler']

‎compiler/rustc/src/main.rs‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,25 @@
2828
#[unix_sigpipe = "sig_dfl"]
2929
fn main() {
3030
// See the comment at the top of this file for an explanation of this.
31-
#[cfg(feature = "jemalloc-sys")]
31+
#[cfg(feature = "libmimalloc-sys")]
3232
{
3333
use std::os::raw::{c_int, c_void};
3434

3535
#[used]
36-
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
36+
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = libmimalloc_sys::mi_calloc;
3737
#[used]
3838
static _F2: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
39-
jemalloc_sys::posix_memalign;
39+
libmimalloc_sys::mi_posix_memalign;
4040
#[used]
41-
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::aligned_alloc;
41+
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void =
42+
libmimalloc_sys::mi_aligned_alloc;
4243
#[used]
43-
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = jemalloc_sys::malloc;
44+
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = libmimalloc_sys::mi_malloc;
4445
#[used]
45-
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = jemalloc_sys::realloc;
46+
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void =
47+
libmimalloc_sys::mi_realloc;
4648
#[used]
47-
static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
48-
49-
// On OSX, jemalloc doesn't directly override malloc/free, but instead
50-
// registers itself with the allocator's zone APIs in a ctor. However,
51-
// the linker doesn't seem to consider ctors as "used" when statically
52-
// linking, so we need to explicitly depend on the function.
53-
#[cfg(target_os = "macos")]
54-
{
55-
extern "C" {
56-
fn _rjem_je_zone_register();
57-
}
58-
59-
#[used]
60-
static _F7: unsafe extern "C" fn() = _rjem_je_zone_register;
61-
}
49+
static _F6: unsafe extern "C" fn(*mut c_void) = libmimalloc_sys::mi_free;
6250
}
6351

6452
rustc_driver::main()

‎src/librustdoc/lib.rs‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extern crate test;
6565
// See docs in https://github.com/rust-lang/rust/blob/master/compiler/rustc/src/main.rs
6666
// about jemalloc.
6767
#[cfg(feature = "jemalloc")]
68-
extern crate jemalloc_sys;
68+
extern crate libmimalloc_sys;
6969

7070
use std::default::Default;
7171
use std::env::{self, VarError};
@@ -130,28 +130,20 @@ pub fn main() {
130130
use std::os::raw::{c_int, c_void};
131131

132132
#[used]
133-
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
133+
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = libmimalloc_sys::mi_calloc;
134134
#[used]
135135
static _F2: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
136-
jemalloc_sys::posix_memalign;
136+
libmimalloc_sys::mi_posix_memalign;
137137
#[used]
138-
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::aligned_alloc;
138+
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void =
139+
libmimalloc_sys::mi_aligned_alloc;
139140
#[used]
140-
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = jemalloc_sys::malloc;
141+
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = libmimalloc_sys::mi_malloc;
141142
#[used]
142-
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = jemalloc_sys::realloc;
143+
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void =
144+
libmimalloc_sys::mi_realloc;
143145
#[used]
144-
static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
145-
146-
#[cfg(target_os = "macos")]
147-
{
148-
extern "C" {
149-
fn _rjem_je_zone_register();
150-
}
151-
152-
#[used]
153-
static _F7: unsafe extern "C" fn() = _rjem_je_zone_register;
154-
}
146+
static _F6: unsafe extern "C" fn(*mut c_void) = libmimalloc_sys::mi_free;
155147
}
156148

157149
rustc_driver::install_ice_hook();

0 commit comments

Comments
 (0)