chore: reduce noise in benchmarks (tokio-rs#151)

Removes FuturesUnordered from benchmarks and alters timing to ignore
task spawning, as to hone in on specifically the processing of ops and
driver performance.

Author: Noah-Kennedy

Cargo.toml

@@ -28,15 +28,17 @@ bytes = { version = "1.0", optional = true }
 tempfile = "3.2.0"
 tokio-test = "0.4.2"
 iai = "0.1.1"
-futures = "0.3.25"
 criterion = "0.4.0"
 # we use joinset in our tests
-tokio = "1.21.0"
+tokio = "1.21.2"
 nix = "0.26.1"
 
 [package.metadata.docs.rs]
 all-features = true
 
+[profile.bench]
+debug = true
+
 [[bench]]
 name = "lai_no_op"
 path = "benches/lai/no_op.rs"

benches/criterion/no_op.rs

@@ -3,7 +3,7 @@ use criterion::{
 };
 use std::time::{Duration, Instant};
 
-use futures::stream::{self, StreamExt};
+use tokio::task::JoinSet;
 
 #[derive(Clone)]
 struct Options {
@@ -26,11 +26,7 @@ impl Default for Options {
 
 fn run_no_ops(opts: &Options, count: u64) -> Duration {
     let mut ring_opts = tokio_uring::uring_builder();
-    ring_opts
-        .setup_cqsize(opts.cq_size as _)
-        // .setup_sqpoll(10)
-        // .setup_sqpoll_cpu(1)
-        ;
+    ring_opts.setup_cqsize(opts.cq_size as _);
 
     let mut m = Duration::ZERO;
 
@@ -40,12 +36,18 @@ fn run_no_ops(opts: &Options, count: u64) -> Duration {
             .entries(opts.sq_size as _)
             .uring_builder(&ring_opts)
             .start(async move {
+                let mut js = JoinSet::new();
+
+                for _ in 0..opts.iterations {
+                    js.spawn_local(tokio_uring::no_op());
+                }
+
                 let start = Instant::now();
-                stream::iter(0..opts.iterations)
-                    .for_each_concurrent(Some(opts.concurrency), |_| async move {
-                        tokio_uring::no_op().await.unwrap();
-                    })
-                    .await;
+
+                while let Some(res) = js.join_next().await {
+                    res.unwrap().unwrap();
+                }
+
                 start.elapsed()
             })
     }

benches/lai/no_op.rs

@@ -1,5 +1,5 @@
-use futures::stream::{self, StreamExt};
 use iai::black_box;
+use tokio::task::JoinSet;
 
 #[derive(Clone)]
 struct Options {
@@ -23,11 +23,7 @@ impl Default for Options {
 fn runtime_only() -> Result<(), Box<dyn std::error::Error>> {
     let opts = Options::default();
     let mut ring_opts = tokio_uring::uring_builder();
-    ring_opts
-        .setup_cqsize(opts.cq_size as _)
-        // .setup_sqpoll(10)
-        // .setup_sqpoll_cpu(1)
-        ;
+    ring_opts.setup_cqsize(opts.cq_size as _);
 
     tokio_uring::builder()
         .entries(opts.sq_size as _)
@@ -37,21 +33,22 @@ fn runtime_only() -> Result<(), Box<dyn std::error::Error>> {
 
 fn run_no_ops(opts: Options) -> Result<(), Box<dyn std::error::Error>> {
     let mut ring_opts = tokio_uring::uring_builder();
-    ring_opts
-        .setup_cqsize(opts.cq_size as _)
-        // .setup_sqpoll(10)
-        // .setup_sqpoll_cpu(1)
-        ;
+    ring_opts.setup_cqsize(opts.cq_size as _);
 
     tokio_uring::builder()
         .entries(opts.sq_size as _)
         .uring_builder(&ring_opts)
         .start(async move {
-            stream::iter(0..opts.iterations)
-                .for_each_concurrent(Some(opts.concurrency), |_| async move {
-                    tokio_uring::no_op().await.unwrap();
-                })
-                .await;
+            let mut js = JoinSet::new();
+
+            for _ in 0..opts.iterations {
+                js.spawn_local(tokio_uring::no_op());
+            }
+
+            while let Some(res) = js.join_next().await {
+                res.unwrap().unwrap();
+            }
+
             Ok(())
         })
 }