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: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ To select workloads and inspect repeated measurements:

```shell
cargo x bench -- cpc::serde --repeat 10 --raw
cargo x bench -- xor::matched_build::8 --repeat 5
cargo x bench -- xor::build::8 --repeat 5
cargo x bench -- 'kll::query::quantile/0.5' --exact --rounds 100000
```

Expand Down
133 changes: 87 additions & 46 deletions benchmarks/xor/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ use datasketches::xor::XorFilterType;

use crate::xor::hashes;

fn datasketches_distinct_8(bencher: Bencher, cardinality: usize) {
// Repeated values model a column batch with four rows per distinct hash.
fn repeated_hashes(rows: usize) -> Vec<u64> {
hashes(rows / 4).into_iter().cycle().take(rows).collect()
}

fn distinct_8(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| {
black_box(
Expand All @@ -35,8 +40,13 @@ fn datasketches_distinct_8(bencher: Bencher, cardinality: usize) {
});
}

fn datasketches_deduplicate_8(bencher: Bencher, cardinality: usize) {
fn xorf_distinct_8(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor8::from(keys.as_slice())));
}

fn deduplicate_8(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
black_box(
XorFilterBuilder::new(XorFilterType::Xor8)
Expand All @@ -46,12 +56,18 @@ fn datasketches_deduplicate_8(bencher: Bencher, cardinality: usize) {
});
}

fn xorf_8(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor8::from_iterator(keys.iter().copied())));
fn xorf_deduplicate_8(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
// xorf requires distinct input, so include the caller's preprocessing.
let mut distinct = keys.clone();
distinct.sort_unstable();
distinct.dedup();
black_box(xorf::Xor8::from(distinct.as_slice()))
});
}

fn datasketches_distinct_16(bencher: Bencher, cardinality: usize) {
fn distinct_16(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| {
black_box(
Expand All @@ -62,8 +78,13 @@ fn datasketches_distinct_16(bencher: Bencher, cardinality: usize) {
});
}

fn datasketches_deduplicate_16(bencher: Bencher, cardinality: usize) {
fn xorf_distinct_16(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor16::from(keys.as_slice())));
}

fn deduplicate_16(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
black_box(
XorFilterBuilder::new(XorFilterType::Xor16)
Expand All @@ -73,12 +94,18 @@ fn datasketches_deduplicate_16(bencher: Bencher, cardinality: usize) {
});
}

fn xorf_16(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor16::from_iterator(keys.iter().copied())));
fn xorf_deduplicate_16(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
// xorf requires distinct input, so include the caller's preprocessing.
let mut distinct = keys.clone();
distinct.sort_unstable();
distinct.dedup();
black_box(xorf::Xor16::from(distinct.as_slice()))
});
}

fn datasketches_distinct_32(bencher: Bencher, cardinality: usize) {
fn distinct_32(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| {
black_box(
Expand All @@ -89,8 +116,13 @@ fn datasketches_distinct_32(bencher: Bencher, cardinality: usize) {
});
}

fn datasketches_deduplicate_32(bencher: Bencher, cardinality: usize) {
fn xorf_distinct_32(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor32::from(keys.as_slice())));
}

fn deduplicate_32(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
black_box(
XorFilterBuilder::new(XorFilterType::Xor32)
Expand All @@ -100,56 +132,65 @@ fn datasketches_deduplicate_32(bencher: Bencher, cardinality: usize) {
});
}

fn xorf_32(bencher: Bencher, cardinality: usize) {
let keys = hashes(cardinality);
bencher.bench_local(|| black_box(xorf::Xor32::from_iterator(keys.iter().copied())));
fn xorf_deduplicate_32(bencher: Bencher, rows: usize) {
let keys = repeated_hashes(rows);
bencher.bench_local(|| {
// xorf requires distinct input, so include the caller's preprocessing.
let mut distinct = keys.clone();
distinct.sort_unstable();
distinct.dedup();
black_box(xorf::Xor32::from(distinct.as_slice()))
});
}

pub fn register(runner: &mut Runner) {
let cases = &[
(1_000, 60_000),
(16_384, 2_000),
(49_999, 600),
(50_000, 600),
(50_001, 600),
(100_000, 200),
];
for &(cardinality, rounds) in cases {
for (size, rounds) in [(1_000, 60_000), (16_384, 2_000), (1_000_000, 12)] {
runner.compare(
&format!("xor::build::8/{cardinality}"),
&format!("xor::build::8_distinct/{size}"),
rounds,
&[
("distinct", &|b| datasketches_distinct_8(b, cardinality)),
("deduplicate", &|b| {
datasketches_deduplicate_8(b, cardinality)
}),
("xorf", &|b| xorf_8(b, cardinality)),
("DataSketches", &|b| distinct_8(b, size)),
("xorf", &|b| xorf_distinct_8(b, size)),
],
);
}
for &(cardinality, rounds) in cases {
runner.compare(
&format!("xor::build::16/{cardinality}"),
&format!("xor::build::8_deduplicate/{size}"),
rounds,
&[
("distinct", &|b| datasketches_distinct_16(b, cardinality)),
("deduplicate", &|b| {
datasketches_deduplicate_16(b, cardinality)
}),
("xorf", &|b| xorf_16(b, cardinality)),
("DataSketches", &|b| deduplicate_8(b, size)),
("xorf", &|b| xorf_deduplicate_8(b, size)),
],
);
runner.compare(
&format!("xor::build::16_distinct/{size}"),
rounds,
&[
("DataSketches", &|b| distinct_16(b, size)),
("xorf", &|b| xorf_distinct_16(b, size)),
],
);
runner.compare(
&format!("xor::build::16_deduplicate/{size}"),
rounds,
&[
("DataSketches", &|b| deduplicate_16(b, size)),
("xorf", &|b| xorf_deduplicate_16(b, size)),
],
);
runner.compare(
&format!("xor::build::32_distinct/{size}"),
rounds,
&[
("DataSketches", &|b| distinct_32(b, size)),
("xorf", &|b| xorf_distinct_32(b, size)),
],
);
}
for &(cardinality, rounds) in cases {
runner.compare(
&format!("xor::build::32/{cardinality}"),
&format!("xor::build::32_deduplicate/{size}"),
rounds,
&[
("distinct", &|b| datasketches_distinct_32(b, cardinality)),
("deduplicate", &|b| {
datasketches_deduplicate_32(b, cardinality)
}),
("xorf", &|b| xorf_32(b, cardinality)),
("DataSketches", &|b| deduplicate_32(b, size)),
("xorf", &|b| xorf_deduplicate_32(b, size)),
],
);
}
Expand Down
149 changes: 0 additions & 149 deletions benchmarks/xor/matched_build.rs

This file was deleted.

2 changes: 0 additions & 2 deletions benchmarks/xor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

mod build;
mod build_batches;
mod matched_build;
mod query;
mod query_shards;

Expand All @@ -40,7 +39,6 @@ fn hashes_with_offset(count: usize, offset: u64) -> Vec<u64> {
pub fn register(runner: &mut benchmarks::Runner) {
build::register(runner);
build_batches::register(runner);
matched_build::register(runner);
query::register(runner);
query_shards::register(runner);
}
Loading
Loading