Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -608,3 +608,5 @@ u32
POV
lossy
unrounded
unpadded
unyielded
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fundle_macros = { path = "crates/fundle_macros", default-features = false, versi
fundle_macros_impl = { path = "crates/fundle_macros_impl", default-features = false, version = "0.3.3" }
http_extensions = { path = "crates/http_extensions", default-features = false, version = "0.6.2" }
layered = { path = "crates/layered", default-features = false, version = "0.3.4" }
multitude = { path = "crates/multitude", default-features = false, version = "0.3.1" }
multitude = { path = "crates/multitude", default-features = false, version = "0.3.2" }
ohno = { path = "crates/ohno", default-features = false, version = "0.3.6" }
ohno_macros = { path = "crates/ohno_macros", default-features = false, version = "0.3.4" }
recoverable = { path = "crates/recoverable", default-features = false, version = "0.1.6" }
Expand Down
10 changes: 9 additions & 1 deletion crates/multitude/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[package]
name = "multitude"
version = "0.3.1"
version = "0.3.2"
description = "Fast and flexible arena allocator."
readme = "README.md"
keywords = ["arena", "memory", "allocator", "bump"]
Expand Down Expand Up @@ -91,6 +91,10 @@ harness = false
name = "criterion_drop"
harness = false

[[bench]]
name = "criterion_arc_array"
harness = false

# Callgrind benches require Linux (Valgrind). The bench files are gated to compile
# to a no-op on non-Linux targets, but the [[bench]] entry itself cannot be
# cfg-gated, so it is unconditional here.
Expand All @@ -102,6 +106,10 @@ harness = false
name = "gungraun_drop"
harness = false

[[bench]]
name = "gungraun_arc_array"
harness = false

[[example]]
name = "multitude_basic"

Expand Down
148 changes: 74 additions & 74 deletions crates/multitude/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,94 +397,94 @@ existing `_arc` slice methods).
This crate was developed as part of <a href="../..">The Oxidizer Project</a>. Browse this crate's <a href="https://github.com/microsoft/oxidizer/tree/main/crates/multitude">source code</a>.
</sub>

