Eden Avivi has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33501 )
Change subject: misc: Master/Slave terminology
......................................................................
misc: Master/Slave terminology
Changed CoherentXBarPorts and NonCoherentXBarPorts
Change-Id: I73dce1093e4051e98d1406ef4f52ac3f9aad49e0
---
M src/mem/coherent_xbar.cc
M src/mem/coherent_xbar.hh
M src/mem/noncoherent_xbar.cc
M src/mem/noncoherent_xbar.hh
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc
index e64df9e..12c395e 100644
--- a/src/mem/coherent_xbar.cc
+++ b/src/mem/coherent_xbar.cc
@@ -68,7 +68,7 @@
// are enumerated starting from zero
for (int i = 0; i < p->port_master_connection_count; ++i) {
std::string portName = csprintf("%s.master[%d]", name(), i);
- RequestPort* bp = new CoherentXBarMasterPort(portName, *this, i);
+ RequestPort* bp = new CoherentXBarRequestPort(portName, *this, i);
masterPorts.push_back(bp);
reqLayers.push_back(new ReqLayer(*bp, *this,
csprintf("reqLayer%d", i)));
@@ -81,7 +81,7 @@
if (p->port_default_connection_count) {
defaultPortID = masterPorts.size();
std::string portName = name() + ".default";
- RequestPort* bp = new CoherentXBarMasterPort(portName, *this,
+ RequestPort* bp = new CoherentXBarRequestPort(portName, *this,
defaultPortID);
masterPorts.push_back(bp);
reqLayers.push_back(new ReqLayer(*bp, *this, csprintf("reqLayer%d",
@@ -94,7 +94,8 @@
// create the slave ports, once again starting at zero
for (int i = 0; i < p->port_slave_connection_count; ++i) {
std::string portName = csprintf("%s.slave[%d]", name(), i);
- QueuedResponsePort* bp = new CoherentXBarSlavePort(portName,
*this, i);
+ QueuedResponsePort* bp =
+ new CoherentXBarResponsePort(portName, *this, i);
slavePorts.push_back(bp);
respLayers.push_back(new RespLayer(*bp, *this,
csprintf("respLayer%d", i)));
diff --git a/src/mem/coherent_xbar.hh b/src/mem/coherent_xbar.hh
index 09d81ca..977d65d 100644
--- a/src/mem/coherent_xbar.hh
+++ b/src/mem/coherent_xbar.hh
@@ -82,7 +82,7 @@
* be instantiated for each of the master ports connecting to the
* crossbar.
*/
- class CoherentXBarSlavePort : public QueuedResponsePort
+ class CoherentXBarResponsePort : public QueuedResponsePort
{
private:
@@ -95,7 +95,7 @@
public:
- CoherentXBarSlavePort(const std::string &_name,
+ CoherentXBarResponsePort(const std::string &_name,
CoherentXBar &_xbar, PortID _id)
: QueuedResponsePort(_name, &_xbar, queue, _id), xbar(_xbar),
queue(_xbar, *this)
@@ -146,7 +146,7 @@
* instantiated for each of the slave interfaces connecting to the
* crossbar.
*/
- class CoherentXBarMasterPort : public RequestPort
+ class CoherentXBarRequestPort : public RequestPort
{
private:
/** A reference to the crossbar to which this port belongs. */
@@ -154,7 +154,7 @@
public:
- CoherentXBarMasterPort(const std::string &_name,
+ CoherentXBarRequestPort(const std::string &_name,
CoherentXBar &_xbar, PortID _id)
: RequestPort(_name, &_xbar, _id), xbar(_xbar)
{ }
diff --git a/src/mem/noncoherent_xbar.cc b/src/mem/noncoherent_xbar.cc
index 8ec668a..3d070d7 100644
--- a/src/mem/noncoherent_xbar.cc
+++ b/src/mem/noncoherent_xbar.cc
@@ -58,7 +58,7 @@
// are enumerated starting from zero
for (int i = 0; i < p->port_master_connection_count; ++i) {
std::string portName = csprintf("%s.master[%d]", name(), i);
- RequestPort* bp = new NoncoherentXBarMasterPort(portName, *this,
i);
+ RequestPort* bp = new NoncoherentXBarRequestPort(portName, *this,
i);
masterPorts.push_back(bp);
reqLayers.push_back(new ReqLayer(*bp, *this,
csprintf("reqLayer%d", i)));
@@ -69,7 +69,7 @@
if (p->port_default_connection_count) {
defaultPortID = masterPorts.size();
std::string portName = name() + ".default";
- RequestPort* bp = new NoncoherentXBarMasterPort(portName, *this,
+ RequestPort* bp = new NoncoherentXBarRequestPort(portName, *this,
defaultPortID);
masterPorts.push_back(bp);
reqLayers.push_back(new ReqLayer(*bp, *this, csprintf("reqLayer%d",
@@ -80,7 +80,7 @@
for (int i = 0; i < p->port_slave_connection_count; ++i) {
std::string portName = csprintf("%s.slave[%d]", name(), i);
QueuedResponsePort* bp =
- new NoncoherentXBarSlavePort(portName, *this, i);
+ new NoncoherentXBarResponsePort(portName, *this, i);
slavePorts.push_back(bp);
respLayers.push_back(new RespLayer(*bp, *this,
csprintf("respLayer%d", i)));
diff --git a/src/mem/noncoherent_xbar.hh b/src/mem/noncoherent_xbar.hh
index 4249649..a024210 100644
--- a/src/mem/noncoherent_xbar.hh
+++ b/src/mem/noncoherent_xbar.hh
@@ -75,11 +75,11 @@
std::vector<RespLayer*> respLayers;
/**
- * Declaration of the non-coherent crossbar slave port type, one
- * will be instantiated for each of the master ports connecting to
+ * Declaration of the non-coherent crossbar response port type, one
+ * will be instantiated for each of the request ports connecting to
* the crossbar.
*/
- class NoncoherentXBarSlavePort : public QueuedResponsePort
+ class NoncoherentXBarResponsePort : public QueuedResponsePort
{
private:
@@ -91,7 +91,7 @@
public:
- NoncoherentXBarSlavePort(const std::string &_name,
+ NoncoherentXBarResponsePort(const std::string &_name,
NoncoherentXBar &_xbar, PortID _id)
: QueuedResponsePort(_name, &_xbar, queue, _id), xbar(_xbar),
queue(_xbar, *this)
@@ -131,11 +131,11 @@
};
/**
- * Declaration of the crossbar master port type, one will be
- * instantiated for each of the slave ports connecting to the
+ * Declaration of the crossbar request port type, one will be
+ * instantiated for each of the response ports connecting to the
* crossbar.
*/
- class NoncoherentXBarMasterPort : public RequestPort
+ class NoncoherentXBarRequestPort : public RequestPort
{
private:
@@ -144,7 +144,7 @@
public:
- NoncoherentXBarMasterPort(const std::string &_name,
+ NoncoherentXBarRequestPort(const std::string &_name,
NoncoherentXBar &_xbar, PortID _id)
: RequestPort(_name, &_xbar, _id), xbar(_xbar)
{ }
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33501
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: I73dce1093e4051e98d1406ef4f52ac3f9aad49e0
Gerrit-Change-Number: 33501
Gerrit-PatchSet: 1
Gerrit-Owner: Eden Avivi <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
