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

Misc test/benchmark updates, and Sync for Sender/Reciever #27

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Misc test/benchmark updates, and Sync for Sender/Reciever #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45adcec
The size of the waker has decreased
Dr-Emann May 30, 2023
ef0a405
Cleanup some benchmarks
Dr-Emann May 30, 2023
4f2ca40
Bump criterion version
Dr-Emann May 30, 2023
7387b4f
Add a recv only successful benchmark
Dr-Emann May 30, 2023
879e3de
Implment Sync for Sender/Receiver
Dr-Emann May 30, 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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async = []
loom = { version = "0.5.3", features = ["futures"] }

[dev-dependencies]
criterion = "0.3"
criterion = { version = "0.5", features = ["html_reports"] }

[target.'cfg(not(loom))'.dev-dependencies]
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "time"] }
Expand Down
144 changes: 101 additions & 43 deletions benches/benches.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,132 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use criterion::{black_box, criterion_group, criterion_main, Criterion, BenchmarkGroup, BenchmarkId, Throughput, BatchSize};
use std::mem;
use std::time::{Duration, Instant};
use criterion::measurement::WallTime;

criterion_group!(benches, bench);
criterion_main!(benches);

macro_rules! bench_send_and_recv {
($c:expr, $($type:ty => $value:expr);+) => {
($c:expr; $($size:expr),+ $(,)?) => {
// Sanity check that all $values are of $type.
$(let _: $type = $value;)*
{
let mut group = $c.benchmark_group("create_channel");
$(group.bench_function(stringify!($type), |b| {
b.iter(oneshot::channel::<$type>)
});)*
$(create::<$size>(&mut group);)+
group.finish();
}
{
let mut group = $c.benchmark_group("create_and_send");
$(group.bench_function(stringify!($type), |b| {
b.iter(|| {
let (sender, _receiver) = oneshot::channel();
sender.send(black_box($value)).unwrap()
});
});)*
let mut group = $c.benchmark_group("send");
$(send::<$size>(&mut group);)+
group.finish();
}
{
let mut group = $c.benchmark_group("create_and_send_on_closed");
$(group.bench_function(stringify!($type), |b| {
b.iter(|| {
let (sender, _) = oneshot::channel();
sender.send(black_box($value)).unwrap_err()
});
});)*
let mut group = $c.benchmark_group("send_on_closed");
$(send_on_closed::<$size>(&mut group);)+
group.finish();
}
{
let mut group = $c.benchmark_group("create_send_and_recv");
$(group.bench_function(stringify!($type), |b| {
b.iter(|| {
let (sender, receiver) = oneshot::channel();
sender.send(black_box($value)).unwrap();
receiver.recv().unwrap()
});
});)*
let mut group = $c.benchmark_group("send_and_recv");
$(send_and_recv::<$size>(&mut group);)+
group.finish();
}
{
let mut group = $c.benchmark_group("create_send_and_recv_ref");
$(group.bench_function(stringify!($type), |b| {
b.iter(|| {
let (sender, receiver) = oneshot::channel();
sender.send(black_box($value)).unwrap();
receiver.recv_ref().unwrap()
});
});)*
let mut group = $c.benchmark_group("send_and_recv_ref");
$(send_and_recv_ref::<$size>(&mut group);)+
group.finish();
}
{
let mut group = $c.benchmark_group("recv");
$(recv::<$size>(&mut group);)+
group.finish();
}
};
}

fn create<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter(oneshot::channel::<[u8; N]>);
});
}

fn send<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.throughput(Throughput::Bytes(N as u64));
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter_batched(
|| oneshot::channel::<[u8; N]>(),
|(sender, _receiver)| {
sender.send(black_box([0b10101010u8; N])).unwrap()
},
BatchSize::SmallInput,
);
});
}

fn send_on_closed<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.throughput(Throughput::Bytes(N as u64));
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter_batched(
|| oneshot::channel::<[u8; N]>(),
|(sender, receiver)| {
drop(receiver);
sender.send(black_box([0b10101010u8; N])).unwrap_err()
},
BatchSize::SmallInput,
);
});
}

fn send_and_recv<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.throughput(Throughput::Bytes(N as u64));
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter_batched(
|| oneshot::channel::<[u8; N]>(),
|(sender, receiver)| {
sender.send(black_box([0b10101010u8; N])).unwrap();
receiver.recv().unwrap()
},
BatchSize::SmallInput,
);
});
}

fn send_and_recv_ref<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.throughput(Throughput::Bytes(N as u64));
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter_batched(
|| oneshot::channel::<[u8; N]>(),
|(sender, receiver)| {
sender.send(black_box([0b10101010u8; N])).unwrap();
receiver.recv_ref().unwrap()
},
BatchSize::SmallInput,
);
});
}

fn recv<const N: usize>(group: &mut BenchmarkGroup<WallTime>) {
group.throughput(Throughput::Bytes(N as u64));
group.bench_with_input(BenchmarkId::from_parameter(N), &N, |b, _| {
b.iter_batched(
|| {
let (sender, receiver) = oneshot::channel::<[u8; N]>();
sender.send(black_box([0b10101010u8; N])).unwrap();
receiver
},
|receiver| receiver.recv().unwrap(),
BatchSize::SmallInput,
);
});
}

fn bench(c: &mut Criterion) {
bench_send_and_recv!(c,
() => ();
u8 => 7u8;
usize => 9876usize;
u128 => 1234567u128;
[u8; 64] => [0b10101010u8; 64];
[u8; 4096] => [0b10101010u8; 4096]
bench_send_and_recv!(c;
0,
1,
8,
16,
64,
1024,
4096,
);

bench_try_recv(c);
Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ pub struct Receiver<T> {

unsafe impl<T: Send> Send for Sender<T> {}
unsafe impl<T: Send> Send for Receiver<T> {}
unsafe impl<T: Sync> Sync for Sender<T> {}
unsafe impl<T: Sync> Sync for Receiver<T> {}
impl<T> Unpin for Receiver<T> {}

impl<T> Sender<T> {
Expand Down Expand Up @@ -1178,7 +1180,7 @@ fn receiver_waker_size() {
(false, false) => 0,
(false, true) => 16,
(true, false) => 8,
(true, true) => 24,
(true, true) => 16,
};
assert_eq!(mem::size_of::<ReceiverWaker>(), expected);
}
Expand Down