From 9ba803d0dd7ec7ccb9b59cc0a36f8daa2c787c3e Mon Sep 17 00:00:00 2001
From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:28:03 +0000
Subject: [PATCH] Changes.

---
 .github/actions/simeng_benchmarks/action.yml | 15 ++++++---------
 .github/workflows/LINUX_BUILD_TEST.yml       | 16 ++++++++--------
 .github/workflows/MACOS_BUILD_TEST.yml       | 16 ++++++++--------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.github/actions/simeng_benchmarks/action.yml b/.github/actions/simeng_benchmarks/action.yml
index 24f1025bff..5a27eba2b2 100644
--- 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
index 18b7ea94c3..dda1f64b18 100644
--- a/.github/workflows/LINUX_BUILD_TEST.yml
+++ b/.github/workflows/LINUX_BUILD_TEST.yml
@@ -243,7 +243,7 @@ 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%."
 
@@ -251,7 +251,7 @@ jobs:
         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%."
 
@@ -259,7 +259,7 @@ jobs:
         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%."
 
@@ -267,7 +267,7 @@ jobs:
         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,7 +523,7 @@ 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%."
 
@@ -531,7 +531,7 @@ jobs:
         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%."
 
@@ -539,7 +539,7 @@ jobs:
         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%."
 
@@ -547,7 +547,7 @@ jobs:
         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
index 02ade28d05..279f2bdf04 100644
--- a/.github/workflows/MACOS_BUILD_TEST.yml
+++ b/.github/workflows/MACOS_BUILD_TEST.yml
@@ -181,7 +181,7 @@ 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%."
 
@@ -189,7 +189,7 @@ jobs:
         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%."
 
@@ -197,7 +197,7 @@ jobs:
         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%."
 
@@ -205,7 +205,7 @@ jobs:
         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,7 +461,7 @@ 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%."
 
@@ -469,7 +469,7 @@ jobs:
         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%."
 
@@ -477,7 +477,7 @@ jobs:
         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%."
 
@@ -485,7 +485,7 @@ jobs:
         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%."