derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem: Move QoS' MemSinkInterface into gem5::qos

Browse Source 
This class has been mistakenly added outside the
qos namespace.

Change-Id: I12c5dc7558a689c771761754e59d78a8010e422f
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47300
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Daniel R. Carvalho
2021-06-12 14:52:25 -03:00
committed by Daniel Carvalho
parent 6be82cc3ae
commit 297fa863de
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mem/qos/QoSMemSinkInterface.py
View File

@@ -38,6 +38,7 @@ from m5.objects.AbstractMemory import AbstractMemory
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
cxx_class = 'qos::MemSinkInterface'
def controller(self):
"""

6
src/mem/qos/mem_sink.cc
View File

@@ -386,9 +386,9 @@ MemSinkCtrl::MemoryPort::recvTimingReq(PacketPtr pkt)
return mem.recvTimingReq(pkt);
}
} // namespace qos
QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p)
MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p)
: AbstractMemory(_p)
{
}
} // namespace qos

16
src/mem/qos/mem_sink.hh
View File

@@ -52,12 +52,13 @@
#include "sim/eventq.hh"
struct QoSMemSinkInterfaceParams;
class QoSMemSinkInterface;
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
class MemSinkInterface;
/**
* QoS Memory Sink
*
@@ -177,7 +178,7 @@ class MemSinkCtrl : public MemCtrl
/**
* Create pointer to interface of actual media
*/
QoSMemSinkInterface* const interface;
MemSinkInterface* const interface;
/** Read request pending */
bool retryRdReq;
@@ -262,19 +263,18 @@ class MemSinkCtrl : public MemCtrl
MemSinkCtrlStats stats;
};
} // namespace qos
class QoSMemSinkInterface : public AbstractMemory
class MemSinkInterface : public AbstractMemory
{
public:
/** Setting a pointer to the interface */
void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
void setMemCtrl(MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
/** Pointer to the controller */
qos::MemSinkCtrl* ctrl;
MemSinkCtrl* ctrl;
QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p);
MemSinkInterface(const QoSMemSinkInterfaceParams &_p);
};
} // namespace qos
#endif /* __MEM_QOS_MEM_SINK_HH__ */