Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33640 )
Change subject: mem,mem-cache,mem-ruby: Update function maxMasters()
......................................................................
mem,mem-cache,mem-ruby: Update function maxMasters()
Change-Id: Iba5e995bbda988219697abad31008237b7c7c7d6
---
M src/mem/abstract_mem.cc
M src/mem/cache/base.cc
M src/mem/cache/tags/base.cc
M src/mem/dram_ctrl.cc
M src/mem/probes/mem_trace.cc
M src/mem/qos/mem_ctrl.cc
M src/mem/ruby/system/RubySystem.cc
M src/sim/system.hh
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index 26df408..912b649 100644
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -145,7 +145,7 @@
System *sys = mem.system();
assert(sys);
- const auto max_masters = sys->maxMasters();
+ const auto max_masters = sys->maxRequestors();
bytesRead
.init(max_masters)
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index 73b853a..4c228eb 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1868,7 +1868,7 @@
Stats::Group::regStats();
System *system = cache.system;
- const auto max_masters = system->maxMasters();
+ const auto max_masters = system->maxRequestors();
hits
.init(max_masters)
@@ -2063,7 +2063,7 @@
Stats::Group::regStats();
System *system = cache.system;
- const auto max_masters = system->maxMasters();
+ const auto max_masters = system->maxRequestors();
for (auto &cs : cmd)
cs->regStatsFromParent();
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 778ae8c..fd6f47b 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -240,15 +240,15 @@
avgRefs = totalRefs / sampledRefs;
occupancies
- .init(system->maxMasters())
+ .init(system->maxRequestors())
.flags(nozero | nonan)
;
- for (int i = 0; i < system->maxMasters(); i++) {
+ for (int i = 0; i < system->maxRequestors(); i++) {
occupancies.subname(i, system->getRequestorName(i));
}
avgOccs.flags(nozero | total);
- for (int i = 0; i < system->maxMasters(); i++) {
+ for (int i = 0; i < system->maxRequestors(); i++) {
avgOccs.subname(i, system->getRequestorName(i));
}
diff --git a/src/mem/dram_ctrl.cc b/src/mem/dram_ctrl.cc
index ff35da6..0605fe0 100644
--- a/src/mem/dram_ctrl.cc
+++ b/src/mem/dram_ctrl.cc
@@ -2679,7 +2679,7 @@
using namespace Stats;
assert(dram._system);
- const auto max_masters = dram._system->maxMasters();
+ const auto max_masters = dram._system->maxRequestors();
perBankRdBursts.init(dram.banksPerRank * dram.ranksPerChannel);
perBankWrBursts.init(dram.banksPerRank * dram.ranksPerChannel);
diff --git a/src/mem/probes/mem_trace.cc b/src/mem/probes/mem_trace.cc
index f163835..820f984 100644
--- a/src/mem/probes/mem_trace.cc
+++ b/src/mem/probes/mem_trace.cc
@@ -86,7 +86,7 @@
header_msg.set_obj_id(name());
header_msg.set_tick_freq(SimClock::Frequency);
- for (int i = 0; i < system->maxMasters(); i++) {
+ for (int i = 0; i < system->maxRequestors(); i++) {
auto id_string = header_msg.add_id_strings();
id_string->set_key(i);
id_string->set_value(system->getRequestorName(i));
diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index 8a31406..21f5311 100644
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -312,7 +312,7 @@
using namespace Stats;
System *system = memCtrl._system;
- const auto max_masters = system->maxMasters();
+ const auto max_masters = system->maxRequestors();
const auto num_priorities = memCtrl.numPriorities();
// Initializes per master statistics
diff --git a/src/mem/ruby/system/RubySystem.cc
b/src/mem/ruby/system/RubySystem.cc
index 48104a9..ba38552 100644
--- a/src/mem/ruby/system/RubySystem.cc
+++ b/src/mem/ruby/system/RubySystem.cc
@@ -155,7 +155,7 @@
}
// Default all other master IDs to network 0
- for (auto mid = 0; mid < params()->system->maxMasters(); ++mid) {
+ for (auto mid = 0; mid < params()->system->maxRequestors(); ++mid) {
if (!masterToNetwork.count(mid)) {
masterToNetwork.insert(std::make_pair(mid, 0));
}
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 4374e02..4dfad11 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -502,7 +502,7 @@
MasterID lookupMasterId(const std::string& name) const;
/** Get the number of masters registered in the system */
- MasterID maxMasters() { return masters.size(); }
+ MasterID maxRequestors() { return masters.size(); }
protected:
/** helper function for getUniqueId */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33640
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: Iba5e995bbda988219697abad31008237b7c7c7d6
Gerrit-Change-Number: 33640
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
