diff --git a/rs/moq-net/Cargo.toml b/rs/moq-net/Cargo.toml index c1f3db3b832..b03b44537d0 100644 --- a/rs/moq-net/Cargo.toml +++ b/rs/moq-net/Cargo.toml @@ -117,6 +117,12 @@ name = "codec" harness = false required-features = ["fuzz"] +# Isolates the full fuzz round trip from the message-codec executable. +[[bench]] +name = "parameters" +harness = false +required-features = ["fuzz"] + # Reaches the private lite codec through the hidden `fuzz` module. [[bench]] name = "varint" diff --git a/rs/moq-net/benches/codec.rs b/rs/moq-net/benches/codec.rs index f4cb6d27a83..39f6dad9347 100644 --- a/rs/moq-net/benches/codec.rs +++ b/rs/moq-net/benches/codec.rs @@ -4,7 +4,7 @@ //! Run with `cargo bench -p moq-net --features fuzz --bench codec`. use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main}; -use moq_net::fuzz::{Messages, decode_varints, encode_varints, lite_wire}; +use moq_net::fuzz::{Messages, decode_varints, encode_varints}; type Encode = fn(&Messages, &mut Vec); type Decode = fn(&Messages, &[u8]); @@ -47,22 +47,6 @@ fn bench(c: &mut Criterion) { } group.finish(); - let mut group = c.benchmark_group("setup_parameters"); - for count in [4, 16, 64, 256, 1024, 4096] { - let values: Vec = std::iter::once(count) - .chain((100..100 + count).flat_map(|kind| [kind, 0])) - .collect(); - // The existing fuzz adapter round-trips the private parameter codec on lite-07. - let mut wire = vec![6, 20]; - encode_varints(&values, true, &mut wire); - group.throughput(Throughput::Elements(count)); - group.bench_with_input(BenchmarkId::from_parameter(count), &wire, |b, wire| { - assert!(lite_wire(wire)); - b.iter(|| lite_wire(std::hint::black_box(wire))); - }); - } - group.finish(); - let values = varints(); let mut group = c.benchmark_group("codec_varint"); group.throughput(Throughput::Elements(values.len() as u64)); diff --git a/rs/moq-net/benches/parameters.rs b/rs/moq-net/benches/parameters.rs new file mode 100644 index 00000000000..1e60fb7ba76 --- /dev/null +++ b/rs/moq-net/benches/parameters.rs @@ -0,0 +1,29 @@ +//! SETUP parameter bags, swept from a small handshake to a message-sized bag. +//! +//! Keep the full fuzz round trip in its own executable: its broad codec call graph +//! perturbs message-codec timings even when this group is filtered out. +//! Run with `cargo bench -p moq-net --features fuzz --bench parameters`. + +use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main}; +use moq_net::fuzz::{encode_varints, lite_wire}; + +fn bench(c: &mut Criterion) { + let mut group = c.benchmark_group("setup_parameters"); + for count in [4, 16, 64, 256, 1024, 4096] { + let values: Vec = std::iter::once(count) + .chain((100..100 + count).flat_map(|kind| [kind, 0])) + .collect(); + // The existing fuzz adapter round-trips the private parameter codec on lite-07. + let mut wire = vec![6, 20]; + encode_varints(&values, true, &mut wire); + group.throughput(Throughput::Elements(count)); + group.bench_with_input(BenchmarkId::from_parameter(count), &wire, |b, wire| { + assert!(lite_wire(wire)); + b.iter(|| lite_wire(std::hint::black_box(wire))); + }); + } + group.finish(); +} + +criterion_group!(benches, bench); +criterion_main!(benches);