From 30af7dd6a38da3d0b39348e989e8b2fcb84cf198 Mon Sep 17 00:00:00 2001 From: "Jan Winkelmann (keks)" Date: Mon, 26 Aug 2024 17:40:32 +0200 Subject: [PATCH] split up benchmarks and fix git issue --- .github/workflows/mlkem-bench.yml | 2 ++ .github/workflows/skip-benches-in-prs.yml | 27 +++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mlkem-bench.yml b/.github/workflows/mlkem-bench.yml index b5c825c09..a6bf66508 100644 --- a/.github/workflows/mlkem-bench.yml +++ b/.github/workflows/mlkem-bench.yml @@ -89,6 +89,8 @@ jobs: run: | cargo clean LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo bench --verbose $RUST_TARGET_FLAG -- --output-format bencher | sed 's/^test \(.*\) \.\.\. bench/test portable \1 ... bench/' | tee -a bench.txt + - name: Clear Cargo.toml so it doesn't interfere with git + run: git checkout Cargo.toml - name: Store benchmarks uses: benchmark-action/github-action-benchmark@v1 with: diff --git a/.github/workflows/skip-benches-in-prs.yml b/.github/workflows/skip-benches-in-prs.yml index fd259b985..27d9cb4bc 100644 --- a/.github/workflows/skip-benches-in-prs.yml +++ b/.github/workflows/skip-benches-in-prs.yml @@ -1,14 +1,33 @@ name: Skip Benchmarks in PRs on: [ pull_request ] + jobs: benchmark: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + bits: [32, 64] + os: + - macos-13 + - macos-latest + - ubuntu-latest + - windows-latest + runs-on: ${{ matrix.os }} steps: - run: true - benchmarks: - runs-on: ubuntu-latest + + benchmark_without_bits: + strategy: + fail-fast: false + matrix: + os: + - macos-13 + - macos-latest + - ubuntu-latest + - windows-latest + runs-on: ${{ matrix.os }} + name: "benchmark (${{ matrix.os }})" steps: - run: true -