From 8493d0a01efa51a1d836bab4256627206edeb1e2 Mon Sep 17 00:00:00 2001
From: Renato Golin <rengolin@systemcall.eu>
Date: Fri, 2 Feb 2024 14:29:31 +0000
Subject: [PATCH] correct queues, CMD everywhere

---
 .github/workflows/tpp-benchmark.yml | 53 ++++++++++-------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/tpp-benchmark.yml b/.github/workflows/tpp-benchmark.yml
index 7b7cd4eb3..dcc6bf495 100644
--- a/.github/workflows/tpp-benchmark.yml
+++ b/.github/workflows/tpp-benchmark.yml
@@ -15,9 +15,6 @@ on:
       RUN_CLX_BENCH:
         description: "Run on Coffee Lake"
         default: 0
-      NUM_ITER:
-        description: "Number of iterations"
-        default: 100
   push:
     branches: [ "ghactions" ]
   pull_request:
@@ -28,22 +25,8 @@ env:
   NUM_ITER: 100
 
 jobs:
-  Set_Environment:
-    runs-on: pcl-tiergarten
-    steps:
-      - name: Set environment
-        run: |-
-         echo "NUM_ITER=$(
-                if [ -x \"${{ inputs.NUM_ITER }}\" ]; then
-                  echo ${{ inputs.NUM_ITER }}
-                else
-                  echo ${{ env.NUM_ITER }}
-                fi
-                )" >> $GITHUB_ENV
-
   Check_LLVM:
     runs-on: pcl-tiergarten
-    needs: Set_Environment
     steps:
       - uses: actions/checkout@v4
       - name: Check LLVM
@@ -86,9 +69,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Zen4 Base
         run: |-
-          ${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
-          'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-          ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p"
+          ${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- $CMD
 
   TPP-MLIR-ZEN-OMP:
     runs-on: pcl-tiergarten
@@ -97,9 +80,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Zen4 OpenMP
-        run: "${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
-              'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o"
+          ${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- $CMD
 
   TPP-MLIR-CLX-BASE:
     runs-on: pcl-tiergarten
@@ -109,9 +92,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Coffee Lake Base
         run: |-
-          ${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-          'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-          ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p"
+          ${{ secrets.SRUN }} --partition=clxap --time=2:00:00 --constraint=\"notrb\" -- $CMD
 
   TPP-MLIR-CLX-OMP:
     runs-on: pcl-tiergarten
@@ -121,9 +104,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Coffee Lake OpenMP
         run: |-
-          ${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-          'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-          ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o"
+          ${{ secrets.SRUN }} --partition=clxap --time=2:00:00 --constraint=\"notrb\" -- $CMD
 
   TPP-MLIR-ADL-BASE:
     runs-on: pcl-tiergarten
@@ -133,9 +116,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Raptor Lake Base
         run: |-
-          ${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-          'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-          ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p"
+          ${{ secrets.SRUN }} --partition=rpl --time=2:00:00 --constraint=\"notrb\" -- $CMD
 
   TPP-MLIR-ADL-OMP:
     runs-on: pcl-tiergarten
@@ -145,6 +128,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Raptor Lake OpenMP
         run: |-
-          ${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-          'KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${NUM_ITER} \
-          ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'
+          CMD="KIND=Release COMPILER=clang LINKER=lld BUILDKITE_BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
+               ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o"
+          ${{ secrets.SRUN }} --partition=rpl --time=2:00:00 --constraint=\"notrb\" -- $CMD