Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33643 )
Change subject: mem,sim: Update lookupMasterId function
......................................................................
mem,sim: Update lookupMasterId function
Change-Id: I3335f67814d23911ee403a634206f9b016ca2885
---
M src/mem/qos/policy.hh
M src/mem/qos/policy_pf.cc
M src/sim/system.cc
M src/sim/system.hh
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mem/qos/policy.hh b/src/mem/qos/policy.hh
index 3ffe481..c3a0b3f 100644
--- a/src/mem/qos/policy.hh
+++ b/src/mem/qos/policy.hh
@@ -114,7 +114,7 @@
std::pair<MasterID, T>
Policy::pair(M master, T value)
{
- auto id = memCtrl->system()->lookupMasterId(master);
+ auto id = memCtrl->system()->lookupRequestorId(master);
panic_if(id == Request::invldMasterId,
"Unable to find master %s\n", master);
diff --git a/src/mem/qos/policy_pf.cc b/src/mem/qos/policy_pf.cc
index d6cd7eb..541ce72 100644
--- a/src/mem/qos/policy_pf.cc
+++ b/src/mem/qos/policy_pf.cc
@@ -57,7 +57,7 @@
void
PropFairPolicy::initRequestor(const Master master, const double score)
{
- MasterID m_id = memCtrl->system()->lookupMasterId(master);
+ MasterID m_id = memCtrl->system()->lookupRequestorId(master);
assert(m_id != Request::invldMasterId);
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 621c48d..bd9d980 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -554,7 +554,7 @@
}
MasterID
-System::lookupMasterId(const SimObject* obj) const
+System::lookupRequestorId(const SimObject* obj) const
{
MasterID id = Request::invldMasterId;
@@ -577,7 +577,7 @@
}
MasterID
-System::lookupMasterId(const std::string& master_name) const
+System::lookupRequestorId(const std::string& master_name) const
{
std::string name = stripSystemName(master_name);
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 4dfad11..d7d345a 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -493,13 +493,13 @@
* Looks up the MasterID for a given SimObject
* returns an invalid MasterID (invldMasterId) if not found.
*/
- MasterID lookupMasterId(const SimObject* obj) const;
+ MasterID lookupRequestorId(const SimObject* obj) const;
/**
* Looks up the MasterID for a given object name string
* returns an invalid MasterID (invldMasterId) if not found.
*/
- MasterID lookupMasterId(const std::string& name) const;
+ MasterID lookupRequestorId(const std::string& name) const;
/** Get the number of masters registered in the system */
MasterID maxRequestors() { return masters.size(); }
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33643
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: I3335f67814d23911ee403a634206f9b016ca2885
Gerrit-Change-Number: 33643
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