Merge branch 'main' into ci-bench-msquic

Signed-off-by: Lars Eggert <[email protected]>

.github/workflows/mutants.yml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  incremental-mutants:
+  mutants:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -40,14 +40,14 @@ jobs:
           git diff origin/${{ github.base_ref }}.. > pr.diff
           set -o pipefail
           cargo mutants --test-tool=nextest --no-shuffle -j 2 -vV --in-diff pr.diff | tee results.txt || true
-          echo 'TITLE="Incremental Mutants"' >> "$GITHUB_ENV"
+          echo 'TITLE=Incremental Mutants' >> "$GITHUB_ENV"
 
       - name: Find mutants
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         run: |
           set -o pipefail
           cargo mutants --test-tool=nextest -vV --in-place | tee results.txt || true
-          echo 'TITLE="All Mutants"' >> "$GITHUB_ENV"
+          echo 'TITLE=All Mutants' >> "$GITHUB_ENV"
 
       - name: Post step summary
         if: always()
@@ -56,7 +56,7 @@ jobs:
             echo "### $TITLE"
             echo "See https://mutants.rs/using-results.html for more information."
             echo '```'
-            cat results.txt
+            sed 's/\x1b\[[0-9;]*[mGKHF]//g' results.txt
             echo '```'
           } > "$GITHUB_STEP_SUMMARY"
 

Cargo.toml

@@ -25,6 +25,9 @@ rust-version = "1.74.0"
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -1 }
 
+[profile.release]
+lto = "fat"
+
 [profile.bench]
 # Inherits from the "release" profile, so just provide overrides here:
 # https://doc.rust-lang.org/cargo/reference/profiles.html#release

neqo-transport/benches/transfer.rs

@@ -6,7 +6,7 @@
 
 use std::time::Duration;
 
-use criterion::{criterion_group, criterion_main, BatchSize::SmallInput, Criterion};
+use criterion::{criterion_group, criterion_main, BatchSize::SmallInput, Criterion, Throughput};
 use test_fixture::{
     boxed,
     sim::{
@@ -21,7 +21,9 @@ const JITTER: Duration = Duration::from_millis(10);
 const TRANSFER_AMOUNT: usize = 1 << 22; // 4Mbyte
 
 fn benchmark_transfer(c: &mut Criterion, label: &str, seed: Option<impl AsRef<str>>) {
-    c.bench_function(label, |b| {
+    let mut group = c.benchmark_group("transfer");
+    group.throughput(Throughput::Bytes(u64::try_from(TRANSFER_AMOUNT).unwrap()));
+    group.bench_function(label, |b| {
         b.iter_batched(
             || {
                 let nodes = boxed![
@@ -44,6 +46,7 @@ fn benchmark_transfer(c: &mut Criterion, label: &str, seed: Option<impl AsRef<st
             SmallInput,
         )
     });
+    group.finish();
 }
 
 fn benchmark_transfer_variable(c: &mut Criterion) {