Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51950 )
(
12 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: stdlib,configs: Remove setting resource_directory in
examples
......................................................................
stdlib,configs: Remove setting resource_directory in examples
As part of https://gem5-review.googlesource.com/c/public/gem5/+/51369
we have a default resource directory. We therefore no longer need to set
`resource_directory` to get a consistent download location.
Change-Id: I0bef9930db9157a999dc063bd49377de1fe75102
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51950
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
---
M configs/example/gem5_library/arm-hello.py
M configs/example/gem5_library/x86-ubuntu-run.py
2 files changed, 21 insertions(+), 46 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/example/gem5_library/arm-hello.py
b/configs/example/gem5_library/arm-hello.py
index 9641d2b..7dbc8a2 100644
--- a/configs/example/gem5_library/arm-hello.py
+++ b/configs/example/gem5_library/arm-hello.py
@@ -53,8 +53,6 @@
from gem5.components.processors.simple_processor import SimpleProcessor
from gem5.components.processors.cpu_types import CPUTypes
-import os
-
# This check ensures the gem5 binary is compiled to the ARM ISA target. If
not,
# an exception will be thrown.
requires(isa_required=ISA.ARM)
@@ -99,20 +97,6 @@
# bucket, the local copy will be overwritten. If this were set to
false
# an exception would be thrown in this case.
override=True,
- # We hardcode the resource directory to `tests/gem5/resources`. The
- # `arm-hello64-static` binary will be downloaded and stored there.
- resource_directory=os.path.join(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(os.path.realpath(__file__))
- )
- )
- ),
- "tests",
- "gem5",
- "resources",
- ),
)
)
diff --git a/configs/example/gem5_library/x86-ubuntu-run.py
b/configs/example/gem5_library/x86-ubuntu-run.py
index 860707a..de7cc0a 100644
--- a/configs/example/gem5_library/x86-ubuntu-run.py
+++ b/configs/example/gem5_library/x86-ubuntu-run.py
@@ -55,8 +55,6 @@
from gem5.coherence_protocol import CoherenceProtocol
from gem5.resources.resource import Resource
-import os
-
# This runs a check to ensure the gem5 binary is compiled to X86 and to the
# MESI Two Level coherence protocol.
requires(
@@ -122,40 +120,16 @@
+ "m5 exit;"
board.set_kernel_disk_workload(
- # The x86 linux kernel will be automatically downloaded to the
- # `tests/gem5/resources` directory if not already present.
+ # The x86 linux kernel will be automatically downloaded to the if not
+ # already present.
kernel=Resource(
"x86-linux-kernel-5.4.49",
- resource_directory=os.path.join(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(os.path.realpath(__file__))
- )
- )
- ),
- "tests",
- "gem5",
- "resources",
- ),
override=True,
),
- # The x86 ubuntu image will be automatically downloaded to the
- # `tests/gem5/resources` directory if not already present.
+ # The x86 ubuntu image will be automatically downloaded to the if not
+ # already present.
disk_image=Resource(
"x86-ubuntu-img",
- resource_directory=os.path.join(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(
- os.path.dirname(os.path.realpath(__file__))
- )
- )
- ),
- "tests",
- "gem5",
- "resources",
- ),
override=True,
),
readfile_contents=command,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51950
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: I0bef9930db9157a999dc063bd49377de1fe75102
Gerrit-Change-Number: 51950
Gerrit-PatchSet: 14
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.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
