Eden Avivi has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33498 )
Change subject: misc: Master/Slave terminology
......................................................................
misc: Master/Slave terminology
Changed TokenMasterPort and TokenSlavePort
Change-Id: Ib78b4bbdf5872bff7aa73bbe219636ea2bb5fcd4
---
M src/gpu-compute/compute_unit.hh
M src/mem/ruby/system/GPUCoalescer.hh
M src/mem/token_port.cc
M src/mem/token_port.hh
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/gpu-compute/compute_unit.hh
b/src/gpu-compute/compute_unit.hh
index 211dd53..f8947f1 100644
--- a/src/gpu-compute/compute_unit.hh
+++ b/src/gpu-compute/compute_unit.hh
@@ -628,12 +628,12 @@
void exitCallback();
- class GMTokenPort : public TokenMasterPort
+ class GMTokenPort : public TokenRequestPort
{
public:
GMTokenPort(const std::string& name, SimObject *owner,
PortID id = InvalidPortID)
- : TokenMasterPort(name, owner, id)
+ : TokenRequestPort(name, owner, id)
{ }
~GMTokenPort() { }
diff --git a/src/mem/ruby/system/GPUCoalescer.hh
b/src/mem/ruby/system/GPUCoalescer.hh
index 401f70b..0aee3ca 100644
--- a/src/mem/ruby/system/GPUCoalescer.hh
+++ b/src/mem/ruby/system/GPUCoalescer.hh
@@ -201,12 +201,12 @@
class GPUCoalescer : public RubyPort
{
public:
- class GMTokenPort : public TokenSlavePort
+ class GMTokenPort : public TokenResponsePort
{
public:
GMTokenPort(const std::string& name, ClockedObject *owner,
PortID id = InvalidPortID)
- : TokenSlavePort(name, owner, id)
+ : TokenResponsePort(name, owner, id)
{ }
~GMTokenPort() { }
diff --git a/src/mem/token_port.cc b/src/mem/token_port.cc
index 5a2462a..dd5dc06 100644
--- a/src/mem/token_port.cc
+++ b/src/mem/token_port.cc
@@ -40,13 +40,13 @@
#include "debug/TokenPort.hh"
void
-TokenMasterPort::bind(Port &peer)
+TokenRequestPort::bind(Port &peer)
{
RequestPort::bind(peer);
}
void
-TokenMasterPort::recvTokens(int num_tokens)
+TokenRequestPort::recvTokens(int num_tokens)
{
panic_if(!tokenManager, "TokenManager not set for %s.\n", name());
@@ -54,7 +54,7 @@
}
bool
-TokenMasterPort::haveTokens(int num_tokens)
+TokenRequestPort::haveTokens(int num_tokens)
{
panic_if(!tokenManager, "TokenManager not set for %s.\n", name());
@@ -62,7 +62,7 @@
}
void
-TokenMasterPort::acquireTokens(int num_tokens)
+TokenRequestPort::acquireTokens(int num_tokens)
{
panic_if(!tokenManager, "TokenManager not set for %s.\n", name());
@@ -70,13 +70,13 @@
}
void
-TokenMasterPort::setTokenManager(TokenManager *_tokenManager)
+TokenRequestPort::setTokenManager(TokenManager *_tokenManager)
{
tokenManager = _tokenManager;
}
void
-TokenSlavePort::sendTokens(int num_tokens)
+TokenResponsePort::sendTokens(int num_tokens)
{
fatal_if(!tokenMasterPort, "Tried sendTokens to non-token master!\n");
@@ -85,12 +85,12 @@
}
void
-TokenSlavePort::bind(Port& peer)
+TokenResponsePort::bind(Port& peer)
{
- // TokenSlavePort is allowed to bind to either TokenMasterPort or a
+ // TokenResponsePort is allowed to bind to either TokenRequestPort or a
// RequestPort as fallback. If the type is a RequestPort,
tokenMasterPort
// is set to nullptr to indicate tokens should not be exchanged.
- auto *token_master_port = dynamic_cast<TokenMasterPort*>(&peer);
+ auto *token_master_port = dynamic_cast<TokenRequestPort*>(&peer);
auto *master_port = dynamic_cast<RequestPort*>(&peer);
if (!token_master_port && !master_port) {
fatal("Attempt to bind port %s to unsupported slave port %s.",
@@ -107,14 +107,14 @@
}
void
-TokenSlavePort::unbind()
+TokenResponsePort::unbind()
{
ResponsePort::responderUnbind();
tokenMasterPort = nullptr;
}
void
-TokenSlavePort::recvRespRetry()
+TokenResponsePort::recvRespRetry()
{
// fallback to QueuedResponsePort-like impl for now
panic_if(respQueue.empty(),
@@ -129,7 +129,7 @@
}
bool
-TokenSlavePort::sendTimingResp(PacketPtr pkt)
+TokenResponsePort::sendTimingResp(PacketPtr pkt)
{
bool success = ResponsePort::sendTimingResp(pkt);
diff --git a/src/mem/token_port.hh b/src/mem/token_port.hh
index 358ee03..ddf652a 100644
--- a/src/mem/token_port.hh
+++ b/src/mem/token_port.hh
@@ -38,16 +38,16 @@
#include "sim/clocked_object.hh"
class TokenManager;
-class TokenSlavePort;
+class TokenResponsePort;
-class TokenMasterPort : public RequestPort
+class TokenRequestPort : public RequestPort
{
private:
/* Manager to track tokens between this token port pair. */
TokenManager *tokenManager;
public:
- TokenMasterPort(const std::string& name, SimObject* owner,
+ TokenRequestPort(const std::string& name, SimObject* owner,
PortID id = InvalidPortID) :
RequestPort(name, owner, id), tokenManager(nullptr)
{ }
@@ -87,21 +87,21 @@
void setTokenManager(TokenManager *_tokenManager);
};
-class TokenSlavePort : public ResponsePort
+class TokenResponsePort : public ResponsePort
{
private:
- TokenMasterPort *tokenMasterPort;
+ TokenRequestPort *tokenMasterPort;
std::deque<PacketPtr> respQueue;
void recvRespRetry() override;
public:
- TokenSlavePort(const std::string& name, ClockedObject *owner,
+ TokenResponsePort(const std::string& name, ClockedObject *owner,
PortID id = InvalidPortID) :
ResponsePort(name, owner, id), tokenMasterPort(nullptr)
{ }
- ~TokenSlavePort() { }
+ ~TokenResponsePort() { }
/**
* Bind this slave port to a master port. This also does the mirror
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33498
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: Ib78b4bbdf5872bff7aa73bbe219636ea2bb5fcd4
Gerrit-Change-Number: 33498
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