[__cargo_doc2readme_dependencies_info]: ggGmYW0CYXZlMC43LjJhdIQbLiTyV0MU86EbZU15e0PmecoboQ9jo59bnAEbyDXw04U13GlhYvRhcoQbBzV3ofWgqIgbt8brW1MeN_Mb9N6Ac8XJFEIbIYjmnKUrOjRhZIWCaGJ5dGVtdWNrZjEuMjUuMIJlYnl0ZXNmMS4xMS4xgmhieXRlc2J1ZmUwLjUuNYJpbXVsdGl0dWRlZTAuMy4xgmh6ZXJvY29weWYwLjguNTA
[__cargo_doc2readme_dependencies_info]: ggGmYW0CYXZlMC43LjJhdIQbLiTyV0MU86EbZU15e0PmecoboQ9jo59bnAEbyDXw04U13GlhYvRhcoQbBzV3ofWgqIgbt8brW1MeN_Mb9N6Ac8XJFEIbIYjmnKUrOjRhZIWCaGJ5dGVtdWNrZjEuMjUuMIJlYnl0ZXNmMS4xMS4xgmhieXRlc2J1ZmUwLjUuNYJpbXVsdGl0dWRlZTAuMy4ygmh6ZXJvY29weWYwLjguNTA
[__link0]: https://crates.io/crates/bumpalo
[__link1]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link10]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec
[__link1]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link10]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec
[__link11]: https://crates.io/crates/dst-factory
[__link12]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::format
[__link13]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::ArcUtf16Str
[__link14]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::BoxUtf16Str
[__link15]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::Utf16String
[__link16]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::format_utf16
[__link17]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link18]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link19]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena
[__link2]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link12]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::format
[__link13]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::ArcUtf16Str
[__link14]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::BoxUtf16Str
[__link15]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::Utf16String
[__link16]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::format_utf16
[__link17]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link18]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link19]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena
[__link2]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link20]: https://doc.rust-lang.org/stable/std/marker/trait.Send.html
[__link21]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link22]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link23]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link24]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link21]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link22]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link23]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link24]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link25]: https://doc.rust-lang.org/stable/alloc/?search=boxed::Box
[__link26]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec
[__link27]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link26]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec
[__link27]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
[__link28]: https://crates.io/crates/allocator-api2
[__link29]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link3]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link30]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec
[__link31]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String::into_boxed_str
[__link32]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link33]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link34]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec::into_boxed_slice
[__link35]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link36]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link37]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link38]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link39]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec::leak
[__link4]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link29]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
[__link3]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link30]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec
[__link31]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String::into_boxed_str
[__link32]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link33]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link34]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec::into_boxed_slice
[__link35]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link36]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link37]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link38]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link39]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec::leak
[__link4]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link40]: https://github.com/microsoft/oxidizer/blob/main/crates/multitude/BUMPALO.md
[__link41]: https://crates.io/crates/bumpalo
[__link42]: https://docs.rs/multitude/0.3.1/multitude/strings/index.html
[__link43]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link44]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::ArcUtf16Str
[__link45]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link46]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::BoxUtf16Str
[__link47]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena
[__link48]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link49]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::Utf16String
[__link5]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link50]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::format
[__link51]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::format_utf16
[__link52]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link53]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String::into_boxed_str
[__link54]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link55]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::Utf16String
[__link56]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::Utf16String::into_boxed_utf16_str
[__link57]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::BoxUtf16Str
[__link58]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link59]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena
[__link6]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link60]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::alloc_dst_arc
[__link61]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::alloc_dst_box
[__link42]: https://docs.rs/multitude/0.3.2/multitude/strings/index.html
[__link43]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link44]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::ArcUtf16Str
[__link45]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link46]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::BoxUtf16Str
[__link47]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena
[__link48]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
[__link49]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::Utf16String
[__link5]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link50]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::format
[__link51]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::format_utf16
[__link52]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
[__link53]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String::into_boxed_str
[__link54]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link55]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::Utf16String
[__link56]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::Utf16String::into_boxed_utf16_str
[__link57]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::BoxUtf16Str
[__link58]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link59]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena
[__link6]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link60]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::alloc_dst_arc
[__link61]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::alloc_dst_box
[__link62]: https://doc.rust-lang.org/stable/core/?search=alloc::Layout
[__link63]: https://crates.io/crates/dst-factory
[__link64]: https://doc.rust-lang.org/stable/std/?search=io::Write
[__link65]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec
[__link66]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link67]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link68]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link69]: https://docs.rs/multitude/0.3.1/multitude/?search=vec::Vec
[__link7]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link70]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::alloc_dst_arc
[__link71]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::alloc_dst_box
[__link72]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::ArcUtf16Str
[__link73]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::BoxUtf16Str
[__link74]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::Utf16String
[__link75]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::format_utf16
[__link65]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec
[__link66]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link67]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link68]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
[__link69]: https://docs.rs/multitude/0.3.2/multitude/?search=vec::Vec
[__link7]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link70]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::alloc_dst_arc
[__link71]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::alloc_dst_box
[__link72]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::ArcUtf16Str
[__link73]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::BoxUtf16Str
[__link74]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::Utf16String
[__link75]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::format_utf16
[__link76]: https://crates.io/crates/widestring
[__link77]: https://docs.rs/multitude/0.3.1/multitude/?search=zerocopy::ZerocopyView
[__link77]: https://docs.rs/multitude/0.3.2/multitude/?search=zerocopy::ZerocopyView
[__link78]: https://docs.rs/zerocopy/0.8.50/zerocopy/?search=FromZeros
[__link79]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::zerocopy
[__link8]: https://docs.rs/multitude/0.3.1/multitude/?search=Box
[__link80]: https://docs.rs/multitude/0.3.1/multitude/?search=bytemuck::BytemuckView
[__link79]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::zerocopy
[__link8]: https://docs.rs/multitude/0.3.2/multitude/?search=Box
[__link80]: https://docs.rs/multitude/0.3.2/multitude/?search=bytemuck::BytemuckView
[__link81]: https://docs.rs/bytemuck/1.25.0/bytemuck/?search=Zeroable
[__link82]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena::bytemuck
[__link82]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena::bytemuck
[__link83]: https://doc.rust-lang.org/stable/std/convert/trait.From.html
[__link84]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link85]: https://docs.rs/multitude/0.3.1/multitude/?search=Arc
[__link84]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link85]: https://docs.rs/multitude/0.3.2/multitude/?search=Arc
[__link86]: https://docs.rs/bytes/1.11.1/bytes/?search=Bytes
[__link87]: https://docs.rs/bytesbuf/0.5.5/bytesbuf/?search=mem::Memory
[__link88]: https://docs.rs/multitude/0.3.1/multitude/?search=Arena
[__link88]: https://docs.rs/multitude/0.3.2/multitude/?search=Arena
[__link89]: https://docs.rs/bytesbuf/0.5.5/bytesbuf/?search=BytesBuf
[__link9]: https://docs.rs/multitude/0.3.1/multitude/?search=strings::String
[__link9]: https://docs.rs/multitude/0.3.2/multitude/?search=strings::String
105 changes: 105 additions & 0 deletions crates/multitude/benches/criterion_arc_array.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//! Builds an `Arc<[Arc<[u8]>]>` of `PROPERTIES` binary blobs two ways and
//! compares them: `std::sync::Arc` (global allocator) vs `multitude::Arc`
#![allow(clippy::unwrap_used, reason = "benchmark code")]
#![allow(clippy::missing_panics_doc, reason = "benchmark code")]
#![allow(unused_results, reason = "benchmark code")]
#![allow(clippy::std_instead_of_core, reason = "benchmark code")]
#![allow(dead_code, reason = "array properties are held only to keep the allocation alive")]

