From ed44bcd0c4237c4e7a71d131ea1301e4bc31ae84 Mon Sep 17 00:00:00 2001 From: Ammar Abou Zor Date: Thu, 24 Oct 2024 09:36:38 +0200 Subject: [PATCH] Remove `jemalloc` allocator benchmarks `jemalloc` support on windows is not stable yet. --- application/apps/indexer/Cargo.lock | 21 ------------------- application/apps/indexer/Cargo.toml | 1 - application/apps/indexer/sources/Cargo.toml | 9 -------- .../benches/mocks_multi_producer_jemalloc.rs | 9 -------- .../benches/mocks_once_producer_jemalloc.rs | 8 ------- cli/config/bench_core.toml | 8 ------- 6 files changed, 56 deletions(-) delete mode 100644 application/apps/indexer/sources/benches/mocks_multi_producer_jemalloc.rs delete mode 100644 application/apps/indexer/sources/benches/mocks_once_producer_jemalloc.rs diff --git a/application/apps/indexer/Cargo.lock b/application/apps/indexer/Cargo.lock index 0481cd469..5ed4272a0 100644 --- a/application/apps/indexer/Cargo.lock +++ b/application/apps/indexer/Cargo.lock @@ -2056,7 +2056,6 @@ dependencies = [ "serde", "shellexpand", "thiserror", - "tikv-jemallocator", "tokio", "tokio-serial", "tokio-stream", @@ -2205,26 +2204,6 @@ dependencies = [ "syn 2.0.85", ] -[[package]] -name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/application/apps/indexer/Cargo.toml b/application/apps/indexer/Cargo.toml index 819348e34..d16b96312 100644 --- a/application/apps/indexer/Cargo.toml +++ b/application/apps/indexer/Cargo.toml @@ -40,7 +40,6 @@ env_logger = "0.10" # Support for `html_reports` needs running the benchmarks via `cargo-criterion` tool. criterion = { version = "0.5", features = ["html_reports"] } mimalloc = "0.1" -tikv-jemallocator = "0.6" # only uncomment when profiling # [profile.release] diff --git a/application/apps/indexer/sources/Cargo.toml b/application/apps/indexer/sources/Cargo.toml index 5b1b519ac..1b8e6cd9d 100644 --- a/application/apps/indexer/sources/Cargo.toml +++ b/application/apps/indexer/sources/Cargo.toml @@ -29,16 +29,11 @@ shellexpand = "3.0.0" env_logger.workspace = true criterion = { workspace = true, features = ["async_tokio"] } mimalloc.workspace = true -tikv-jemallocator.workspace = true [[bench]] name = "mocks_once_producer" harness = false -[[bench]] -name = "mocks_once_producer_jemalloc" -harness = false - [[bench]] name = "mocks_once_producer_sysalloc" harness = false @@ -47,10 +42,6 @@ harness = false name = "mocks_multi_producer" harness = false -[[bench]] -name = "mocks_multi_producer_jemalloc" -harness = false - [[bench]] name = "mocks_multi_producer_sysalloc" harness = false diff --git a/application/apps/indexer/sources/benches/mocks_multi_producer_jemalloc.rs b/application/apps/indexer/sources/benches/mocks_multi_producer_jemalloc.rs deleted file mode 100644 index 636dafbd6..000000000 --- a/application/apps/indexer/sources/benches/mocks_multi_producer_jemalloc.rs +++ /dev/null @@ -1,9 +0,0 @@ -//! Benchmarks for producer loop with mock parser and byte source using `jemalloc` memory allocator, -//! which provides the best performance and is used in Chipmunk app currently. -//! -//! The mock of [`parsers::Parser`] will return iterator with multiple value replicating the -//! behavior of the potential plugins in Chipmunk. - -mod macros; - -mocks_producer_multi!(mocks_multi_producer_jemalloc, tikv_jemallocator::Jemalloc); diff --git a/application/apps/indexer/sources/benches/mocks_once_producer_jemalloc.rs b/application/apps/indexer/sources/benches/mocks_once_producer_jemalloc.rs deleted file mode 100644 index 956e1552b..000000000 --- a/application/apps/indexer/sources/benches/mocks_once_producer_jemalloc.rs +++ /dev/null @@ -1,8 +0,0 @@ -//! Benchmarks for producer loop with mock parser and byte source using `jemalloc` memory allocator. -//! -//! The mock of [`parsers::Parser`] will return [`std::iter::once()`] replicating the behavior of -//! the current built-in parsers in Chipmunk. - -mod macros; - -mocks_producer_once!(mocks_once_producer_jemalloc, tikv_jemallocator::Jemalloc); diff --git a/cli/config/bench_core.toml b/cli/config/bench_core.toml index 703787a53..c1149c907 100644 --- a/cli/config/bench_core.toml +++ b/cli/config/bench_core.toml @@ -2,10 +2,6 @@ name = "mocks_once_producer" library = "sources" -[[bench]] -name = "mocks_once_producer_jemalloc" -library = "sources" - [[bench]] name = "mocks_once_producer_sysalloc" library = "sources" @@ -14,10 +10,6 @@ library = "sources" name = "mocks_multi_producer" library = "sources" -[[bench]] -name = "mocks_multi_producer_jemalloc" -library = "sources" - [[bench]] name = "mocks_multi_producer_sysalloc" library = "sources"