From 23cadf0886ae44626812f3122e280eb49b1f20fc Mon Sep 17 00:00:00 2001
From: Harshil Patel <harshilp2107@gmail.com>
Date: Wed, 29 Nov 2023 07:41:51 -0800
Subject: [PATCH 1/2] tests: switch lulesh to use vega_x86

Change-Id: Ifbf0fdfd7d8c2bbaad0b6094090acecd1cb8055c
---
 .github/workflows/gpu-tests.yaml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml
index 7edcab5ba5..1f25eb0f00 100644
--- a/.github/workflows/gpu-tests.yaml
+++ b/.github/workflows/gpu-tests.yaml
@@ -31,10 +31,28 @@ jobs:
                   retention-days: 5
             - run: echo "This job's status is ${{ job.status }}."
 
+    build-gem5-vega:
+        runs-on: [self-hosted, linux, x64]
+        container: ghcr.io/gem5/gcn-gpu:latest
+        steps:
+            - uses: actions/checkout@v3
+              with:
+        # Scheduled workflows run on the default branch by default. We
+        # therefore need to explicitly checkout the develop branch.
+                  ref: develop
+            - name: Build gem5 vega
+              run: scons build/VEGA_X86/gem5.opt -j $(nproc) --ignore-style
+            - uses: actions/upload-artifact@v3
+              with:
+                  name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-vega
+                  path: build/VEGA_X86/gem5.opt
+                  retention-days: 5
+            - run: echo "This job's status is ${{ job.status }}."
+
     LULESH-tests:
         runs-on: [self-hosted, linux, x64]
         container: ghcr.io/gem5/gcn-gpu:latest
-        needs: build-gem5
+        needs: build-gem5-vega
         timeout-minutes: 480 # 8 hours
         steps:
             - uses: actions/checkout@v3
@@ -43,24 +61,24 @@ jobs:
                 # therefore need to explicitly checkout the develop branch.
                   ref: develop
 
-            - name: Download build/GCN3_X86/gem5.opt
+            - name: Download build/VEGA_X86/gem5.opt
               uses: actions/download-artifact@v3
               with:
-                  name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-gcn3
-                  path: build/GCN3_X86
+                  name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-vega
+                  path: build/VEGA_X86
                 # `download-artifact` does not preserve permissions so we need to set
                 # them again.
-            - run: chmod u+x build/GCN3_X86/gem5.opt
+            - run: chmod u+x build/VEGA_X86/gem5.opt
 
             - name: Obtain LULESH
               # Obtains the latest LULESH compatible with this version of gem5 via
               # gem5 Resources.
-              run: build/GCN3_X86/gem5.opt util/obtain-resource.py lulesh -p lulesh
+              run: build/VEGA_X86/gem5.opt util/obtain-resource.py lulesh -p lulesh
 
             - name: Run LULUESH tests
               working-directory: ${{ github.workspace }}
               run: |
-                  build/GCN3_X86/gem5.opt configs/example/apu_se.py -n3 --mem-size=8GB --reg-alloc-policy=dynamic --benchmark-root="lulesh" -c \
+                  build/VEGA_X86/gem5.opt configs/example/apu_se.py -n3 --mem-size=8GB --reg-alloc-policy=dynamic --dgpu --gfx-version=gfx900 -c \
                   lulesh --options="0.01 2"
 
     HACC-tests:

From b59a39831290fc816cf00e162f8567bacf2503ca Mon Sep 17 00:00:00 2001
From: Harshil Patel <harshilp2107@gmail.com>
Date: Wed, 29 Nov 2023 16:02:30 -0800
Subject: [PATCH 2/2] tests: change HACC tests to VEGA_X86

Change-Id: I846229db1ab1480d79471c717b714698c3132df9
---
 .github/workflows/gpu-tests.yaml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml
index 1f25eb0f00..8e26873159 100644
--- a/.github/workflows/gpu-tests.yaml
+++ b/.github/workflows/gpu-tests.yaml
@@ -23,24 +23,6 @@ jobs:
           # therefore need to explicitly checkout the develop branch.
                   ref: develop
             - name: Build gem5
-              run: scons build/GCN3_X86/gem5.opt -j $(nproc) --ignore-style
-            - uses: actions/upload-artifact@v3
-              with:
-                  name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-gcn3
-                  path: build/GCN3_X86/gem5.opt
-                  retention-days: 5
-            - run: echo "This job's status is ${{ job.status }}."
-
-    build-gem5-vega:
-        runs-on: [self-hosted, linux, x64]
-        container: ghcr.io/gem5/gcn-gpu:latest
-        steps:
-            - uses: actions/checkout@v3
-              with:
-        # Scheduled workflows run on the default branch by default. We
-        # therefore need to explicitly checkout the develop branch.
-                  ref: develop
-            - name: Build gem5 vega
               run: scons build/VEGA_X86/gem5.opt -j $(nproc) --ignore-style
             - uses: actions/upload-artifact@v3
               with:
@@ -52,7 +34,7 @@ jobs:
     LULESH-tests:
         runs-on: [self-hosted, linux, x64]
         container: ghcr.io/gem5/gcn-gpu:latest
-        needs: build-gem5-vega
+        needs: build-gem5
         timeout-minutes: 480 # 8 hours
         steps:
             - uses: actions/checkout@v3
@@ -95,8 +77,8 @@ jobs:
             - uses: actions/download-artifact@v3
               with:
                   name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-gcn3
-                  path: build/GCN3_X86
-            - run: chmod u+x build/GCN3_X86/gem5.opt
+                  path: build/VEGA_X86
+            - run: chmod u+x build/VEGA_X86/gem5.opt
             - name: make hip directory
               run: mkdir hip
             - name: Compile m5ops and x86
@@ -110,4 +92,4 @@ jobs:
             - name: Run HACC tests
               working-directory: ${{ github.workspace }}
               run: |
-                  build/GCN3_X86/gem5.opt configs/example/apu_se.py -n3 --reg-alloc-policy=dynamic --benchmark-root=hip -c ForceTreeTest --options="0.5 0.1 64 0.1 1 N 12 rcb"
+                  build/VEGA_X86/gem5.opt configs/example/apu_se.py -n3 --reg-alloc-policy=dynamic --benchmark-root=hip -c ForceTreeTest --options="0.5 0.1 64 0.1 1 N 12 rcb"