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

mem: Rename QoS namespace as qos

Browse Source 
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::QoS became ::qos.

Fixed some incorrect occurrences of the class name
on debug prints.

Change-Id: I163eae14e1e343384faa22af08570cfb81ae6fb6
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45404
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
This commit is contained in:
Daniel R. Carvalho
2021-05-06 09:05:38 -03:00
committed by Daniel Carvalho
parent 0ca1c457e8
commit 9211b5f5d4
21 changed files with 114 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mem/mem_ctrl.cc
View File

@@ -50,7 +50,7 @@
#include "sim/system.hh"
MemCtrl::MemCtrl(const MemCtrlParams &p) :
QoS::MemCtrl(p),
qos::MemCtrl(p),
port(name() + ".port", *this), isTimingMode(false),
retryRdReq(false), retryWrReq(false),
nextReqEvent([this]{ processNextReqEvent(); }, name()),
@@ -1393,7 +1393,7 @@ Port &
MemCtrl::getPort(const std::string &if_name, PortID idx)
{
if (if_name != "port") {
return QoS::MemCtrl::getPort(if_name, idx);
return qos::MemCtrl::getPort(if_name, idx);
} else {
return port;
}

2
src/mem/mem_ctrl.hh
View File

@@ -233,7 +233,7 @@ typedef std::deque<MemPacket*> MemPacketQueue;
* please cite the paper.
*
*/
class MemCtrl : public QoS::MemCtrl
class MemCtrl : public qos::MemCtrl
{
private:

2
src/mem/qos/QoSMemCtrl.py
View File

@@ -44,7 +44,7 @@ class QoSQPolicy(Enum): vals = ["fifo", "lifo", "lrg"]
class QoSMemCtrl(ClockedObject):
type = 'QoSMemCtrl'
cxx_header = "mem/qos/mem_ctrl.hh"
cxx_class = 'QoS::MemCtrl'
cxx_class = 'qos::MemCtrl'
abstract = True
system = Param.System(Parent.any, "System that the controller belongs to.")

2
src/mem/qos/QoSMemSinkCtrl.py
View File

@@ -42,7 +42,7 @@ from m5.objects.QoSMemSinkInterface import *
class QoSMemSinkCtrl(QoSMemCtrl):
type = 'QoSMemSinkCtrl'
cxx_header = "mem/qos/mem_sink.hh"
cxx_class = "QoS::MemSinkCtrl"
cxx_class = "qos::MemSinkCtrl"
port = ResponsePort("Response ports")

6
src/mem/qos/QoSPolicy.py
View File

@@ -41,12 +41,12 @@ class QoSPolicy(SimObject):
type = 'QoSPolicy'
abstract = True
cxx_header = "mem/qos/policy.hh"
cxx_class = 'QoS::Policy'
cxx_class = 'qos::Policy'
class QoSFixedPriorityPolicy(QoSPolicy):
type = 'QoSFixedPriorityPolicy'
cxx_header = "mem/qos/policy_fixed_prio.hh"
cxx_class = 'QoS::FixedPriorityPolicy'
cxx_class = 'qos::FixedPriorityPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),
@@ -90,7 +90,7 @@ class QoSFixedPriorityPolicy(QoSPolicy):
class QoSPropFairPolicy(QoSPolicy):
type = 'QoSPropFairPolicy'
cxx_header = "mem/qos/policy_pf.hh"
cxx_class = 'QoS::PropFairPolicy'
cxx_class = 'qos::PropFairPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),

4
src/mem/qos/QoSTurnaround.py
View File

@@ -39,10 +39,10 @@ from m5.SimObject import SimObject
class QoSTurnaroundPolicy(SimObject):
type = 'QoSTurnaroundPolicy'
cxx_header = "mem/qos/turnaround_policy.hh"
cxx_class = 'QoS::TurnaroundPolicy'
cxx_class = 'qos::TurnaroundPolicy'
abstract = True
class QoSTurnaroundPolicyIdeal(QoSTurnaroundPolicy):
type = 'QoSTurnaroundPolicyIdeal'
cxx_header = "mem/qos/turnaround_policy_ideal.hh"
cxx_class = 'QoS::TurnaroundPolicyIdeal'
cxx_class = 'qos::TurnaroundPolicyIdeal'

32
src/mem/qos/mem_ctrl.cc
View File

@@ -42,7 +42,9 @@
#include "mem/qos/turnaround_policy.hh"
#include "sim/core.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
MemCtrl::MemCtrl(const QoSMemCtrlParams &p)
: ClockedObject(p),
@@ -89,7 +91,7 @@ MemCtrl::logRequest(BusState dir, RequestorID id, uint8_t _qos,
addRequestor(id);
DPRINTF(QOS,
"QoSMemCtrl::logRequest REQUESTOR %s [id %d] address %d"
"qos::MemCtrl::logRequest REQUESTOR %s [id %d] address %d"
" prio %d this requestor q packets %d"
" - queue size %d - requested entries %d\n",
requestors[id], id, addr, _qos, packetPriorities[id][_qos],
@@ -121,7 +123,7 @@ MemCtrl::logRequest(BusState dir, RequestorID id, uint8_t _qos,
if (distance > 0) {
stats.avgPriorityDistance[id].sample(distance);
DPRINTF(QOS,
"QoSMemCtrl::logRequest REQUESTOR %s [id %d]"
"qos::MemCtrl::logRequest REQUESTOR %s [id %d]"
" registering priority distance %d for priority %d"
" (packets %d)\n",
requestors[id], id, distance, i,
@@ -130,7 +132,7 @@ MemCtrl::logRequest(BusState dir, RequestorID id, uint8_t _qos,
}
DPRINTF(QOS,
"QoSMemCtrl::logRequest REQUESTOR %s [id %d] prio %d "
"qos::MemCtrl::logRequest REQUESTOR %s [id %d] prio %d "
"this requestor q packets %d - new queue size %d\n",
requestors[id], id, _qos, packetPriorities[id][_qos],
(dir == READ) ? readQueueSizes[_qos]: writeQueueSizes[_qos]);
@@ -145,7 +147,7 @@ MemCtrl::logResponse(BusState dir, RequestorID id, uint8_t _qos,
"Logging response with invalid requestor\n");
DPRINTF(QOS,
"QoSMemCtrl::logResponse REQUESTOR %s [id %d] address %d prio"
"qos::MemCtrl::logResponse REQUESTOR %s [id %d] address %d prio"
" %d this requestor q packets %d"
" - queue size %d - requested entries %d\n",
requestors[id], id, addr, _qos, packetPriorities[id][_qos],
@@ -161,7 +163,7 @@ MemCtrl::logResponse(BusState dir, RequestorID id, uint8_t _qos,
}
panic_if(packetPriorities[id][_qos] == 0,
"QoSMemCtrl::logResponse requestor %s negative packets "
"qos::MemCtrl::logResponse requestor %s negative packets "
"for priority %d", requestors[id], _qos);
packetPriorities[id][_qos] -= entries;
@@ -169,8 +171,8 @@ MemCtrl::logResponse(BusState dir, RequestorID id, uint8_t _qos,
for (auto j = 0; j < entries; ++j) {
auto it = requestTimes[id].find(addr);
panic_if(it == requestTimes[id].end(),
"QoSMemCtrl::logResponse requestor %s unmatched response for"
" address %d received", requestors[id], addr);
"qos::MemCtrl::logResponse requestor %s unmatched response "
"for address %d received", requestors[id], addr);
// Load request time
uint64_t requestTime = it->second.front();
@@ -200,7 +202,7 @@ MemCtrl::logResponse(BusState dir, RequestorID id, uint8_t _qos,
}
DPRINTF(QOS,
"QoSMemCtrl::logResponse REQUESTOR %s [id %d] prio %d "
"qos::MemCtrl::logResponse REQUESTOR %s [id %d] prio %d "
"this requestor q packets %d - new queue size %d\n",
requestors[id], id, _qos, packetPriorities[id][_qos],
(dir == READ) ? readQueueSizes[_qos]: writeQueueSizes[_qos]);
@@ -213,7 +215,7 @@ MemCtrl::schedule(RequestorID id, uint64_t data)
return policy->schedule(id, data);
} else {
DPRINTF(QOS,
"QoSScheduler::schedule requestor id [%d] "
"qos::MemCtrl::schedule requestor id [%d] "
"data received [%d], but QoS scheduler not initialized\n",
id,data);
return 0;
@@ -228,7 +230,7 @@ MemCtrl::schedule(const PacketPtr pkt)
if (policy) {
return schedule(pkt->req->requestorId(), pkt->getSize());
} else {
DPRINTF(QOS, "QoSScheduler::schedule Packet received [Qv %d], "
DPRINTF(QOS, "qos::MemCtrl::schedule Packet received [Qv %d], "
"but QoS scheduler not initialized\n",
pkt->qosValue());
return pkt->qosValue();
@@ -242,13 +244,13 @@ MemCtrl::selectNextBusState()
if (turnPolicy) {
DPRINTF(QOS,
"QoSMemoryTurnaround::selectBusState running policy %s\n",
"qos::MemCtrl::selectNextBusState running policy %s\n",
turnPolicy->name());
bus_state = turnPolicy->selectBusState();
} else {
DPRINTF(QOS,
"QoSMemoryTurnaround::selectBusState running "
"qos::MemCtrl::selectNextBusState running "
"default bus direction selection policy\n");
if ((!getTotalReadQueueSize() && bus_state == MemCtrl::READ) ||
@@ -271,7 +273,7 @@ MemCtrl::addRequestor(RequestorID id)
packetPriorities[id].resize(numPriorities(), 0);
DPRINTF(QOS,
"QoSMemCtrl::addRequestor registering"
"qos::MemCtrl::addRequestor registering"
" Requestor %s [id %d]\n",
requestors[id], id);
}
@@ -365,4 +367,4 @@ MemCtrl::recordTurnaroundStats()
}
}
} // namespace QoS
} // namespace qos

47
src/mem/qos/mem_ctrl.hh
View File

@@ -45,6 +45,7 @@
#include <utility>
#include <vector>
#include "base/compiler.hh"
#include "base/logging.hh"
#include "base/statistics.hh"
#include "base/trace.hh"
@@ -57,14 +58,16 @@
#include "sim/cur_tick.hh"
#include "sim/system.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
class Policy;
class QueuePolicy;
class TurnaroundPolicy;
/**
* The QoS::MemCtrl is a base class for Memory objects
* The qos::MemCtrl is a base class for Memory objects
* which support QoS - it provides access to a set of QoS
* scheduling policies
*/
@@ -180,11 +183,11 @@ class MemCtrl : public ClockedObject
*
* @param dir request direction
* @param id requestor id
* @param qos packet qos value
* @param _qos packet QoS value
* @param addr packet address
* @param entries number of entries to record
*/
void logRequest(BusState dir, RequestorID id, uint8_t qos,
void logRequest(BusState dir, RequestorID id, uint8_t _qos,
Addr addr, uint64_t entries);
/**
@@ -193,12 +196,12 @@ class MemCtrl : public ClockedObject
*
* @param dir response direction
* @param id requestor id
* @param qos packet qos value
* @param _qos packet QoS value
* @param addr packet address
* @param entries number of entries to record
* @param delay response delay
*/
void logResponse(BusState dir, RequestorID id, uint8_t qos,
void logResponse(BusState dir, RequestorID id, uint8_t _qos,
Addr addr, uint64_t entries, double delay);
/**
@@ -376,7 +379,7 @@ MemCtrl::escalateQueues(Queues& queues, uint64_t queue_entry_size,
auto pkt = *it;
DPRINTF(QOS,
"QoSMemCtrl::escalate checking priority %d packet "
"qos::MemCtrl::escalateQueues checking priority %d packet "
"id %d address %d\n", curr_prio,
pkt->requestorId(), pkt->getAddr());
@@ -387,7 +390,7 @@ MemCtrl::escalateQueues(Queues& queues, uint64_t queue_entry_size,
queue_entry_size);
DPRINTF(QOS,
"QoSMemCtrl::escalate Requestor %s [id %d] moving "
"qos::MemCtrl::escalateQueues Requestor %s [id %d] moving "
"packet addr %d size %d (p size %d) from priority %d "
"to priority %d - "
"this requestor packets %d (entries to move %d)\n",
@@ -399,15 +402,15 @@ MemCtrl::escalateQueues(Queues& queues, uint64_t queue_entry_size,
if (pkt->isRead()) {
panic_if(readQueueSizes[curr_prio] < moved_entries,
"QoSMemCtrl::escalate requestor %s negative READ "
"packets for priority %d",
"qos::MemCtrl::escalateQueues requestor %s negative "
"READ packets for priority %d",
requestors[id], tgt_prio);
readQueueSizes[curr_prio] -= moved_entries;
readQueueSizes[tgt_prio] += moved_entries;
} else if (pkt->isWrite()) {
panic_if(writeQueueSizes[curr_prio] < moved_entries,
"QoSMemCtrl::escalate requestor %s negative WRITE "
"packets for priority %d",
"qos::MemCtrl::escalateQueues requestor %s negative "
"WRITE packets for priority %d",
requestors[id], tgt_prio);
writeQueueSizes[curr_prio] -= moved_entries;
writeQueueSizes[tgt_prio] += moved_entries;
@@ -421,8 +424,8 @@ MemCtrl::escalateQueues(Queues& queues, uint64_t queue_entry_size,
// increment the iterator
it = queues[curr_prio].erase(it);
panic_if(packetPriorities[id][curr_prio] < moved_entries,
"QoSMemCtrl::escalate requestor %s negative packets "
"for priority %d",
"qos::MemCtrl::escalateQueues requestor %s negative "
"packets for priority %d",
requestors[id], tgt_prio);
packetPriorities[id][curr_prio] -= moved_entries;
@@ -445,7 +448,7 @@ MemCtrl::escalate(std::initializer_list<Queues*> queues,
addRequestor(id);
DPRINTF(QOS,
"QoSMemCtrl::escalate Requestor %s [id %d] to priority "
"qos::MemCtrl::escalate Requestor %s [id %d] to priority "
"%d (currently %d packets)\n",requestors[id], id, tgt_prio,
packetPriorities[id][tgt_prio]);
@@ -457,7 +460,7 @@ MemCtrl::escalate(std::initializer_list<Queues*> queues,
// Process other priority packet
while (packetPriorities[id][curr_prio] > 0) {
DPRINTF(QOS,
"QoSMemCtrl::escalate MID %d checking priority %d "
"qos::MemCtrl::escalate MID %d checking priority %d "
"(packets %d)- current packets in prio %d: %d\n"
"\t(source read %d source write %d target read %d, "
"target write %d)\n",
@@ -476,9 +479,9 @@ MemCtrl::escalate(std::initializer_list<Queues*> queues,
}
DPRINTF(QOS,
"QoSMemCtrl::escalate Completed requestor %s [id %d] to priority "
"%d (now %d packets)\n\t(total read %d, total write %d)\n",
requestors[id], id, tgt_prio, packetPriorities[id][tgt_prio],
"qos::MemCtrl::escalate Completed requestor %s [id %d] to "
"priority %d (now %d packets)\n\t(total read %d, total write %d)"
"\n", requestors[id], id, tgt_prio, packetPriorities[id][tgt_prio],
readQueueSizes[tgt_prio], writeQueueSizes[tgt_prio]);
}
@@ -506,7 +509,7 @@ MemCtrl::qosSchedule(std::initializer_list<Queues*> queues,
if (qosPriorityEscalation) {
DPRINTF(QOS,
"QoSMemCtrl::qosSchedule: (syncro) escalating "
"qos::MemCtrl::qosSchedule: (syncro) escalating "
"REQUESTOR %s to assigned priority %d\n",
_system->getRequestorName(requestor.first),
prio);
@@ -517,7 +520,7 @@ MemCtrl::qosSchedule(std::initializer_list<Queues*> queues,
if (qosPriorityEscalation) {
DPRINTF(QOS,
"QoSMemCtrl::qosSchedule: escalating "
"qos::MemCtrl::qosSchedule: escalating "
"REQUESTOR %s to assigned priority %d\n",
_system->getRequestorName(pkt->requestorId()),
pkt_priority);
@@ -530,6 +533,6 @@ MemCtrl::qosSchedule(std::initializer_list<Queues*> queues,
return pkt_priority;
}
} // namespace QoS
} // namespace qos
#endif /* __MEM_QOS_MEM_CTRL_HH__ */

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

@@ -44,7 +44,9 @@
#include "mem/qos/q_policy.hh"
#include "params/QoSMemSinkInterface.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
MemSinkCtrl::MemSinkCtrl(const QoSMemSinkCtrlParams &p)
: MemCtrl(p), requestLatency(p.request_latency),
@@ -384,7 +386,7 @@ MemSinkCtrl::MemoryPort::recvTimingReq(PacketPtr pkt)
return memory.recvTimingReq(pkt);
}
} // namespace QoS
} // namespace qos
QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p)
: AbstractMemory(_p)

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

@@ -43,6 +43,7 @@
#include <deque>
#include <vector>
#include "base/compiler.hh"
#include "base/types.hh"
#include "mem/abstract_mem.hh"
#include "mem/qos/mem_ctrl.hh"
@@ -53,7 +54,9 @@
struct QoSMemSinkInterfaceParams;
class QoSMemSinkInterface;
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* QoS Memory Sink
@@ -259,16 +262,16 @@ class MemSinkCtrl : public MemCtrl
MemSinkCtrlStats stats;
};
} // namespace QoS
} // namespace qos
class QoSMemSinkInterface : public AbstractMemory
{
public:
/** Setting a pointer to the interface */
void setMemCtrl(QoS::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
/** Pointer to the controller */
QoS::MemSinkCtrl* ctrl;
qos::MemSinkCtrl* ctrl;
QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p);
};

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

@@ -39,7 +39,9 @@
#include "params/QoSPolicy.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
Policy::Policy(const Params &p)
: SimObject(p)
@@ -54,4 +56,4 @@ Policy::schedule(const PacketPtr pkt)
return schedule(pkt->req->requestorId(), pkt->getSize());
}
} // namespace QoS
} // namespace qos

