feat(test-fixtures): add http3 support to Simulator

Enables benchmarking of mozilla#2796.

Fixes mozilla#2728.
Fixes mozilla#2804.

Author: mxinden

neqo-http3/Cargo.toml

@@ -49,9 +49,7 @@ ignored = ["log"]
 # See https://github.com/bheisler/criterion.rs/blob/master/book/src/faq.md#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 bench = false
 
-# FIXME: These benches have a high rate of variability and are hence not very useful
-# in their current form. See https://github.com/mozilla/neqo/issues/2804
-# [[bench]]
-# name = "streams"
-# harness = false
-# required-features = ["bench"]
+[[bench]]
+name = "streams"
+harness = false
+required-features = ["bench"]

neqo-http3/benches/streams.rs

@@ -6,77 +6,51 @@
 
 #![expect(clippy::unwrap_used, reason = "OK in a bench.")]
 
-use std::{hint::black_box, iter::repeat_with};
+use std::{hint::black_box, time::Duration};
 
-use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
-use neqo_crypto::AuthenticationStatus;
-use neqo_http3::{Http3Client, Http3Parameters, Http3Server, Priority};
-use neqo_transport::{ConnectionParameters, StreamType};
+use criterion::{criterion_group, criterion_main, Criterion, Throughput};
 use test_fixture::{
-    fixture_init, http3_client_with_params, http3_server_with_params, now, DEFAULT_SERVER_NAME,
+    boxed, fixture_init,
+    sim::{
+        http3_connection::{Node, Request, Response},
+        network::RandomDelay,
+        Simulator,
+    },
 };
 
-const STREAM_TYPE: StreamType = StreamType::BiDi;
-const STREAMS_MAX: u64 = 1 << 60;
-
-fn use_streams(client: &mut Http3Client, server: &mut Http3Server, streams: usize, data: &[u8]) {
-    let stream_ids = repeat_with(|| {
-        client
-            .fetch(
-                now(),
-                "GET",
-                &("https", DEFAULT_SERVER_NAME, "/"),
-                &[],
-                Priority::default(),
-            )
-            .unwrap()
-    })
-    .take(streams)
-    .collect::<Vec<_>>();
-    exchange_packets(client, server, false);
-    for stream_id in &stream_ids {
-        client.send_data(*stream_id, data).unwrap();
-    }
-    exchange_packets(client, server, false);
-    for stream_id in &stream_ids {
-        client.stream_close_send(*stream_id).unwrap();
-    }
-    exchange_packets(client, server, false);
-}
-
-fn connect() -> (Http3Client, Http3Server) {
-    let cp = ConnectionParameters::default()
-        .max_streams(STREAM_TYPE, STREAMS_MAX)
-        .pmtud(false)
-        .pacing(false)
-        .mlkem(false)
-        .sni_slicing(false);
-    let h3p = Http3Parameters::default().connection_parameters(cp);
-    let mut client = http3_client_with_params(h3p.clone());
-    let mut server = http3_server_with_params(h3p);
-    exchange_packets(&mut client, &mut server, true);
-    (client, server)
-}
+const ZERO: Duration = Duration::from_millis(0);
+const JITTER: Duration = Duration::from_millis(10);
+const TRANSFER_AMOUNT: usize = 1 << 22; // 4Mbyte
 
 fn criterion_benchmark(c: &mut Criterion) {
     fixture_init();
 
-    for (streams, data_size) in [(1_000, 1), (1_000, 1_000)] {
-        let mut group = c.benchmark_group(format!("{streams} streams of {data_size} bytes"));
-
-        // High variance benchmark. Increase default sample size (100).
-        group.sample_size(500);
-
-        group.bench_function("multistream", |b| {
-            let data = vec![0; data_size];
-            b.iter_batched_ref(
-                connect,
-                |_| black_box(|(client, server)| use_streams(client, server, streams, &data)),
-                BatchSize::SmallInput,
-            );
+    let mut group = c.benchmark_group(" TODO");
+    group.throughput(Throughput::Bytes(TRANSFER_AMOUNT as u64));
+
+    for (streams, data_size) in [(1, 1_000) /* (1_000, 1), (1_000, 1_000) */] {
+        group.bench_function(&format!("{streams} streams of {data_size} bytes"), |b| {
+            b.iter_custom(|iters| {
+                let mut d_sum = Duration::ZERO;
+                for _i in 0..iters {
+                    let nodes = boxed![
+                        Node::default_client(boxed![Request::new(TRANSFER_AMOUNT)]),
+                        RandomDelay::new(ZERO..JITTER),
+                        Node::default_server(boxed![Response::new(TRANSFER_AMOUNT)]),
+                        RandomDelay::new(ZERO..JITTER),
+                    ];
+                    let sim = Simulator::new("", nodes);
+                    d_sum += black_box(sim.setup().run());
+                }
+
+                d_sum
+            });
         });
-        group.finish();
     }
+
+    group.finish();
+
+    Criterion::default().configure_from_args().final_summary();
 }
 
 criterion_group!(benches, criterion_benchmark);