From bac688f966c9cc4402d6b3e3f64d4cf2635f616a Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Tue, 11 Feb 2025 11:20:11 +0000 Subject: [PATCH] [CI] Fix benchmark triggers (#1011) This fixes both `workflow_dispatch`, now with check-boxes instead of integers and actually running correctly, as well as `pull_request` that now doesn't need to remove/add the `benchmark` label every time you update the PR. --- .github/workflows/tpp-benchmark.yml | 64 ++++++++++++++++------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/.github/workflows/tpp-benchmark.yml b/.github/workflows/tpp-benchmark.yml index f503df9ea..23518503f 100644 --- a/.github/workflows/tpp-benchmark.yml +++ b/.github/workflows/tpp-benchmark.yml @@ -5,18 +5,20 @@ on: inputs: RUN_EMR_BENCH: description: "Run on Emerald Rapids" - default: "1" + type: boolean + default: true RUN_ZEN_BENCH: description: "Run on Zen5" - default: "0" + type: boolean + default: true RUN_CLX_BENCH: description: "Run on CLX" - default: "0" + type: boolean + default: true push: branches: - 'main' pull_request: - types: [ labeled ] env: NPROCS_LIMIT_LINK: 8 @@ -25,18 +27,20 @@ env: jobs: Check_LLVM: - if: ${{ github.event_name }} == "push" || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || (github.event_name == 'workflow_dispatch') || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) uses: ./.github/workflows/tpp-llvm.yml secrets: inherit TPP-MLIR-EMR-BASE: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_EMR_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_EMR_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -48,10 +52,11 @@ jobs: TPP-MLIR-EMR-OMP: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_EMR_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_EMR_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -63,9 +68,10 @@ jobs: TPP-MLIR-ZEN-BASE: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_ZEN_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_ZEN_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -77,9 +83,10 @@ jobs: TPP-MLIR-ZEN-OMP: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_ZEN_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_ZEN_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -91,9 +98,10 @@ jobs: TPP-MLIR-CLX-BASE: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_CLX_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_CLX_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -105,9 +113,10 @@ jobs: TPP-MLIR-CLX-OMP: runs-on: pcl-tiergarten - if: ${{ github.event_name }} == "push" || \ - ${{ inputs.RUN_CLX_BENCH }} == 1 || \ - (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }}) + if: | + (github.event_name == 'push') || + (github.event_name == 'workflow_dispatch' && inputs.RUN_CLX_BENCH) || + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full')) needs: Check_LLVM steps: - uses: actions/checkout@v4 @@ -116,4 +125,3 @@ jobs: CMD="KIND=Release COMPILER=clang LINKER=lld BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \ ${{ github.workspace }}/scripts/github/benchmark.sh -o" ${{ env.SRUN }} --partition=clxap --time=0:30:00 -- $CMD - \ No newline at end of file