use std::hint::black_box;
use std::sync::Arc as StdArc;

use criterion::{Criterion, criterion_group, criterion_main};
use multitude::{Arc as ArenaArc, Arena};

Comment thread
geeknoid marked this conversation as resolved.
// ---------------------------------------------------------------------------
// Array shape: `PROPERTIES` binary blobs of `PROPERTY_SIZE` bytes each.
// ---------------------------------------------------------------------------

const PROPERTIES: usize = 8;
const PROPERTY_SIZE: usize = 16;

// ---------------------------------------------------------------------------
// Global-allocator array
// ---------------------------------------------------------------------------

fn build_global(payload: &[u8]) -> StdArc<[StdArc<[u8]>]> {
let mut properties = Vec::with_capacity(PROPERTIES);
for _ in 0..PROPERTIES {
properties.push(StdArc::<[u8]>::from(payload));
}
StdArc::from(properties)
}

fn build_global_from_slice(properties: &[StdArc<[u8]>]) -> StdArc<[StdArc<[u8]>]> {
Comment thread
geeknoid marked this conversation as resolved.
StdArc::from(properties)
}

// ---------------------------------------------------------------------------
// Arena-backed array
// ---------------------------------------------------------------------------

fn build_arena(arena: &Arena, payload: &[u8]) -> ArenaArc<[ArenaArc<[u8]>]> {
let mut properties = arena.alloc_vec_with_capacity::<ArenaArc<[u8]>>(PROPERTIES);
for _ in 0..PROPERTIES {
properties.push(arena.alloc_slice_copy_arc(payload));
}
properties.try_into_arc().unwrap()
}

fn build_arena_from_slice(arena: &Arena, properties: &[StdArc<[u8]>]) -> ArenaArc<[StdArc<[u8]>]> {
arena.alloc_slice_clone_arc(properties)
}

fn global_properties(payload: &[u8]) -> Vec<StdArc<[u8]>> {
(0..PROPERTIES).map(|_| StdArc::<[u8]>::from(payload)).collect()
}

// ---------------------------------------------------------------------------
// Criterion timing + per-iteration allocation tracking
// ---------------------------------------------------------------------------

fn bench_arc_array(c: &mut Criterion) {
let payload = vec![0xABu8; PROPERTY_SIZE];

let mut group = c.benchmark_group("arc_array");

group.bench_function("global", |b| {
b.iter(|| {
black_box(build_global(black_box(&payload)));
});
});

let arena = Arena::new();
black_box(build_arena(&arena, &payload));

group.bench_function("arena", |b| {
b.iter(|| {
black_box(build_arena(&arena, black_box(&payload)));
});
});

let global_props = global_properties(&payload);
group.bench_function("global_from_slice", |b| {
b.iter(|| {
black_box(build_global_from_slice(black_box(&global_props)));
});
});

let work_arena = Arena::new();
black_box(build_arena_from_slice(&work_arena, &global_props));

group.bench_function("arena_from_slice", |b| {
b.iter(|| {
black_box(build_arena_from_slice(&work_arena, black_box(&global_props)));
});
});

group.finish();
}

criterion_group!(benches, bench_arc_array);
criterion_main!(benches);
Loading
Loading