mem: Adopt the memory namespace in qos files
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>
diff --git a/src/mem/mem_ctrl.cc b/src/mem/mem_ctrl.cc
index 8e3545b..5156b84 100644
--- a/src/mem/mem_ctrl.cc
+++ b/src/mem/mem_ctrl.cc
@@ -53,7 +53,7 @@
{
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 @@
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;
}
diff --git a/src/mem/mem_ctrl.hh b/src/mem/mem_ctrl.hh
index b78796f..a30fcb3 100644
--- a/src/mem/mem_ctrl.hh
+++ b/src/mem/mem_ctrl.hh
@@ -236,7 +236,7 @@
* please cite the paper.
*
*/
-class MemCtrl : public qos::MemCtrl
+class MemCtrl : public memory::qos::MemCtrl
{
private:
diff --git a/src/mem/qos/QoSMemCtrl.py b/src/mem/qos/QoSMemCtrl.py
index b3391fb..842b62b 100644
--- a/src/mem/qos/QoSMemCtrl.py
+++ b/src/mem/qos/QoSMemCtrl.py
@@ -44,7 +44,7 @@
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.")
diff --git a/src/mem/qos/QoSMemSinkCtrl.py b/src/mem/qos/QoSMemSinkCtrl.py
index 234d8bc..486e74b 100644
--- a/src/mem/qos/QoSMemSinkCtrl.py
+++ b/src/mem/qos/QoSMemSinkCtrl.py
@@ -42,7 +42,7 @@
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")
diff --git a/src/mem/qos/QoSMemSinkInterface.py b/src/mem/qos/QoSMemSinkInterface.py
index d493dce..2544df8 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,7 +38,7 @@
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):
"""
diff --git a/src/mem/qos/QoSPolicy.py b/src/mem/qos/QoSPolicy.py
index fba2e86..99a3f2f 100644
--- a/src/mem/qos/QoSPolicy.py
+++ b/src/mem/qos/QoSPolicy.py
@@ -41,12 +41,12 @@
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 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'),
diff --git a/src/mem/qos/QoSTurnaround.py b/src/mem/qos/QoSTurnaround.py
index c74f5e8..7a8d1e3 100644
--- a/src/mem/qos/QoSTurnaround.py
+++ b/src/mem/qos/QoSTurnaround.py
@@ -39,10 +39,10 @@
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'
diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index f35d9b3..5bb031c 100644
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -45,6 +45,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -371,4 +374,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/mem_ctrl.hh b/src/mem/qos/mem_ctrl.hh
index a332f69..11e787d 100644
--- a/src/mem/qos/mem_ctrl.hh
+++ b/src/mem/qos/mem_ctrl.hh
@@ -61,6 +61,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -537,6 +540,7 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_MEM_CTRL_HH__ */
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 04d230e..2dec5d5 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -47,6 +47,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -395,4 +398,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index 9cdb62d..a2e975a 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -56,6 +56,9 @@
struct QoSMemSinkInterfaceParams;
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -279,6 +282,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_MEM_SINK_HH__
diff --git a/src/mem/qos/policy.cc b/src/mem/qos/policy.cc
index 1753bb0..6d41e7d 100644
--- a/src/mem/qos/policy.cc
+++ b/src/mem/qos/policy.cc
@@ -42,6 +42,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -60,4 +63,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/policy.hh b/src/mem/qos/policy.hh
index 883eab6..a7e7666 100644
--- a/src/mem/qos/policy.hh
+++ b/src/mem/qos/policy.hh
@@ -54,6 +54,9 @@
struct QoSPolicyParams;
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -138,6 +141,7 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_POLICY_HH__ */
diff --git a/src/mem/qos/policy_fixed_prio.cc b/src/mem/qos/policy_fixed_prio.cc
index 360365c..140817e 100644
--- a/src/mem/qos/policy_fixed_prio.cc
+++ b/src/mem/qos/policy_fixed_prio.cc
@@ -48,6 +48,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -100,4 +103,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/policy_fixed_prio.hh b/src/mem/qos/policy_fixed_prio.hh
index 260798d..77e7a25 100644
--- a/src/mem/qos/policy_fixed_prio.hh
+++ b/src/mem/qos/policy_fixed_prio.hh
@@ -49,6 +49,9 @@
struct QoSFixedPriorityPolicyParams;
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -109,6 +112,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_POLICY_FIXED_PRIO_HH__
diff --git a/src/mem/qos/policy_pf.cc b/src/mem/qos/policy_pf.cc
index 0c150ff..ae15045 100644
--- a/src/mem/qos/policy_pf.cc
+++ b/src/mem/qos/policy_pf.cc
@@ -45,6 +45,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -128,4 +131,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/policy_pf.hh b/src/mem/qos/policy_pf.hh
index 65c543f..acc2a4a 100644
--- a/src/mem/qos/policy_pf.hh
+++ b/src/mem/qos/policy_pf.hh
@@ -49,6 +49,9 @@
struct QoSPropFairPolicyParams;
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -119,6 +122,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif // __MEM_QOS_POLICY_PF_HH__
diff --git a/src/mem/qos/q_policy.cc b/src/mem/qos/q_policy.cc
index 742dc12..de2e316 100644
--- a/src/mem/qos/q_policy.cc
+++ b/src/mem/qos/q_policy.cc
@@ -49,6 +49,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -150,4 +153,5 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/q_policy.hh b/src/mem/qos/q_policy.hh
index d4389e1..7af52b6 100644
--- a/src/mem/qos/q_policy.hh
+++ b/src/mem/qos/q_policy.hh
@@ -50,6 +50,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -190,6 +193,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_Q_POLICY_HH__ */
diff --git a/src/mem/qos/turnaround_policy.hh b/src/mem/qos/turnaround_policy.hh
index 324ef8a..2d5696f 100644
--- a/src/mem/qos/turnaround_policy.hh
+++ b/src/mem/qos/turnaround_policy.hh
@@ -46,6 +46,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -82,6 +85,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_TURNAROUND_POLICY_HH__ */
diff --git a/src/mem/qos/turnaround_policy_ideal.cc b/src/mem/qos/turnaround_policy_ideal.cc
index b6279b9..c67e40b 100644
--- a/src/mem/qos/turnaround_policy_ideal.cc
+++ b/src/mem/qos/turnaround_policy_ideal.cc
@@ -45,6 +45,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -104,4 +107,5 @@
}
} // namespace qos
+} // namespace memory
} // namespace gem5
diff --git a/src/mem/qos/turnaround_policy_ideal.hh b/src/mem/qos/turnaround_policy_ideal.hh
index 29548e6..0a75f79 100644
--- a/src/mem/qos/turnaround_policy_ideal.hh
+++ b/src/mem/qos/turnaround_policy_ideal.hh
@@ -44,6 +44,9 @@
namespace gem5
{
+namespace memory
+{
+
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
@@ -72,6 +75,7 @@
};
} // namespace qos
+} // namespace memory
} // namespace gem5
#endif /* __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_ */
