From 66db68359a29daa25c9e1b5eab16d05dcc9d649d Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Wed, 13 Oct 2021 11:11:11 -0700
Subject: [PATCH] tests: Fix the nightly GPU tests

The nightly tests failed:
https://www.mail-archive.com/gem5-dev@gem5.org/msg40828.html

This failure was due to new GPU tests assuming tests were executed from
the `tests` directory. They are actually executed from the gem5 root.
This patch fixes the error.

Change-Id: Ie5f86ef4eb13134a2a3d0291422f65c9ee355a92
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51607
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 tests/nightly.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/nightly.sh b/tests/nightly.sh
index 89c70051a5..30e2c58dd2 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -101,7 +101,7 @@ mkdir -p tests/testing-results
 # basic GPU functionality is working.
 docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
     "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt \
-    configs/example/apu_se.py -n3 --benchmark-root="${gem5_root}/tests" -c square
+    configs/example/apu_se.py -n3 -c square
 
 # get HeteroSync
 wget -qN http://dist.gem5.org/dist/develop/test-progs/heterosync/gcn3/allSyncPrims-1kernel
@@ -112,8 +112,8 @@ wget -qN http://dist.gem5.org/dist/develop/test-progs/heterosync/gcn3/allSyncPri
 # atomics are tested.
 docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
     "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt \
-    configs/example/apu_se.py -n3 --benchmark-root="${gem5_root}/tests" \
-    -c allSyncPrims-1kernel --options="sleepMutex 10 16 4"
+    configs/example/apu_se.py -n3  -c allSyncPrims-1kernel \
+    --options="sleepMutex 10 16 4"
 
 # run HeteroSync LFBarr -- similar setup to sleepMutex above -- 16 WGs
 # accessing unique data and then joining a lock-free barrier, 10 Ld/St per
@@ -122,5 +122,5 @@ docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
 # atomics are tested.
 docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
     "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt \
-    configs/example/apu_se.py -n3 --benchmark-root="${gem5_root}/tests" \
-    -c allSyncPrims-1kernel --options="lfTreeBarrUniq 10 16 4"
+    configs/example/apu_se.py -n3  -c allSyncPrims-1kernel \
+    --options="lfTreeBarrUniq 10 16 4"