7
src/mem/qos/policy.hh
View File

@@ -41,6 +41,7 @@
#include <cstdint>
#include <utility>
#include "base/compiler.hh"
#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/QOS.hh"
@@ -50,7 +51,9 @@
struct QoSPolicyParams;
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* QoS Policy base class
@@ -131,6 +134,6 @@ Policy::pair(Requestor requestor, T value)
return std::pair<RequestorID, T>(id, value);
}
} // namespace QoS
} // namespace qos
#endif /* __MEM_QOS_POLICY_HH__ */

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

@@ -45,7 +45,9 @@
#include "mem/request.hh"
#include "params/QoSFixedPriorityPolicy.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
FixedPriorityPolicy::FixedPriorityPolicy(const Params &p)
: Policy(p), defaultPriority(p.qos_fixed_prio_default_prio)
@@ -94,4 +96,4 @@ FixedPriorityPolicy::schedule(const RequestorID id, const uint64_t data)
}
}
} // namespace QoS
} // namespace qos

7
src/mem/qos/policy_fixed_prio.hh
View File

@@ -41,11 +41,14 @@
#include <cstdint>
#include <map>
#include "base/compiler.hh"
#include "mem/qos/policy.hh"
struct QoSFixedPriorityPolicyParams;
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* Fixed Priority QoS Policy
@@ -102,6 +105,6 @@ class FixedPriorityPolicy : public Policy
std::map<RequestorID, uint8_t> priorityMap;
};
} // namespace QoS
} // namespace qos
#endif // __MEM_QOS_POLICY_FIXED_PRIO_HH__

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

