Changes.

UoB-HPC · Oct 28, 2024 · 9ba803d · 9ba803d
1 parent 7643c79
commit 9ba803d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/.github/actions/simeng_benchmarks/action.yml b/.github/actions/simeng_benchmarks/action.yml
@@ -5,9 +5,10 @@ inputs:
   RUN_DIR:
     description: directory from which the benchmark binary should be run
     required: false
-  DATA_PATH:
-    description: location of the data file(s) for this benchmarks
+  AGRS:
+    description: Any additional arguments needed to run this benchmark on SimEng
     required: false
+    default: ""
   BIN_PATH:
     description: path to the binary for the benchmark
     required: true
@@ -21,16 +22,12 @@ runs:
     - name: Run Benchmark
       shell: bash
       run: |
-        if [ ${{ inputs.DATA_PATH }} ]
-        then
-          simeng "$GITHUB_WORKSPACE/configs/a64fx.yaml" "${{ inputs.BIN_PATH }}" -n 64 -i 1 --deck "${{ inputs.DATA_PATH }}"  > $GITHUB_WORKSPACE/simeng.tmp
-        elif [ ${{ inputs.RUN_DIR }} ]
+        if [ ${{ inputs.RUN_DIR }} ]
         then
           cd ${{ inputs.RUN_DIR }}
-          simeng "$GITHUB_WORKSPACE/configs/a64fx.yaml" "${{ inputs.BIN_PATH }}" -n 64 -i 1  > $GITHUB_WORKSPACE/simeng.tmp
-        else
-          simeng "$GITHUB_WORKSPACE/configs/a64fx.yaml" "${{ inputs.BIN_PATH }}" -n 64 -i 1  > $GITHUB_WORKSPACE/simeng.tmp
         fi
+    
+        simeng "$GITHUB_WORKSPACE/configs/a64fx.yaml" "${{ inputs.BIN_PATH }}" "${{ inputs.ARGS }}" > $GITHUB_WORKSPACE/simeng.tmp
 
         if grep -q ${{ inputs.PASS_STRING }} "$GITHUB_WORKSPACE/simeng.tmp"
         then

diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml
@@ -243,31 +243,31 @@ jobs:
         name: miniBUDE openmp gcc8.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc8.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc9.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc9.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc10.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc10.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp armclang20 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_armclang20_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
@@ -523,31 +523,31 @@ jobs:
         name: miniBUDE openmp gcc8.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc8.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc9.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc9.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc10.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc10.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp armclang20 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_armclang20_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 

diff --git a/.github/workflows/MACOS_BUILD_TEST.yml b/.github/workflows/MACOS_BUILD_TEST.yml
@@ -181,31 +181,31 @@ jobs:
         name: miniBUDE openmp gcc8.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc8.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc9.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc9.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc10.3.0 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc10.3.0_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp armclang20 armv8.4
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_armclang20_armv8.4
           PASS_STRING: "Largest difference was 0.000%."
 
@@ -461,31 +461,31 @@ jobs:
         name: miniBUDE openmp gcc8.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc8.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc9.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc9.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp gcc10.3.0 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_gcc10.3.0_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."
 
       - if: ${{ inputs.SIMENG-MODE == 'Release' }}
         name: miniBUDE openmp armclang20 armv8.4+sve
         uses: ./.github/actions/simeng_benchmarks
         with:
-          DATA_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1
+          ARGS: "-n 64 -i 1 --deck $GITHUB_WORKSPACE/simeng-benchmarks/Data_Files/miniBUDE/bm1"
           BIN_PATH: $GITHUB_WORKSPACE/simeng-benchmarks/binaries/miniBUDE/openmp/minibude_armclang20_armv8.4+sve
           PASS_STRING: "Largest difference was 0.000%."