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.

Sign up for GitHub

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

Primary caching 1: more VecDeque extensions #4592

Merged
merged 3 commits into from
Dec 22, 2023
+331 −86
Merged

Primary caching 1: more VecDeque extensions #4592

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
132420c
more VecDeque goodies
teh-cmc Dec 19, 2023
cd058d8
remove nonsense truncate_at that has no business being here
teh-cmc Dec 21, 2023
55cce95
smoother remove_range impl (saved by benchmarks once again)
teh-cmc Dec 21, 2023
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
262 changes: 182 additions & 80 deletions crates/re_log_types/benches/vec_deque_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
//! Simple benchmark suite to keep track of how the different removal methods for [`VecDeque`]
//! behave in practice.

#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

use std::collections::VecDeque;

use criterion::{criterion_group, criterion_main, Criterion};
use itertools::Itertools;

use re_log_types::VecDequeRemovalExt as _;
use re_log_types::{VecDequeInsertionExt as _, VecDequeRemovalExt as _};

// ---

criterion_group!(benches, remove, swap_remove, swap_remove_front);
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

criterion_group!(
benches,
insert_range,
remove_range,
remove,
swap_remove,
swap_remove_front,
);
criterion_main!(benches);

// ---
Expand All @@ -21,109 +29,203 @@ criterion_main!(benches);
#[cfg(debug_assertions)]
mod constants {
pub const INITIAL_NUM_ENTRIES: usize = 1;
pub const NUM_MODIFIED_ELEMENTS: usize = 1;
}

#[cfg(not(debug_assertions))]
mod constants {
pub const INITIAL_NUM_ENTRIES: usize = 20_000;
pub const NUM_MODIFIED_ELEMENTS: usize = 1_000;
}

#[allow(clippy::wildcard_imports)]
use self::constants::*;

// ---

fn remove(c: &mut Criterion) {
{
let mut group = c.benchmark_group("flat_vec_deque");
group.throughput(criterion::Throughput::Elements(1));
group.bench_function("remove/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(0);
v
});
fn insert_range(c: &mut Criterion) {
if std::env::var("CI").is_ok() {
return;
}

let inserted = (0..NUM_MODIFIED_ELEMENTS as i64).collect_vec();

let mut group = c.benchmark_group("vec_deque");
group.throughput(criterion::Throughput::Elements(inserted.len() as _));

group.bench_function("insert_range/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.insert_range(0, inserted.clone().into_iter());
v
});
group.bench_function("remove/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(INITIAL_NUM_ENTRIES / 2);
v
});
});

group.bench_function("insert_range/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.insert_range(INITIAL_NUM_ENTRIES / 2, inserted.clone().into_iter());
v
});
group.bench_function("remove/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(INITIAL_NUM_ENTRIES - 1);
v
});
});

group.bench_function("insert_range/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.insert_range(INITIAL_NUM_ENTRIES, inserted.clone().into_iter());
v
});
});
}

fn remove_range(c: &mut Criterion) {
if std::env::var("CI").is_ok() {
return;
}

let mut group = c.benchmark_group("vec_deque");
group.throughput(criterion::Throughput::Elements(NUM_MODIFIED_ELEMENTS as _));

group.bench_function("remove_range/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove_range(0..NUM_MODIFIED_ELEMENTS);
v
});
});

group.bench_function("remove_range/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove_range(
INITIAL_NUM_ENTRIES / 2 - NUM_MODIFIED_ELEMENTS / 2
..INITIAL_NUM_ENTRIES / 2 + NUM_MODIFIED_ELEMENTS / 2,
);
v
});
});

group.bench_function("remove_range/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove_range(INITIAL_NUM_ENTRIES - NUM_MODIFIED_ELEMENTS..INITIAL_NUM_ENTRIES);
v
});
});
}

fn swap_remove(c: &mut Criterion) {
{
let mut group = c.benchmark_group("flat_vec_deque");
group.throughput(criterion::Throughput::Elements(1));
group.bench_function("swap_remove/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(0);
v
});
fn remove(c: &mut Criterion) {
if std::env::var("CI").is_ok() {
return;
}

let mut group = c.benchmark_group("vec_deque");
group.throughput(criterion::Throughput::Elements(1));

group.bench_function("remove/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(0);
v
});
group.bench_function("swap_remove/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(INITIAL_NUM_ENTRIES / 2);
v
});
});

group.bench_function("remove/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(INITIAL_NUM_ENTRIES / 2);
v
});
group.bench_function("swap_remove/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(INITIAL_NUM_ENTRIES - 1);
v
});
});

group.bench_function("remove/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.remove(INITIAL_NUM_ENTRIES - 1);
v
});
});
}

fn swap_remove(c: &mut Criterion) {
if std::env::var("CI").is_ok() {
return;
}

let mut group = c.benchmark_group("vec_deque");
group.throughput(criterion::Throughput::Elements(1));

group.bench_function("swap_remove/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(0);
v
});
});

group.bench_function("swap_remove/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(INITIAL_NUM_ENTRIES / 2);
v
});
});

group.bench_function("swap_remove/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove(INITIAL_NUM_ENTRIES - 1);
v
});
});
}

fn swap_remove_front(c: &mut Criterion) {
{
let mut group = c.benchmark_group("flat_vec_deque");
group.throughput(criterion::Throughput::Elements(1));
group.bench_function("swap_remove_front/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(0);
v
});
if std::env::var("CI").is_ok() {
return;
}

let mut group = c.benchmark_group("vec_deque");
group.throughput(criterion::Throughput::Elements(1));

group.bench_function("swap_remove_front/prefilled/front", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(0);
v
});
group.bench_function("swap_remove_front/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(INITIAL_NUM_ENTRIES / 2);
v
});
});

group.bench_function("swap_remove_front/prefilled/middle", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(INITIAL_NUM_ENTRIES / 2);
v
});
group.bench_function("swap_remove_front/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(INITIAL_NUM_ENTRIES - 1);
v
});
});

group.bench_function("swap_remove_front/prefilled/back", |b| {
let base = create_prefilled();
b.iter(|| {
let mut v: VecDeque<i64> = base.clone();
v.swap_remove_front(INITIAL_NUM_ENTRIES - 1);
v
});
}
});
}

// ---
Expand Down
2 changes: 1 addition & 1 deletion crates/re_log_types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub use self::time::{Duration, Time, TimeZone};
pub use self::time_point::{TimeInt, TimePoint, TimeType, Timeline, TimelineName};
pub use self::time_range::{TimeRange, TimeRangeF};
pub use self::time_real::TimeReal;
pub use self::vec_deque_ext::{VecDequeRemovalExt, VecDequeSortingExt};
pub use self::vec_deque_ext::{VecDequeInsertionExt, VecDequeRemovalExt, VecDequeSortingExt};

#[cfg(not(target_arch = "wasm32"))]
pub use self::data_table_batcher::{
Expand Down
Loading
Loading