@@ -42,7 +42,9 @@
#include "base/logging.hh"
#include "params/QoSPropFairPolicy.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
PropFairPolicy::PropFairPolicy(const Params &p)
: Policy(p), weight(p.weight)
@@ -122,4 +124,4 @@ PropFairPolicy::schedule(const RequestorID pkt_id, const uint64_t pkt_size)
return pkt_priority;
}
} // namespace QoS
} // namespace qos

7
src/mem/qos/policy_pf.hh
View File

@@ -40,12 +40,15 @@
#include <vector>
#include "base/compiler.hh"
#include "mem/qos/policy.hh"
#include "mem/request.hh"
struct QoSPropFairPolicyParams;
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* Proportional Fair QoS Policy
@@ -112,6 +115,6 @@ class PropFairPolicy : public Policy
std::vector<RequestorHistory> history;
};
} // namespace QoS
} // namespace qos
#endif // __MEM_QOS_POLICY_PF_HH__

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

@@ -46,7 +46,9 @@
#include "enums/QoSQPolicy.hh"
#include "mem/request.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
QueuePolicy*
QueuePolicy::create(const QoSMemCtrlParams &p)
@@ -144,4 +146,4 @@ LrgQueuePolicy::enqueuePacket(PacketPtr pkt)
}
};
} // namespace QoS
} // namespace qos

