Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51789 )
Change subject: configs: Move riscv_fs.py to example/gem5_library
......................................................................
configs: Move riscv_fs.py to example/gem5_library
This commit also does some minor cleanup of the riscv_fs.py, as well as
renaming it `riscv-fs.py`.
Change-Id: I2ab5f7a3282d7eacf66a7d5b3609983d396b9218
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51789
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
R configs/example/gem5_library/riscv-fs.py
1 file changed, 24 insertions(+), 11 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/example/components-library/riscv_fs.py
b/configs/example/gem5_library/riscv-fs.py
similarity index 91%
rename from configs/example/components-library/riscv_fs.py
rename to configs/example/gem5_library/riscv-fs.py
index 9b9d5f0..762743c 100644
--- a/configs/example/components-library/riscv_fs.py
+++ b/configs/example/gem5_library/riscv-fs.py
@@ -25,7 +25,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
-This example runs a simple linux boot.
+This example runs a simple linux boot. It uses the 'riscv-disk-img'
resource.
+It is built with the sources in `src/riscv-fs` in [gem5 resources](
+https://gem5.googlesource.com/public/gem5-resources).
Characteristics
---------------
@@ -40,10 +42,13 @@
import m5
from m5.objects import Root
-from gem5.runtime import get_runtime_isa
from gem5.components.boards.riscv_board import RiscvBoard
from gem5.components.memory.single_channel import SingleChannelDDR3_1600
from gem5.components.processors.simple_processor import SimpleProcessor
+from gem5.components.cachehierarchies.classic.\
+ private_l1_private_l2_cache_hierarchy import (
+ PrivateL1PrivateL2CacheHierarchy,
+ )
from gem5.components.processors.cpu_types import CPUTypes
from gem5.isas import ISA
from gem5.utils.requires import requires
@@ -52,11 +57,6 @@
# Run a check to ensure the right version of gem5 is being used.
requires(isa_required=ISA.RISCV)
-from
gem5.components.cachehierarchies.classic.private_l1_private_l2_cache_hierarchy
\
- import (
- PrivateL1PrivateL2CacheHierarchy,
- )
-
# Setup the cache hierarchy.
# For classic, PrivateL1PrivateL2 and NoCache have been tested.
# For Ruby, MESI_Two_Level and MI_example have been tested.
@@ -93,7 +93,4 @@
# using m5term (`./util/term`): `./m5term localhost <port>`. Note the
`<port>`
# value is obtained from the gem5 terminal stdout. Look out for
# "system.platform.terminal: Listening for connections on port <port>".
-exit_event = m5.simulate()
-print(
- "Exiting @ tick {} because {}.".format(m5.curTick(),
exit_event.getCause())
-)
+exit_event = m5.simulate()
\ No newline at end of file
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51789
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: I2ab5f7a3282d7eacf66a7d5b3609983d396b9218
Gerrit-Change-Number: 51789
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
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
