Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33642 )
Change subject: mem: Update initMaster functions
......................................................................
mem: Update initMaster functions
Change-Id: I1571a63515233a5d5059ece27f6ce84edcef727f
---
M src/mem/qos/QoSPolicy.py
M src/mem/qos/policy_fixed_prio.cc
M src/mem/qos/policy_fixed_prio.hh
M src/mem/qos/policy_pf.cc
M src/mem/qos/policy_pf.hh
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/mem/qos/QoSPolicy.py b/src/mem/qos/QoSPolicy.py
index ed72043..ef18011 100644
--- a/src/mem/qos/QoSPolicy.py
+++ b/src/mem/qos/QoSPolicy.py
@@ -51,8 +51,8 @@
cxx_class = 'QoS::FixedPriorityPolicy'
cxx_exports = [
- PyBindMethod('initMasterName'),
- PyBindMethod('initMasterObj'),
+ PyBindMethod('initRequestorName'),
+ PyBindMethod('initRequestorObj'),
]
_mpriorities = None
@@ -72,10 +72,10 @@
master = mprio[0]
priority = mprio[1]
if isinstance(master, string_types):
- self.getCCObject().initMasterName(
+ self.getCCObject().initRequestorName(
master, int(priority))
else:
- self.getCCObject().initMasterObj(
+ self.getCCObject().initRequestorObj(
master.getCCObject(), priority)
# default fixed priority value for non-listed Masters
@@ -88,8 +88,8 @@
cxx_class = 'QoS::PropFairPolicy'
cxx_exports = [
- PyBindMethod('initMasterName'),
- PyBindMethod('initMasterObj'),
+ PyBindMethod('initRequestorName'),
+ PyBindMethod('initRequestorObj'),
]
_mscores = None
@@ -109,10 +109,10 @@
master = mprio[0]
score = mprio[1]
if isinstance(master, string_types):
- self.getCCObject().initMasterName(
+ self.getCCObject().initRequestorName(
master, float(score))
else:
- self.getCCObject().initMasterObj(
+ self.getCCObject().initRequestorObj(
master.getCCObject(), float(score))
weight = Param.Float(0.5, "Pf score weight")
diff --git a/src/mem/qos/policy_fixed_prio.cc
b/src/mem/qos/policy_fixed_prio.cc
index 8681b90..bcd9098 100644
--- a/src/mem/qos/policy_fixed_prio.cc
+++ b/src/mem/qos/policy_fixed_prio.cc
@@ -59,14 +59,15 @@
}
void
-FixedPriorityPolicy::initMasterName(std::string master, uint8_t priority)
+FixedPriorityPolicy::initRequestorName(std::string master, uint8_t
priority)
{
priorityMap.insert(
this->pair<std::string, uint8_t>(master, priority));
}
void
-FixedPriorityPolicy::initMasterObj(const SimObject* master, uint8_t
priority)
+FixedPriorityPolicy::initRequestorObj(const SimObject* master,
+ uint8_t priority)
{
priorityMap.insert(
this->pair<const SimObject*, uint8_t>(master, priority));
diff --git a/src/mem/qos/policy_fixed_prio.hh
b/src/mem/qos/policy_fixed_prio.hh
index 08f46a4..27d7b11 100644
--- a/src/mem/qos/policy_fixed_prio.hh
+++ b/src/mem/qos/policy_fixed_prio.hh
@@ -69,7 +69,7 @@
* @param master master's name to lookup.
* @param priority priority value for the master
*/
- void initMasterName(std::string master, uint8_t priority);
+ void initRequestorName(std::string master, uint8_t priority);
/**
* Initialize the fixed master's priority by providing
@@ -78,7 +78,7 @@
* @param master master's SimObject pointer to lookup.
* @param priority priority value for the master
*/
- void initMasterObj(const SimObject* master, uint8_t priority);
+ void initRequestorObj(const SimObject* master, uint8_t priority);
/**
* Schedules a packet based on fixed priority configuration
diff --git a/src/mem/qos/policy_pf.cc b/src/mem/qos/policy_pf.cc
index 58c4e38..d6cd7eb 100644
--- a/src/mem/qos/policy_pf.cc
+++ b/src/mem/qos/policy_pf.cc
@@ -55,7 +55,7 @@
template <typename Master>
void
-PropFairPolicy::initMaster(const Master master, const double score)
+PropFairPolicy::initRequestor(const Master master, const double score)
{
MasterID m_id = memCtrl->system()->lookupMasterId(master);
@@ -70,15 +70,15 @@
}
void
-PropFairPolicy::initMasterName(const std::string master, const double
score)
+PropFairPolicy::initRequestorName(const std::string master, const double
score)
{
- initMaster(master, score);
+ initRequestor(master, score);
}
void
-PropFairPolicy::initMasterObj(const SimObject* master, const double score)
+PropFairPolicy::initRequestorObj(const SimObject* master, const double
score)
{
- initMaster(master, score);
+ initRequestor(master, score);
}
double
diff --git a/src/mem/qos/policy_pf.hh b/src/mem/qos/policy_pf.hh
index c741e9c..580fa07 100644
--- a/src/mem/qos/policy_pf.hh
+++ b/src/mem/qos/policy_pf.hh
@@ -74,7 +74,7 @@
* @param master master's name to lookup.
* @param score initial score value for the master
*/
- void initMasterName(const std::string master, const double score);
+ void initRequestorName(const std::string master, const double score);
/**
* Initialize the master's score by providing
@@ -84,7 +84,7 @@
* @param master master's SimObject pointer to lookup.
* @param score initial score value for the master
*/
- void initMasterObj(const SimObject* master, const double score);
+ void initRequestorObj(const SimObject* master, const double score);
/**
* Schedules a packet based on proportional fair configuration
@@ -98,7 +98,7 @@
protected:
template <typename Master>
- void initMaster(const Master master, const double score);
+ void initRequestor(const Master master, const double score);
inline double
updateScore(const double old_score, const uint64_t served_bytes) const;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33642
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: I1571a63515233a5d5059ece27f6ce84edcef727f
Gerrit-Change-Number: 33642
Gerrit-PatchSet: 1
Gerrit-Owner: Shivani Parekh <[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