9
src/mem/qos/q_policy.hh
View File

@@ -42,11 +42,14 @@
#include <list>
#include <unordered_set>
#include "base/compiler.hh"
#include "mem/packet.hh"
#include "mem/qos/mem_ctrl.hh"
#include "params/QoSMemCtrl.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* QoS Queue Policy
@@ -65,7 +68,7 @@ class QueuePolicy
* QueuePolicy object. If no particular QueuePolicy has been specified in
* the QoSMemCtrlParams, the method will default to a LIFO queue policy.
*
* @param p QoS::MemCtrl parameter variable
* @param p qos::MemCtrl parameter variable
* @return Pointer to the QueuePolicy
*/
static QueuePolicy* create(const QoSMemCtrlParams &p);
@@ -183,6 +186,6 @@ class LrgQueuePolicy : public QueuePolicy
std::list<RequestorID> toServe;
};
} // namespace QoS
} // namespace qos
#endif /* __MEM_QOS_Q_POLICY_HH__ */

7
src/mem/qos/turnaround_policy.hh
View File

@@ -38,11 +38,14 @@
#ifndef __MEM_QOS_TURNAROUND_POLICY_HH__
#define __MEM_QOS_TURNAROUND_POLICY_HH__
#include "base/compiler.hh"
#include "mem/qos/mem_ctrl.hh"
#include "params/QoSTurnaroundPolicy.hh"
#include "sim/sim_object.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* Base class for QoS Bus Turnaround policies
@@ -75,6 +78,6 @@ class TurnaroundPolicy : public SimObject
MemCtrl* memCtrl;
};
} // namespace QoS
} // namespace qos
#endif /* __MEM_QOS_TURNAROUND_POLICY_HH__ */

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

@@ -42,7 +42,9 @@
#include "base/trace.hh"
#include "params/QoSTurnaroundPolicyIdeal.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
TurnaroundPolicyIdeal::TurnaroundPolicyIdeal(const Params &p)
: TurnaroundPolicy(p)
@@ -98,4 +100,4 @@ TurnaroundPolicyIdeal::selectBusState()
return bus_state;
}
} // namespace QoS
} // namespace qos

7
src/mem/qos/turnaround_policy_ideal.hh
View File

@@ -38,9 +38,12 @@
#ifndef __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_
#define __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_
#include "base/compiler.hh"
#include "mem/qos/turnaround_policy.hh"
namespace QoS {
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
/**
* Ideal QoS Bus Turnaround policy
@@ -65,6 +68,6 @@ class TurnaroundPolicyIdeal: public TurnaroundPolicy
virtual MemCtrl::BusState selectBusState() override;
};
} // namespace QoS
} // namespace qos
#endif /* __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_ */