Matt Sinclair has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51567 )
Change subject: tests: convert all nightly GPU tests from GUID to GID
..
tests: convert all nightly GPU tests from GUID to GID
As part of the docker commands for the nightly GPU regression tests,
earlier commits inadvertently used GUID instead of GID, where GUID does
not exist. This causes some failures when run in Jenkins. This patch
fixes this issue.
Change-Id: I429c079ae3df9fd97a956f23a2fc9baeed3f7377
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51567
Reviewed-by: Jason Lowe-Power
Reviewed-by: Bobby R. Bruce
Maintainer: Jason Lowe-Power
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M tests/nightly.sh
1 file changed, 24 insertions(+), 4 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/nightly.sh b/tests/nightly.sh
index 30e2c58..b3708fd 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -86,7 +86,7 @@
# For the GPU tests we compile and run GCN3_X86 inside a gcn-gpu container.
docker pull gcr.io/gem5-test/gcn-gpu:latest
-docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
+docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
"scons build/GCN3_X86/gem5.opt -j${threads} \
|| (rm -rf build && scons build/GCN3_X86/gem5.opt -j${threads})"
@@ -99,7 +99,7 @@
# Square is the simplest, fastest, more heavily tested GPU application
# Thus, we always want to run this in the nightly regressions to make sure
# basic GPU functionality is working.
-docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
+docker run --rm -u $UID:$GID --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 -c square
@@ -110,7 +110,7 @@
# 10 Ld/St per thread and 4 iterations of the critical section is a
reasonable
# moderate contention case for the default 4 CU GPU config and help ensure
GPU
# atomics are tested.
-docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
+docker run --rm -u $UID:$GID --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 -c allSyncPrims-1kernel \
--options="sleepMutex 10 16 4"
@@ -120,7 +120,7 @@
# thread, 4 iterations of critical section. Again this is representative
of a
# moderate contention case for the default 4 CU GPU config and help ensure
GPU
# atomics are tested.
-docker run --rm -u $UID:$GUID --volume "${gem5_root}":"${gem5_root}" -w \
+docker run --rm -u $UID:$GID --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 -c allSyncPrims-1kernel \
--options="lfTreeBarrUniq 10 16 4"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51567
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I429c079ae3df9fd97a956f23a2fc9baeed3f7377
Gerrit-Change-Number: 51567
Gerrit-PatchSet: 2
Gerrit-Owner: Matt Sinclair
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: kokoro
Gerrit-CC: Kyle Roarty
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
