From 4620f2a28b4e31dde326d265c854d0f3cce45a37 Mon Sep 17 00:00:00 2001 From: Will Manning Date: Fri, 20 Sep 2024 10:47:09 -0600 Subject: [PATCH] make CI bench tests faster (take 2) (#897) for now, we just exclude the compress_benchmark on my M2 macbook air, `time` for the command with exclusion was `cargo bench --bench '*[!noci]' -- --test 42.99s user 13.41s system 92% cpu 1:00.74 total` --- .github/workflows/bench-pr.yml | 6 +++--- .github/workflows/bench.yml | 6 +++--- .github/workflows/ci.yml | 2 +- bench-vortex/Cargo.toml | 8 ++++---- .../benches/{compress_benchmark.rs => compress_noci.rs} | 0 .../benches/{datafusion_benchmark.rs => datafusion.rs} | 0 bench-vortex/benches/{tpch_benchmark.rs => tpch.rs} | 0 7 files changed, 11 insertions(+), 11 deletions(-) rename bench-vortex/benches/{compress_benchmark.rs => compress_noci.rs} (100%) rename bench-vortex/benches/{datafusion_benchmark.rs => datafusion.rs} (100%) rename bench-vortex/benches/{tpch_benchmark.rs => tpch.rs} (100%) diff --git a/.github/workflows/bench-pr.yml b/.github/workflows/bench-pr.yml index 44b0828930..0a327d0e82 100644 --- a/.github/workflows/bench-pr.yml +++ b/.github/workflows/bench-pr.yml @@ -16,15 +16,15 @@ jobs: strategy: matrix: benchmark: - - id: tpch_benchmark + - id: tpch # this was the original name which we must preserve until we change the name of all the # records in the gh-pages-bench branch "Vortex benchmarks" name: Vortex benchmarks - - id: compress_benchmark + - id: compress_noci name: Vortex Compression - id: bytes_at name: Vortex bytes_at - - id: datafusion_benchmark + - id: datafusion name: Vortex DataFusion - id: random_access name: Vortex random_access diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index b4482c60b3..7ff3145555 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -14,15 +14,15 @@ jobs: strategy: matrix: benchmark: - - id: tpch_benchmark + - id: tpch # this was the original name which we must preserve until we change the name of all the # records in the gh-pages-bench branch "Vortex benchmarks" name: Vortex benchmarks - - id: compress_benchmark + - id: compress_noci name: Vortex Compression - id: bytes_at name: Vortex bytes_at - - id: datafusion_benchmark + - id: datafusion name: Vortex DataFusion - id: random_access name: Vortex random_access diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfaa3ed3ae..f1980c78fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,4 +81,4 @@ jobs: with: version: v1.0.0 - name: Rust Bench as test - run: cargo bench --benches -- --test + run: cargo bench --bench '*[!noci]' -- --test diff --git a/bench-vortex/Cargo.toml b/bench-vortex/Cargo.toml index a4f26361d1..37e1e85517 100644 --- a/bench-vortex/Cargo.toml +++ b/bench-vortex/Cargo.toml @@ -81,9 +81,9 @@ test = false bench = false [[bench]] -name = "compress_benchmark" -harness = false +name = "compress_noci" test = false +harness = false [[bench]] name = "random_access" @@ -91,12 +91,12 @@ test = false harness = false [[bench]] -name = "datafusion_benchmark" +name = "datafusion" test = false harness = false [[bench]] -name = "tpch_benchmark" +name = "tpch" test = false harness = false diff --git a/bench-vortex/benches/compress_benchmark.rs b/bench-vortex/benches/compress_noci.rs similarity index 100% rename from bench-vortex/benches/compress_benchmark.rs rename to bench-vortex/benches/compress_noci.rs diff --git a/bench-vortex/benches/datafusion_benchmark.rs b/bench-vortex/benches/datafusion.rs similarity index 100% rename from bench-vortex/benches/datafusion_benchmark.rs rename to bench-vortex/benches/datafusion.rs diff --git a/bench-vortex/benches/tpch_benchmark.rs b/bench-vortex/benches/tpch.rs similarity index 100% rename from bench-vortex/benches/tpch_benchmark.rs rename to bench-vortex/benches/tpch.rs