[gem5-dev] Change in gem5/gem5[develop]: tests: fix LULESH weekly regression command

2021-10-13 Thread Matt Sinclair (Gerrit) via gem5-dev
Matt Sinclair has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/51207 )


Change subject: tests: fix LULESH weekly regression command
..

tests: fix LULESH weekly regression command

7756c5e added LULESH to the weekly regression script.  However,
it assumed a local installation of gem5-resources which it should
not have.  This commit fixes that so the weekly regression builds the
LULESH binary and then runs it instead.

Change-Id: If91f4340f2d042b0bcb366c5da10f7d0dc5643c5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51207
Maintainer: Matt Sinclair 
Maintainer: Bobby R. Bruce 
Reviewed-by: Jason Lowe-Power 
Reviewed-by: Bobby R. Bruce 
Tested-by: kokoro 
---
M tests/weekly.sh
1 file changed, 38 insertions(+), 4 deletions(-)

Approvals:
  Jason Lowe-Power: Looks good to me, but someone else must approve
  Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
  Matt Sinclair: Looks good to me, approved
  kokoro: Regressions pass




diff --git a/tests/weekly.sh b/tests/weekly.sh
index c699f65..33dd70b 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -46,21 +46,35 @@

 # 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})"

-# get LULESH
-wget -qN http://dist.gem5.org/dist/develop/test-progs/lulesh/lulesh
+# test LULESH
+# before pulling gem5 resources, make sure it doesn't exist already
+rm -rf ${gem5_root}/gem5-resources
+
+# Pull gem5 resources to the root of the gem5 directory -- currently the
+# pre-built binares for LULESH are out-of-date and won't run correctly with
+# ROCm 4.0.  In the meantime, we can build the binary as part of this  
script

+git clone -b develop https://gem5.googlesource.com/public/gem5-resources \
+"${gem5_root}/gem5-resources"

 mkdir -p tests/testing-results

+# build LULESH
+docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
+   "${gem5_root}/gem5-resources/src/gpu/lulesh" \
+   -u $UID:$GID gcr.io/gem5-test/gcn-gpu:latest bash -c \
+   "make"
+
 # LULESH is heavily used in the HPC community on GPUs, and does a good job  
of

 # stressing several GPU compute and memory components
 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 --mem-size=8GB -clulesh
+configs/example/apu_se.py -n3 --mem-size=8GB \
+--benchmark-root="${gem5_root}/gem5-resources/src/gpu/lulesh/bin" -c  
lulesh


 # get DNNMark
 # Delete gem5 resources repo if it already exists -- need to do in docker

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51207
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: If91f4340f2d042b0bcb366c5da10f7d0dc5643c5
Gerrit-Change-Number: 51207
Gerrit-PatchSet: 7
Gerrit-Owner: Matt Sinclair 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Matt Sinclair 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Alex Dutu 
Gerrit-CC: Kyle Roarty 
Gerrit-CC: Matthew Poremba 
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

[gem5-dev] Change in gem5/gem5[develop]: tests: fix LULESH weekly regression command

2021-10-01 Thread Matt Sinclair (Gerrit) via gem5-dev
Matt Sinclair has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/51207 )



Change subject: tests: fix LULESH weekly regression command
..

tests: fix LULESH weekly regression command

7756c5e added LULESH to the weekly regression script.  However,
it assumed a local installation of gem5-resources which it should
not have.  This commit fixes that so the weekly regression builds the
LULESH binary and then runs it instead.

Change-Id: If91f4340f2d042b0bcb366c5da10f7d0dc5643c5
---
M tests/weekly.sh
1 file changed, 34 insertions(+), 2 deletions(-)



diff --git a/tests/weekly.sh b/tests/weekly.sh
index b697c29..cdc7fa0 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -52,10 +52,28 @@
 || (rm -rf build && scons build/GCN3_X86/gem5.opt -j${threads})"

 # get LULESH
-wget -qN http://dist.gem5.org/dist/develop/test-progs/lulesh/lulesh
+# Pull the gem5 resources to the root of the gem5 directory -- currently  
the

+# pre-built binares for LULESH are out-of-date and won't run correctly with
+# ROCm 4.0.  In the meantime, we can build the binary as part of this  
script

+git clone -b develop https://gem5.googlesource.com/public/gem5-resources \
+"${gem5_root}/gem5-resources"

 mkdir -p tests/testing-results

+# build LULESH
+docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
+   "${gem5_root}/gem5-resources/src/gpu/lulesh" \
+   -u $UID:$GID gcr.io/gem5-test/gcn-gpu:latest bash -c \
+   "make"
+
 # LULESH is heavily used in the HPC community on GPUs, and does a good job  
of

 # stressing several GPU compute and memory components
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID  
gcr.io/gem5-test/gcn-gpu gem5/build/GCN3_X86/gem5.opt  
gem5/configs/example/apu_se.py -n3 --mem-size=8GB  
--benchmark-root=gem5-resources/src/gpu/lulesh/bin -clulesh

+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 --mem-size=8GB \
+--benchmark-root="${gem5_root}/gem5-resources/src/gpu/lulesh/bin"  
-clulesh

+
+# Delete the gem5 resources repo we created
+docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
+"${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
+"rm -rf ${gem5_root}/gem5-resources"

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51207
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: If91f4340f2d042b0bcb366c5da10f7d0dc5643c5
Gerrit-Change-Number: 51207
Gerrit-PatchSet: 1
Gerrit-Owner: Matt Sinclair 
Gerrit-MessageType: newchange
___
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