refactor(tls-harness): separate benchmark abstractions (#5444)

Author: jmayclin

.github/workflows/bench.yml

@@ -35,7 +35,7 @@ jobs:
         run: ./generate.sh --skip-tests
 
       - name: Benchmark
-        working-directory: bindings/rust/standard/bench
+        working-directory: bindings/rust/standard/benchmarks
         run: cargo criterion --message-format json > criterion_output.log
 
       - name: Configure AWS Credentials
@@ -51,6 +51,6 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           python3 .github/bin/criterion_to_cloudwatch.py \
-            --criterion_output_path bindings/rust/standard/bench/criterion_output.log \
+            --criterion_output_path bindings/rust/standard/benchmarks/criterion_output.log \
             --namespace s2n-tls-bench \
             --platform ${{ runner.os }}-${{ runner.arch }}

.github/workflows/ci_rust.yml

@@ -155,26 +155,6 @@ jobs:
           echo "${output}"
           echo "${output}" | grep -q "test result: ok. 1 passed; 0 failed; 0 ignored;"
 
-  # our benchmark testing includes interop tests between s2n-tls, rustls, and
-  # openssl
-  harness-interop-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust toolchain
-        id: toolchain
-        run: |
-          rustup toolchain install stable
-          rustup override set stable
-
-      - name: generate bindings
-        run: ${{env.ROOT_PATH}}/generate.sh --skip-tests
-
-      - name: bench tests
-        working-directory: ${{env.STANDARD_PATH}}/bench
-        run: cargo test
-
   s2n-tls-binding-examples:
     runs-on: ubuntu-latest
     steps:

bindings/rust/standard/Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
-    "bench",
+    "benchmarks",
     "integration",
-    "s2n-tls-hyper"
+    "s2n-tls-hyper",
+    "tls-harness",
 ]

bindings/rust/standard/bench/src/lib.rs

@@ -1,25 +1,21 @@
 [package]
-name = "bench"
+name = "benchmarks"
 version = "0.1.0"
 edition = "2021"
-publish = false
 
 [dependencies]
+tls-harness = { path = "../tls-harness" }
 s2n-tls = { path = "../../extended/s2n-tls" }
-errno = "0.3"
-libc = "0.2"
 strum = { version = "0.27", features = ["derive"] }
-rustls = { version = "0.23" }
-rustls-pemfile = { version = "2" }
-openssl = { version = "0.10", features = ["vendored"] }
+rustls = "0.23.31"
+openssl = { version = "0.10.73", features = ["vendored"] }
 
 [dev-dependencies]
 criterion = "0.7"
-pprof = { version = "0.15", features = ["criterion", "flamegraph"] }
 # env_logger and log are used to enable logging for rustls, which can help with
 # debugging interop failures
-env_logger = "0.11"
-log = "0.4"
+env_logger = "0.11.8"
+log = "0.4.27"
 
 [[bench]]
 name = "handshake"

bindings/rust/standard/bench/Cargo.toml renamed to bindings/rust/standard/benchmarks/Cargo.toml

@@ -1,15 +1,16 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bench::{
-    harness::{TlsBenchConfig, TlsInfo},
-    CipherSuite, CryptoConfig, HandshakeType, KXGroup, Mode, OpenSslConnection, RustlsConnection,
-    S2NConnection, SigType, TlsConnPair, TlsConnection,
-};
+use benchmarks::*;
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion,
 };
 use strum::IntoEnumIterator;
+use tls_harness::{
+    cohort::{OpenSslConnection, RustlsConnection, S2NConnection},
+    harness::TlsInfo,
+    Mode, SigType, TlsConnPair, TlsConnection,
+};
 
 fn bench_handshake_for_library<T>(
     bench_group: &mut BenchmarkGroup<WallTime>,

bindings/rust/standard/bench/README.md renamed to bindings/rust/standard/benchmarks/README.md

@@ -1,14 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bench::{
-    harness::{TlsBenchConfig, TlsInfo},
-    CipherSuite, CryptoConfig, HandshakeType, KXGroup, S2NConnection, SigType, TlsConnPair,
-    TlsConnection,
-};
+use benchmarks::*;
+use tls_harness::cohort::S2NConnection;
+
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion,
 };
+use tls_harness::{harness::TlsInfo, SigType, TlsConnection};
 
 fn bench_handshake_pair<T>(bench_group: &mut BenchmarkGroup<WallTime>, sig_type: SigType)
 where
@@ -21,7 +20,7 @@ where
         bench_group.bench_function(format!("{:?}-{}", handshake, T::name()), |b| {
             b.iter_batched_ref(
                 || {
-                    TlsConnPair::<T, T>::new_bench_pair(
+                    new_bench_pair::<T, T>(
                         CryptoConfig::new(CipherSuite::default(), KXGroup::default(), sig_type),
                         handshake,
                     )
@@ -46,7 +45,7 @@ where
         bench_group.bench_function(format!("{:?}-{}", handshake, T::name()), |b| {
             b.iter_batched_ref(
                 || {
-                    let mut pair = TlsConnPair::<T, T>::new_bench_pair(
+                    let mut pair = new_bench_pair::<T, T>(
                         CryptoConfig::new(CipherSuite::default(), KXGroup::default(), sig_type),
                         handshake,
                     )

bindings/rust/standard/bench/benches/connection_creation.rs renamed to bindings/rust/standard/benchmarks/benches/connection_creation.rs

@@ -1,16 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bench::{
-    harness::{TlsBenchConfig, TlsInfo},
-    CipherSuite, CryptoConfig, HandshakeType, KXGroup, Mode, OpenSslConnection, RustlsConnection,
-    S2NConnection, SigType, TlsConnPair, TlsConnection,
-};
+use benchmarks::*;
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion,
     Throughput,
 };
 use strum::IntoEnumIterator;
+use tls_harness::{
+    cohort::{OpenSslConnection, RustlsConnection, S2NConnection},
+    harness::TlsInfo,
+    Mode, SigType, TlsConnPair, TlsConnection,
+};
 
 fn bench_throughput_for_library<T>(
     bench_group: &mut BenchmarkGroup<WallTime>,