Tiago Muck has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/63677?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: configs: fix CustomMesh router parent
......................................................................
configs: fix CustomMesh router parent
This fixes the routers being set as the links' children. This is
necessary here as we only assign the routers to the network once
all routers and links are created.
Change-Id: I2ac90b575bad593ddbb8ab716872a30a5c4c6979
Signed-off-by: Tiago Mück <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63677
Maintainer: Bobby Bruce <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M configs/topologies/CustomMesh.py
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
Bobby Bruce: Looks good to me, approved
diff --git a/configs/topologies/CustomMesh.py
b/configs/topologies/CustomMesh.py
index 545ba4b..088e4b9 100644
--- a/configs/topologies/CustomMesh.py
+++ b/configs/topologies/CustomMesh.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 ARM Limited
+# Copyright (c) 2021,2022 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -372,6 +372,10 @@
# Set up
network.int_links = self._int_links
network.ext_links = self._ext_links
+ # fix Routers being set as link child
+ for r in self._routers:
+ if r.has_parent():
+ r.get_parent().clear_child(r.get_name())
network.routers = self._routers
pairing = getattr(options, "pairing", None)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/63677?usp=email
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: I2ac90b575bad593ddbb8ab716872a30a5c4c6979
Gerrit-Change-Number: 63677
Gerrit-PatchSet: 4
Gerrit-Owner: Tiago Muck <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Daecheol You <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Tiago Muck <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
