From 0a188850fef16b3bdc647ebc7825d1e11b7dd272 Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Thu, 22 Aug 2024 04:28:19 -0700
Subject: [PATCH 1/2] tests,gpu-compute: Fix artifact upload for GPU tests

actions/upload-artifact@v4 does not understand periods in artifact
names.

Change-Id: Ia272f9dcf9cb2213fb78b1814007921232395914
---
 .github/workflows/daily-tests.yaml  | 2 +-
 .github/workflows/weekly-tests.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index fa18f78134..2c34cacf6a 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -100,7 +100,7 @@ jobs:
               if: success() || failure()
               uses: actions/upload-artifact@v4
               with:
-                  name: gpu_COMMIT.${{github.sha}}_RUN.${{github.run_id}}_ATTEMPT.${{github.run_attempt}}
+                  name: gpu_tests_${{github.sha}}_RUN_${{github.run_id}}_ATTEMPT_${{github.run_attempt}}
                   path: tests/testing-results
                   retention-days: 7
 
diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml
index 70c6412848..3a78171eeb 100644
--- a/.github/workflows/weekly-tests.yaml
+++ b/.github/workflows/weekly-tests.yaml
@@ -80,7 +80,7 @@ jobs:
               if: success() || failure()
               uses: actions/upload-artifact@v4.0.0
               with:
-                  name: gpu_COMMIT.${{github.sha}}_RUN.${{github.run_id}}_ATTEMPT.${{github.run_attempt}}
+                  name: gpu_tests_${{github.sha}}_RUN_${{github.run_id}}_ATTEMPT_${{github.run_attempt}}
                   path: tests/testing-results
                   retention-days: 7
 

From 6057de452bb32fbf4d3a7f72250e94cd4b17832d Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Thu, 22 Aug 2024 05:43:36 -0700
Subject: [PATCH 2/2] tests,gpu-compute: Fix incorrect options handling

Change-Id: Ica845ad7c4a49fe2636df3bf184220a33557bc5e
---
 tests/gem5/gpu/test_gpu_apu_se.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/gem5/gpu/test_gpu_apu_se.py b/tests/gem5/gpu/test_gpu_apu_se.py
index 72a416bb23..66f77a4fee 100644
--- a/tests/gem5/gpu/test_gpu_apu_se.py
+++ b/tests/gem5/gpu/test_gpu_apu_se.py
@@ -67,7 +67,7 @@ gem5_verify_config(
         "-c",
         joinpath(resource_path, "allSyncPrims-1kernel"),
         "--options",
-        "'sleepMutex 10 16 4'",
+        "sleepMutex 10 16 4",
     ],
     valid_isas=(constants.vega_x86_tag,),
     valid_hosts=(constants.host_gcn_gpu_tag,),
@@ -89,7 +89,7 @@ gem5_verify_config(
         "-c",
         joinpath(resource_path, "allSyncPrims-1kernel"),
         "--options",
-        "'lfTreeBarrUniq 10 16 4 10 16 4'",
+        "lfTreeBarrUniq 10 16 4 10 16 4",
     ],
     valid_isas=(constants.vega_x86_tag,),
     valid_hosts=(constants.host_gcn_gpu_tag,),
@@ -115,7 +115,7 @@ gem5_verify_config(
         "-c",
         joinpath(resource_path, "lulesh"),
         "--options",
-        "'0.01 2'",
+        "0.01 2",
     ],
     valid_isas=(constants.vega_x86_tag,),
     valid_hosts=(constants.host_gcn_gpu_tag,),
@@ -137,7 +137,7 @@ gem5_verify_config(
         "-c",
         joinpath(resource_path, "hacc-force-tree"),
         "--options",
-        "'0.5 0.1 64 0.1 1 N 12 rcb'",
+        "0.5 0.1 64 0.1 1 N 12 rcb",
     ],
     valid_isas=(constants.vega_x86_tag,),
     valid_hosts=(constants.host_gcn_gpu_tag,),