derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdlib,configs: Remove setting resource_directory in examples

Browse Source 
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+kokoro@google.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
This commit is contained in:
Bobby R. Bruce
2021-10-22 12:48:49 -07:00
parent 76251f9407
commit bde1c46d2d
2 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configs/example/gem5_library/arm-hello.py
View File

@@ -53,8 +53,6 @@ from gem5.components.memory.single_channel import SingleChannelDDR3_1600
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 @@ board.set_workload(
# 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",
),
)
)

34
configs/example/gem5_library/x86-ubuntu-run.py
View File

@@ -55,8 +55,6 @@ from gem5.isas import ISA
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 @@ command = "m5 exit;" \
+ "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,