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

mem: Adopt the memory namespace in qos files

Browse Source 
Encapsulate everything qos-related in the gem5::memory
namespace.

Change-Id: Ib906ddd6d76b9d4a56f2eb705efe6cd498829155
Issued-on: https://gem5.atlassian.net/browse/GEM5-983
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47308
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
This commit is contained in:
Daniel R. Carvalho
2021-06-12 12:59:00 -03:00
committed by Daniel Carvalho
parent 06da510020
commit 5635b3aaa2
22 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mem/mem_ctrl.cc
View File

@@ -53,7 +53,7 @@ namespace gem5
{
MemCtrl::MemCtrl(const MemCtrlParams &p) :
qos::MemCtrl(p),
memory::qos::MemCtrl(p),
port(name() + ".port", *this), isTimingMode(false),
retryRdReq(false), retryWrReq(false),
nextReqEvent([this]{ processNextReqEvent(); }, name()),
@@ -1396,7 +1396,7 @@ Port &
MemCtrl::getPort(const std::string &if_name, PortID idx)
{
if (if_name != "port") {
return qos::MemCtrl::getPort(if_name, idx);
return memory::qos::MemCtrl::getPort(if_name, idx);
} else {
return port;
}

2
src/mem/mem_ctrl.hh
View File

@@ -236,7 +236,7 @@ typedef std::deque<MemPacket*> MemPacketQueue;
* please cite the paper.
*
*/
class MemCtrl : public qos::MemCtrl
class MemCtrl : public memory::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 = 'gem5::qos::MemCtrl'
cxx_class = 'gem5::memory::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 = 'gem5::qos::MemSinkCtrl'
cxx_class = 'gem5::memory::qos::MemSinkCtrl'
port = ResponsePort("Response ports")

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

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

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 = 'gem5::qos::Policy'
cxx_class = 'gem5::memory::qos::Policy'
class QoSFixedPriorityPolicy(QoSPolicy):
type = 'QoSFixedPriorityPolicy'
cxx_header = "mem/qos/policy_fixed_prio.hh"
cxx_class = 'gem5::qos::FixedPriorityPolicy'
cxx_class = 'gem5::memory::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 = 'gem5::qos::PropFairPolicy'
cxx_class = 'gem5::memory::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 = 'gem5::qos::TurnaroundPolicy'
cxx_class = 'gem5::memory::qos::TurnaroundPolicy'
abstract = True
class QoSTurnaroundPolicyIdeal(QoSTurnaroundPolicy):
type = 'QoSTurnaroundPolicyIdeal'
cxx_header = "mem/qos/turnaround_policy_ideal.hh"
cxx_class = 'gem5::qos::TurnaroundPolicyIdeal'
cxx_class = 'gem5::memory::qos::TurnaroundPolicyIdeal'

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

@@ -45,6 +45,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -371,4 +374,5 @@ MemCtrl::recordTurnaroundStats()
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -61,6 +61,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -537,6 +540,7 @@ MemCtrl::qosSchedule(std::initializer_list<Queues*> queues,
}
} // namespace qos
} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_MEM_CTRL_HH__ */

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

@@ -47,6 +47,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -395,4 +398,5 @@ MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p)
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -56,6 +56,9 @@ namespace gem5
struct QoSMemSinkInterfaceParams;
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -279,6 +282,7 @@ class MemSinkInterface : public AbstractMemory
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_MEM_SINK_HH__

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

@@ -42,6 +42,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -60,4 +63,5 @@ Policy::schedule(const PacketPtr pkt)
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -54,6 +54,9 @@ namespace gem5
struct QoSPolicyParams;
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -138,6 +141,7 @@ Policy::pair(Requestor requestor, T value)
}
} // namespace qos
} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_POLICY_HH__ */

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

@@ -48,6 +48,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -100,4 +103,5 @@ FixedPriorityPolicy::schedule(const RequestorID id, const uint64_t data)
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -49,6 +49,9 @@ namespace gem5
struct QoSFixedPriorityPolicyParams;
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -109,6 +112,7 @@ class FixedPriorityPolicy : public Policy
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_POLICY_FIXED_PRIO_HH__

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

@@ -45,6 +45,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -128,4 +131,5 @@ PropFairPolicy::schedule(const RequestorID pkt_id, const uint64_t pkt_size)
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -49,6 +49,9 @@ namespace gem5
struct QoSPropFairPolicyParams;
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -119,6 +122,7 @@ class PropFairPolicy : public Policy
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_POLICY_PF_HH__

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

@@ -49,6 +49,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -150,4 +153,5 @@ LrgQueuePolicy::enqueuePacket(PacketPtr pkt)
};
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -50,6 +50,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -190,6 +193,7 @@ class LrgQueuePolicy : public QueuePolicy
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_Q_POLICY_HH__ */

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

@@ -46,6 +46,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -82,6 +85,7 @@ class TurnaroundPolicy : public SimObject
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_TURNAROUND_POLICY_HH__ */

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

@@ -45,6 +45,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -104,4 +107,5 @@ TurnaroundPolicyIdeal::selectBusState()
}
} // namespace qos
} // namespace memory
} // namespace gem5

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

@@ -44,6 +44,9 @@
namespace gem5
{
namespace memory
{
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -72,6 +75,7 @@ class TurnaroundPolicyIdeal: public TurnaroundPolicy
};
} // namespace qos
} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_ */