commit ae266b3a8575ca0a43c86b12cd451c3372e9c623
author Tiago Mück <tiago.muck@arm.com> Mon Jun 21 07:56:46 2021 -0500
committer Tiago Muck <tiago.muck@arm.com> Wed Sep 28 18:56:04 2022 +0000
tree 24bed09602fd4f342a4a6b69190b5e1063087afe
parent 027b508a38d0d6c9324d33207c1070f6e21a083d

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 <tiago.muck@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63677
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

configs/topologies/CustomMesh.py

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)