Eden Avivi has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33503 )
Change subject: misc: Master/Slave terminology
......................................................................
misc: Master/Slave terminology
Changed SerialLinkMasterPort and SerialLinkSlavePort
Change-Id: I143c65bbaf4a7a9395938f9d3aedebbeeeaa2e19
---
M src/mem/serial_link.cc
M src/mem/serial_link.hh
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/src/mem/serial_link.cc b/src/mem/serial_link.cc
index d05328e..4b05336 100644
--- a/src/mem/serial_link.cc
+++ b/src/mem/serial_link.cc
@@ -51,9 +51,10 @@
#include "debug/SerialLink.hh"
#include "params/SerialLink.hh"
-SerialLink::SerialLinkSlavePort::SerialLinkSlavePort(const std::string&
_name,
+SerialLink::SerialLinkResponsePort::
+SerialLinkResponsePort(const std::string& _name,
SerialLink& _serial_link,
- SerialLinkMasterPort& _masterPort,
+ SerialLinkRequestPort&
_masterPort,
Cycles _delay, int _resp_limit,
const std::vector<AddrRange>&
_ranges)
@@ -66,9 +67,9 @@
{
}
-SerialLink::SerialLinkMasterPort::SerialLinkMasterPort(const std::string&
+SerialLink::SerialLinkRequestPort::SerialLinkRequestPort(const std::string&
_name, SerialLink& _serial_link,
- SerialLinkSlavePort& _slavePort,
+ SerialLinkResponsePort&
_slavePort,
Cycles _delay, int _req_limit)
: RequestPort(_name, &_serial_link), serial_link(_serial_link),
slavePort(_slavePort), delay(_delay), reqQueueLimit(_req_limit),
@@ -112,19 +113,19 @@
}
bool
-SerialLink::SerialLinkSlavePort::respQueueFull() const
+SerialLink::SerialLinkResponsePort::respQueueFull() const
{
return outstandingResponses == respQueueLimit;
}
bool
-SerialLink::SerialLinkMasterPort::reqQueueFull() const
+SerialLink::SerialLinkRequestPort::reqQueueFull() const
{
return transmitList.size() == reqQueueLimit;
}
bool
-SerialLink::SerialLinkMasterPort::recvTimingResp(PacketPtr pkt)
+SerialLink::SerialLinkRequestPort::recvTimingResp(PacketPtr pkt)
{
// all checks are done when the request is accepted on the slave
// side, so we are guaranteed to have space for the response
@@ -157,7 +158,7 @@
}
bool
-SerialLink::SerialLinkSlavePort::recvTimingReq(PacketPtr pkt)
+SerialLink::SerialLinkResponsePort::recvTimingReq(PacketPtr pkt)
{
DPRINTF(SerialLink, "recvTimingReq: %s addr 0x%x\n",
pkt->cmdString(), pkt->getAddr());
@@ -224,7 +225,7 @@
}
void
-SerialLink::SerialLinkSlavePort::retryStalledReq()
+SerialLink::SerialLinkResponsePort::retryStalledReq()
{
if (retryReq) {
DPRINTF(SerialLink, "Request waiting for retry, now retrying\n");
@@ -234,7 +235,7 @@
}
void
-SerialLink::SerialLinkMasterPort::schedTimingReq(PacketPtr pkt, Tick when)
+SerialLink::SerialLinkRequestPort::schedTimingReq(PacketPtr pkt, Tick when)
{
// If we're about to put this packet at the head of the queue, we
// need to schedule an event to do the transmit. Otherwise there
@@ -251,7 +252,7 @@
void
-SerialLink::SerialLinkSlavePort::schedTimingResp(PacketPtr pkt, Tick when)
+SerialLink::SerialLinkResponsePort::schedTimingResp(PacketPtr pkt, Tick
when)
{
// If we're about to put this packet at the head of the queue, we
// need to schedule an event to do the transmit. Otherwise there
@@ -265,7 +266,7 @@
}
void
-SerialLink::SerialLinkMasterPort::trySendTiming()
+SerialLink::SerialLinkRequestPort::trySendTiming()
{
assert(!transmitList.empty());
@@ -308,7 +309,7 @@
}
void
-SerialLink::SerialLinkSlavePort::trySendTiming()
+SerialLink::SerialLinkResponsePort::trySendTiming()
{
assert(!transmitList.empty());
@@ -356,25 +357,25 @@
}
void
-SerialLink::SerialLinkMasterPort::recvReqRetry()
+SerialLink::SerialLinkRequestPort::recvReqRetry()
{
trySendTiming();
}
void
-SerialLink::SerialLinkSlavePort::recvRespRetry()
+SerialLink::SerialLinkResponsePort::recvRespRetry()
{
trySendTiming();
}
Tick
-SerialLink::SerialLinkSlavePort::recvAtomic(PacketPtr pkt)
+SerialLink::SerialLinkResponsePort::recvAtomic(PacketPtr pkt)
{
return delay * serial_link.clockPeriod() + masterPort.sendAtomic(pkt);
}
void
-SerialLink::SerialLinkSlavePort::recvFunctional(PacketPtr pkt)
+SerialLink::SerialLinkResponsePort::recvFunctional(PacketPtr pkt)
{
pkt->pushLabel(name());
@@ -398,7 +399,7 @@
}
bool
-SerialLink::SerialLinkMasterPort::trySatisfyFunctional(PacketPtr pkt)
+SerialLink::SerialLinkRequestPort::trySatisfyFunctional(PacketPtr pkt)
{
bool found = false;
auto i = transmitList.begin();
@@ -415,7 +416,7 @@
}
AddrRangeList
-SerialLink::SerialLinkSlavePort::getAddrRanges() const
+SerialLink::SerialLinkResponsePort::getAddrRanges() const
{
return ranges;
}
diff --git a/src/mem/serial_link.hh b/src/mem/serial_link.hh
index 7f047ef..c89c684 100644
--- a/src/mem/serial_link.hh
+++ b/src/mem/serial_link.hh
@@ -82,16 +82,16 @@
{ }
};
- // Forward declaration to allow the slave port to have a pointer
- class SerialLinkMasterPort;
+ // Forward declaration to allow the response port to have a pointer
+ class SerialLinkRequestPort;
/**
* The port on the side that receives requests and sends
- * responses. The slave port has a set of address ranges that it
- * is responsible for. The slave port also has a buffer for the
+ * responses. The response port has a set of address ranges that it
+ * is responsible for. The response port also has a buffer for the
* responses not yet sent.
*/
- class SerialLinkSlavePort : public ResponsePort
+ class SerialLinkResponsePort : public ResponsePort
{
private:
@@ -100,9 +100,9 @@
SerialLink& serial_link;
/**
- * Master port on the other side of the serial_link.
+ * Request port on the other side of the serial_link.
*/
- SerialLinkMasterPort& masterPort;
+ SerialLinkRequestPort& masterPort;
/** Minimum request delay though this serial_link. */
const Cycles delay;
@@ -147,7 +147,7 @@
public:
/**
- * Constructor for the SerialLinkSlavePort.
+ * Constructor for the SerialLinkResponsePort.
*
* @param _name the port name including the owner
* @param _serial_link the structural owner
@@ -157,8 +157,8 @@
* @param _resp_limit the size of the response queue
* @param _ranges a number of address ranges to forward
*/
- SerialLinkSlavePort(const std::string& _name, SerialLink&
- _serial_link, SerialLinkMasterPort& _masterPort,
+ SerialLinkResponsePort(const std::string& _name, SerialLink&
+ _serial_link, SerialLinkRequestPort& _masterPort,
Cycles _delay, int _resp_limit, const
std::vector<AddrRange>& _ranges);
@@ -204,10 +204,10 @@
/**
* Port on the side that forwards requests and receives
- * responses. The master port has a buffer for the requests not
+ * responses. The request port has a buffer for the requests not
* yet sent.
*/
- class SerialLinkMasterPort : public RequestPort
+ class SerialLinkRequestPort : public RequestPort
{
private:
@@ -216,9 +216,9 @@
SerialLink& serial_link;
/**
- * The slave port on the other side of the serial_link.
+ * The response port on the other side of the serial_link.
*/
- SerialLinkSlavePort& slavePort;
+ SerialLinkResponsePort& slavePort;
/** Minimum delay though this serial_link. */
const Cycles delay;
@@ -247,7 +247,7 @@
public:
/**
- * Constructor for the SerialLinkMasterPort.
+ * Constructor for the SerialLinkRequestPort.
*
* @param _name the port name including the owner
* @param _serial_link the structural owner
@@ -256,9 +256,10 @@
* @param _delay the delay in cycles from receiving to sending
* @param _req_limit the size of the request queue
*/
- SerialLinkMasterPort(const std::string& _name, SerialLink&
- _serial_link, SerialLinkSlavePort& _slavePort,
Cycles
- _delay, int _req_limit);
+ SerialLinkRequestPort(const std::string& _name, SerialLink&
+ _serial_link,
+ SerialLinkResponsePort& _slavePort,
+ Cycles _delay, int _req_limit);
/**
* Is this side blocked from accepting new request packets.
@@ -297,11 +298,11 @@
void recvReqRetry();
};
- /** Slave port of the serial_link. */
- SerialLinkSlavePort slavePort;
+ /** Response port of the serial_link. */
+ SerialLinkResponsePort slavePort;
/** Master port of the serial_link. */
- SerialLinkMasterPort masterPort;
+ SerialLinkRequestPort masterPort;
/** Number of parallel lanes in this serial link */
unsigned num_lanes;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33503
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: I143c65bbaf4a7a9395938f9d3aedebbeeeaa2e19
Gerrit-Change-Number: 33503
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
