Matt Sinclair has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/51707 )

Change subject: tests: simplify weekly regression
......................................................................

tests: simplify weekly regression

DNNMark and LULESH were both cloning and removing gem5-resources as part
of their tests, since they were committed separately/in parallel.  Clean
this up so we only remove and pull gem5-resources once now in the weekly
regression script.

Change-Id: I5ab1410b0934bf20ed817e379f4e494aa53bfa44
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51707
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M tests/weekly.sh
1 file changed, 26 insertions(+), 16 deletions(-)

Approvals:
  Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass




diff --git a/tests/weekly.sh b/tests/weekly.sh
index 1d14f4f..3f6a93c 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -51,13 +51,17 @@
     "scons build/GCN3_X86/gem5.opt -j${threads} \
         || (rm -rf build && scons build/GCN3_X86/gem5.opt -j${threads})"

-# test LULESH
 # before pulling gem5 resources, make sure it doesn't exist already
-rm -rf ${gem5_root}/gem5-resources
+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"

+# test LULESH
 # 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 +# ROCm 4.0. In the meantime, we can build the binary as part of this script.
+# Moreover, DNNMark builds a library and thus doesn't have a binary, so we
+# need to build it before we run it.
 git clone -b develop https://gem5.googlesource.com/public/gem5-resources \
     "${gem5_root}/gem5-resources"

@@ -76,19 +80,7 @@
     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
-# because of cachefiles DNNMark creates
-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"
-
-# Pull the gem5 resources to the root of the gem5 directory -- DNNMark
-# builds a library and thus doesn't have a binary, so we need to build
-# it before we run it
-git clone -b develop https://gem5.googlesource.com/public/gem5-resources \
-    "${gem5_root}/gem5-resources"
-
+# test DNNMark
 # setup cmake for DNNMark
 docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
      "${gem5_root}/gem5-resources/src/gpu/DNNMark" \

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51707
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: I5ab1410b0934bf20ed817e379f4e494aa53bfa44
Gerrit-Change-Number: 51707
Gerrit-PatchSet: 3
Gerrit-Owner: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Kyle Roarty <kyleroarty1...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Matthew Poremba <matthew.pore...@amd.com>
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

Reply via email to