Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Use mimalloc as the default allocator #7059

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ tracing-web = "0.1.3"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
rust-embed = "6.6.0"

tikv-jemallocator = "0.5"

[profile.dev]
# This is required to be able to run `cargo test` in acvm_js due to the `locals exceeds maximum` error.
# See https://ritik-mishra.medium.com/resolving-the-wasm-pack-error-locals-exceed-maximum-ec3a9d96685b
Expand Down
3 changes: 3 additions & 0 deletions tooling/acvm_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ const_format.workspace = true
bn254_blackbox_solver.workspace = true
acir.workspace = true

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator.workspace = true

# Logs
tracing-subscriber.workspace = true
tracing-appender = "0.2.3"
Expand Down
7 changes: 7 additions & 0 deletions tooling/acvm_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
use tracing_appender::rolling;
use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};

#[cfg(not(target_env = "msvc"))]

Check warning on line 14 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (msvc)
use tikv_jemallocator::Jemalloc;

Check warning on line 15 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (tikv)

Check warning on line 15 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (jemallocator)

Check warning on line 15 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Jemalloc)

#[cfg(not(target_env = "msvc"))]

Check warning on line 17 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (msvc)
#[global_allocator]
static GLOBAL: Jemalloc = Jemalloc;

Check warning on line 19 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Jemalloc)

Check warning on line 19 in tooling/acvm_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Jemalloc)

fn main() {
// Setup tracing
if let Ok(log_dir) = env::var("ACVM_LOG_DIR") {
Expand Down
3 changes: 3 additions & 0 deletions tooling/nargo_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ tracing-appender = "0.2.3"
clap_complete = "4.5.36"
fs2 = "0.4.3"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator.workspace = true

[target.'cfg(not(unix))'.dependencies]
tokio-util = { version = "0.7.8", features = ["compat"] }

Expand Down
7 changes: 7 additions & 0 deletions tooling/nargo_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@

const PANIC_MESSAGE: &str = "This is a bug. We may have already fixed this in newer versions of Nargo so try searching for similar issues at https://github.com/noir-lang/noir/issues/.\nIf there isn't an open issue for this bug, consider opening one at https://github.com/noir-lang/noir/issues/new?labels=bug&template=bug_report.yml";

#[cfg(not(target_env = "msvc"))]

Check warning on line 22 in tooling/nargo_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (msvc)
use tikv_jemallocator::Jemalloc;

Check warning on line 23 in tooling/nargo_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (tikv)

Check warning on line 23 in tooling/nargo_cli/src/main.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (jemallocator)

#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static GLOBAL: Jemalloc = Jemalloc;

fn main() {
setup_tracing();

Expand Down
3 changes: 3 additions & 0 deletions tooling/profiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ noirc_evaluator.workspace = true
tracing-subscriber.workspace = true
tracing-appender = "0.2.3"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator.workspace = true

[dev-dependencies]
noirc_abi.workspace = true
noirc_driver.workspace = true
Expand Down
7 changes: 7 additions & 0 deletions tooling/profiler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ use std::env;
use tracing_appender::rolling;
use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};

#[cfg(not(target_env = "msvc"))]
use tikv_jemallocator::Jemalloc;

#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static GLOBAL: Jemalloc = Jemalloc;

fn main() {
// Setup tracing
if let Ok(log_dir) = env::var("PROFILER_LOG_DIR") {
Expand Down
Loading