Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/18174 )
Change subject: python: Replace the Master/Slave Ports with
Request/Response ports.
......................................................................
python: Replace the Master/Slave Ports with Request/Response ports.
These are a little more descriptive and a little less potentially
offensive.
Change-Id: I84c30f783f0a4c242cb4f54ab272b6fdf1e9eec7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18174
Tested-by: kokoro <[email protected]>
Reviewed-by: Anthony Gutierrez <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M src/python/m5/params.py
1 file changed, 24 insertions(+), 15 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Anthony Gutierrez: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 60d4a14..8b0a14a 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -2099,17 +2099,18 @@
def cxx_decl(self, code):
code('unsigned int port_${{self.name}}_connection_count;')
-Port.compat('MASTER', 'SLAVE')
+Port.compat('GEM5 REQUESTER', 'GEM5 RESPONDER')
-class MasterPort(Port):
- # MasterPort("description")
+class RequestPort(Port):
+ # RequestPort("description")
def __init__(self, desc):
- super(MasterPort, self).__init__('MASTER', desc, is_source=True)
+ super(RequestPort, self).__init__(
+ 'GEM5 REQUESTER', desc, is_source=True)
-class SlavePort(Port):
- # SlavePort("description")
+class ResponsePort(Port):
+ # ResponsePort("description")
def __init__(self, desc):
- super(SlavePort, self).__init__('SLAVE', desc)
+ super(ResponsePort, self).__init__('GEM5 RESPONDER', desc)
# VectorPort description object. Like Port, but represents a vector
# of connections (e.g., as on a XBar).
@@ -2122,15 +2123,22 @@
def makeRef(self, simobj):
return VectorPortRef(simobj, self.name, self.role, self.is_source)
-class VectorMasterPort(VectorPort):
- # VectorMasterPort("description")
+class VectorRequestPort(VectorPort):
+ # VectorRequestPort("description")
def __init__(self, desc):
- super(VectorMasterPort, self).__init__('MASTER', desc,
is_source=True)
+ super(VectorRequestPort, self).__init__(
+ 'GEM5 REQUESTER', desc, is_source=True)
-class VectorSlavePort(VectorPort):
- # VectorSlavePort("description")
+class VectorResponsePort(VectorPort):
+ # VectorResponsePort("description")
def __init__(self, desc):
- super(VectorSlavePort, self).__init__('SLAVE', desc)
+ super(VectorResponsePort, self).__init__('GEM5 RESPONDER', desc)
+
+# Old names, maintained for compatibility.
+MasterPort = RequestPort
+SlavePort = ResponsePort
+VectorMasterPort = VectorRequestPort
+VectorSlavePort = VectorResponsePort
# 'Fake' ParamDesc for Port references to assign to the _pdesc slot of
# proxy objects (via set_param_desc()) so that proxy error messages
@@ -2164,5 +2172,6 @@
'MaxAddr', 'MaxTick', 'AllMemory',
'Time',
'NextEthernetAddr', 'NULL',
- 'Port', 'MasterPort', 'SlavePort',
- 'VectorPort', 'VectorMasterPort', 'VectorSlavePort']
+ 'Port', 'RequestPort', 'ResponsePort', 'MasterPort', 'SlavePort',
+ 'VectorPort', 'VectorRequestPort', 'VectorResponsePort',
+ 'VectorMasterPort', 'VectorSlavePort']
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18174
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I84c30f783f0a4c242cb4f54ab272b6fdf1e9eec7
Gerrit-Change-Number: 18174
Gerrit-PatchSet: 5
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Assignee: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Anthony Gutierrez <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Jieming Yin <[email protected]>
Gerrit-CC: Ryan Gambord <[email protected]>
Gerrit-CC: Srikant Bharadwaj <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
