[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Fix default value of network bridge
Srikant Bharadwaj has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/34257 ) Change subject: mem-garnet: Fix default value of network bridge .. mem-garnet: Fix default value of network bridge Initializing the network bridge with NULL causes it to have an class error when instatiating a link. The bridge is only needed whne either a CDC or SerDes is enabled. This is handled later during construction of the GarnetLink. Change-Id: If19a21a6d9bf49449b9c390467d08d3422ae991a Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34257 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M src/mem/ruby/network/garnet2.0/GarnetLink.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/ruby/network/garnet2.0/GarnetLink.py b/src/mem/ruby/network/garnet2.0/GarnetLink.py index 33a3d31..9f7fe8b 100644 --- a/src/mem/ruby/network/garnet2.0/GarnetLink.py +++ b/src/mem/ruby/network/garnet2.0/GarnetLink.py @@ -140,14 +140,14 @@ # The network bridge encapsulates both the CDC and Ser-Des # units in HeteroGarnet. This is automatically enabled when # either CDC or Ser-Des is enabled. -ext_net_bridge = VectorParam.NetworkBridge(NULL, +ext_net_bridge = VectorParam.NetworkBridge([], "Network Bridge at external end") -ext_cred_bridge = VectorParam.NetworkBridge(NULL, +ext_cred_bridge = VectorParam.NetworkBridge([], "Credit Bridge at external end") -int_net_bridge = VectorParam.NetworkBridge(NULL, +int_net_bridge = VectorParam.NetworkBridge([], "Network Bridge at internal end") -int_cred_bridge = VectorParam.NetworkBridge(NULL, -"Credit Bridge at intternal end") +int_cred_bridge = VectorParam.NetworkBridge([], +"Credit Bridge at internal end") width = Param.UInt32(Parent.ni_flit_size, -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/34257 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: If19a21a6d9bf49449b9c390467d08d3422ae991a Gerrit-Change-Number: 34257 Gerrit-PatchSet: 3 Gerrit-Owner: Srikant Bharadwaj Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthew Poremba Gerrit-Reviewer: Srikant Bharadwaj Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Fix default value of network bridge
Srikant Bharadwaj has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/34257 )
Change subject: mem-garnet: Fix default value of network bridge
..
mem-garnet: Fix default value of network bridge
Initializing the network bridge with NULL causes it to have
an class error when instatiating a link. The bridge is only
needed whne either a CDC or SerDes is enabled. This is handled
later during construction of the GarnetLink.
Change-Id: If19a21a6d9bf49449b9c390467d08d3422ae991a
---
M src/mem/ruby/network/garnet2.0/GarnetLink.py
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mem/ruby/network/garnet2.0/GarnetLink.py
b/src/mem/ruby/network/garnet2.0/GarnetLink.py
index 33a3d31..d133032 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetLink.py
+++ b/src/mem/ruby/network/garnet2.0/GarnetLink.py
@@ -90,10 +90,10 @@
# The network bridge encapsulates both the CDC and Ser-Des
# units in HeteroGarnet. This is automatically enabled when
# either CDC or Ser-Des is enabled.
-src_net_bridge = Param.NetworkBridge(NULL, "Network Bridge at source")
-dst_net_bridge = Param.NetworkBridge(NULL, "Network Bridge at dest")
-src_cred_bridge = Param.NetworkBridge(NULL, "Credit Bridge at source")
-dst_cred_bridge = Param.NetworkBridge(NULL, "Credit Bridge at dest")
+src_net_bridge = Param.NetworkBridge("Network Bridge at source")
+dst_net_bridge = Param.NetworkBridge("Network Bridge at dest")
+src_cred_bridge = Param.NetworkBridge("Credit Bridge at source")
+dst_cred_bridge = Param.NetworkBridge("Credit Bridge at dest")
width = Param.UInt32(Parent.ni_flit_size,
"bit width supported by the router")
@@ -140,13 +140,13 @@
# The network bridge encapsulates both the CDC and Ser-Des
# units in HeteroGarnet. This is automatically enabled when
# either CDC or Ser-Des is enabled.
-ext_net_bridge = VectorParam.NetworkBridge(NULL,
+ext_net_bridge = VectorParam.NetworkBridge(
"Network Bridge at external end")
-ext_cred_bridge = VectorParam.NetworkBridge(NULL,
+ext_cred_bridge = VectorParam.NetworkBridge(
"Credit Bridge at external end")
-int_net_bridge = VectorParam.NetworkBridge(NULL,
+int_net_bridge = VectorParam.NetworkBridge(
"Network Bridge at internal end")
-int_cred_bridge = VectorParam.NetworkBridge(NULL,
+int_cred_bridge = VectorParam.NetworkBridge(
"Credit Bridge at intternal end")
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/34257
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: If19a21a6d9bf49449b9c390467d08d3422ae991a
Gerrit-Change-Number: 34257
Gerrit-PatchSet: 1
Gerrit-Owner: Srikant Bharadwaj
Gerrit-MessageType: newchange
___
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
