Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33636 )
Change subject: mem,sim: Update function getMasterName()
......................................................................
mem,sim: Update function getMasterName()
Change-Id: I1bfe0fbcdc19de9927db9dadbad5f9e1ea5730dd
---
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/qos/mem_ctrl.hh
M src/mem/qos/policy_fixed_prio.cc
M src/sim/system.cc
M src/sim/system.hh
10 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index cdece0c..26df408 100644
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -152,7 +152,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bytesRead.subname(i, sys->getMasterName(i));
+ bytesRead.subname(i, sys->getRequestorName(i));
}
bytesInstRead
@@ -160,7 +160,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bytesInstRead.subname(i, sys->getMasterName(i));
+ bytesInstRead.subname(i, sys->getRequestorName(i));
}
bytesWritten
@@ -168,7 +168,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bytesWritten.subname(i, sys->getMasterName(i));
+ bytesWritten.subname(i, sys->getRequestorName(i));
}
numReads
@@ -176,7 +176,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- numReads.subname(i, sys->getMasterName(i));
+ numReads.subname(i, sys->getRequestorName(i));
}
numWrites
@@ -184,7 +184,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- numWrites.subname(i, sys->getMasterName(i));
+ numWrites.subname(i, sys->getRequestorName(i));
}
numOther
@@ -192,7 +192,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- numOther.subname(i, sys->getMasterName(i));
+ numOther.subname(i, sys->getRequestorName(i));
}
bwRead
@@ -201,7 +201,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bwRead.subname(i, sys->getMasterName(i));
+ bwRead.subname(i, sys->getRequestorName(i));
}
bwInstRead
@@ -210,7 +210,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bwInstRead.subname(i, sys->getMasterName(i));
+ bwInstRead.subname(i, sys->getRequestorName(i));
}
bwWrite
@@ -219,7 +219,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bwWrite.subname(i, sys->getMasterName(i));
+ bwWrite.subname(i, sys->getRequestorName(i));
}
bwTotal
@@ -228,7 +228,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- bwTotal.subname(i, sys->getMasterName(i));
+ bwTotal.subname(i, sys->getRequestorName(i));
}
bwRead = bytesRead / simSeconds;
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index c93fbef..73b853a 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1875,7 +1875,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- hits.subname(i, system->getMasterName(i));
+ hits.subname(i, system->getRequestorName(i));
}
// Miss statistics
@@ -1884,7 +1884,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- misses.subname(i, system->getMasterName(i));
+ misses.subname(i, system->getRequestorName(i));
}
// Miss latency statistics
@@ -1893,28 +1893,28 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- missLatency.subname(i, system->getMasterName(i));
+ missLatency.subname(i, system->getRequestorName(i));
}
// access formulas
accesses.flags(total | nozero | nonan);
accesses = hits + misses;
for (int i = 0; i < max_masters; i++) {
- accesses.subname(i, system->getMasterName(i));
+ accesses.subname(i, system->getRequestorName(i));
}
// miss rate formulas
missRate.flags(total | nozero | nonan);
missRate = misses / accesses;
for (int i = 0; i < max_masters; i++) {
- missRate.subname(i, system->getMasterName(i));
+ missRate.subname(i, system->getRequestorName(i));
}
// miss latency formulas
avgMissLatency.flags(total | nozero | nonan);
avgMissLatency = missLatency / misses;
for (int i = 0; i < max_masters; i++) {
- avgMissLatency.subname(i, system->getMasterName(i));
+ avgMissLatency.subname(i, system->getRequestorName(i));
}
// MSHR statistics
@@ -1924,7 +1924,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- mshr_hits.subname(i, system->getMasterName(i));
+ mshr_hits.subname(i, system->getRequestorName(i));
}
// MSHR miss statistics
@@ -1933,7 +1933,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- mshr_misses.subname(i, system->getMasterName(i));
+ mshr_misses.subname(i, system->getRequestorName(i));
}
// MSHR miss latency statistics
@@ -1942,7 +1942,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- mshr_miss_latency.subname(i, system->getMasterName(i));
+ mshr_miss_latency.subname(i, system->getRequestorName(i));
}
// MSHR uncacheable statistics
@@ -1951,7 +1951,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- mshr_uncacheable.subname(i, system->getMasterName(i));
+ mshr_uncacheable.subname(i, system->getRequestorName(i));
}
// MSHR miss latency statistics
@@ -1960,7 +1960,7 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- mshr_uncacheable_lat.subname(i, system->getMasterName(i));
+ mshr_uncacheable_lat.subname(i, system->getRequestorName(i));
}
// MSHR miss rate formulas
@@ -1968,21 +1968,21 @@
mshrMissRate = mshr_misses / accesses;
for (int i = 0; i < max_masters; i++) {
- mshrMissRate.subname(i, system->getMasterName(i));
+ mshrMissRate.subname(i, system->getRequestorName(i));
}
// mshrMiss latency formulas
avgMshrMissLatency.flags(total | nozero | nonan);
avgMshrMissLatency = mshr_miss_latency / mshr_misses;
for (int i = 0; i < max_masters; i++) {
- avgMshrMissLatency.subname(i, system->getMasterName(i));
+ avgMshrMissLatency.subname(i, system->getRequestorName(i));
}
// mshrUncacheable latency formulas
avgMshrUncacheableLatency.flags(total | nozero | nonan);
avgMshrUncacheableLatency = mshr_uncacheable_lat / mshr_uncacheable;
for (int i = 0; i < max_masters; i++) {
- avgMshrUncacheableLatency.subname(i, system->getMasterName(i));
+ avgMshrUncacheableLatency.subname(i, system->getRequestorName(i));
}
}
@@ -2084,73 +2084,73 @@
demandHits.flags(total | nozero | nonan);
demandHits = SUM_DEMAND(hits);
for (int i = 0; i < max_masters; i++) {
- demandHits.subname(i, system->getMasterName(i));
+ demandHits.subname(i, system->getRequestorName(i));
}
overallHits.flags(total | nozero | nonan);
overallHits = demandHits + SUM_NON_DEMAND(hits);
for (int i = 0; i < max_masters; i++) {
- overallHits.subname(i, system->getMasterName(i));
+ overallHits.subname(i, system->getRequestorName(i));
}
demandMisses.flags(total | nozero | nonan);
demandMisses = SUM_DEMAND(misses);
for (int i = 0; i < max_masters; i++) {
- demandMisses.subname(i, system->getMasterName(i));
+ demandMisses.subname(i, system->getRequestorName(i));
}
overallMisses.flags(total | nozero | nonan);
overallMisses = demandMisses + SUM_NON_DEMAND(misses);
for (int i = 0; i < max_masters; i++) {
- overallMisses.subname(i, system->getMasterName(i));
+ overallMisses.subname(i, system->getRequestorName(i));
}
demandMissLatency.flags(total | nozero | nonan);
demandMissLatency = SUM_DEMAND(missLatency);
for (int i = 0; i < max_masters; i++) {
- demandMissLatency.subname(i, system->getMasterName(i));
+ demandMissLatency.subname(i, system->getRequestorName(i));
}
overallMissLatency.flags(total | nozero | nonan);
overallMissLatency = demandMissLatency + SUM_NON_DEMAND(missLatency);
for (int i = 0; i < max_masters; i++) {
- overallMissLatency.subname(i, system->getMasterName(i));
+ overallMissLatency.subname(i, system->getRequestorName(i));
}
demandAccesses.flags(total | nozero | nonan);
demandAccesses = demandHits + demandMisses;
for (int i = 0; i < max_masters; i++) {
- demandAccesses.subname(i, system->getMasterName(i));
+ demandAccesses.subname(i, system->getRequestorName(i));
}
overallAccesses.flags(total | nozero | nonan);
overallAccesses = overallHits + overallMisses;
for (int i = 0; i < max_masters; i++) {
- overallAccesses.subname(i, system->getMasterName(i));
+ overallAccesses.subname(i, system->getRequestorName(i));
}
demandMissRate.flags(total | nozero | nonan);
demandMissRate = demandMisses / demandAccesses;
for (int i = 0; i < max_masters; i++) {
- demandMissRate.subname(i, system->getMasterName(i));
+ demandMissRate.subname(i, system->getRequestorName(i));
}
overallMissRate.flags(total | nozero | nonan);
overallMissRate = overallMisses / overallAccesses;
for (int i = 0; i < max_masters; i++) {
- overallMissRate.subname(i, system->getMasterName(i));
+ overallMissRate.subname(i, system->getRequestorName(i));
}
demandAvgMissLatency.flags(total | nozero | nonan);
demandAvgMissLatency = demandMissLatency / demandMisses;
for (int i = 0; i < max_masters; i++) {
- demandAvgMissLatency.subname(i, system->getMasterName(i));
+ demandAvgMissLatency.subname(i, system->getRequestorName(i));
}
overallAvgMissLatency.flags(total | nozero | nonan);
overallAvgMissLatency = overallMissLatency / overallMisses;
for (int i = 0; i < max_masters; i++) {
- overallAvgMissLatency.subname(i, system->getMasterName(i));
+ overallAvgMissLatency.subname(i, system->getRequestorName(i));
}
blocked_cycles.init(NUM_BLOCKED_CAUSES);
@@ -2179,51 +2179,51 @@
.flags(total | nozero | nonan)
;
for (int i = 0; i < max_masters; i++) {
- writebacks.subname(i, system->getMasterName(i));
+ writebacks.subname(i, system->getRequestorName(i));
}
demandMshrHits.flags(total | nozero | nonan);
demandMshrHits = SUM_DEMAND(mshr_hits);
for (int i = 0; i < max_masters; i++) {
- demandMshrHits.subname(i, system->getMasterName(i));
+ demandMshrHits.subname(i, system->getRequestorName(i));
}
overallMshrHits.flags(total | nozero | nonan);
overallMshrHits = demandMshrHits + SUM_NON_DEMAND(mshr_hits);
for (int i = 0; i < max_masters; i++) {
- overallMshrHits.subname(i, system->getMasterName(i));
+ overallMshrHits.subname(i, system->getRequestorName(i));
}
demandMshrMisses.flags(total | nozero | nonan);
demandMshrMisses = SUM_DEMAND(mshr_misses);
for (int i = 0; i < max_masters; i++) {
- demandMshrMisses.subname(i, system->getMasterName(i));
+ demandMshrMisses.subname(i, system->getRequestorName(i));
}
overallMshrMisses.flags(total | nozero | nonan);
overallMshrMisses = demandMshrMisses + SUM_NON_DEMAND(mshr_misses);
for (int i = 0; i < max_masters; i++) {
- overallMshrMisses.subname(i, system->getMasterName(i));
+ overallMshrMisses.subname(i, system->getRequestorName(i));
}
demandMshrMissLatency.flags(total | nozero | nonan);
demandMshrMissLatency = SUM_DEMAND(mshr_miss_latency);
for (int i = 0; i < max_masters; i++) {
- demandMshrMissLatency.subname(i, system->getMasterName(i));
+ demandMshrMissLatency.subname(i, system->getRequestorName(i));
}
overallMshrMissLatency.flags(total | nozero | nonan);
overallMshrMissLatency =
demandMshrMissLatency + SUM_NON_DEMAND(mshr_miss_latency);
for (int i = 0; i < max_masters; i++) {
- overallMshrMissLatency.subname(i, system->getMasterName(i));
+ overallMshrMissLatency.subname(i, system->getRequestorName(i));
}
overallMshrUncacheable.flags(total | nozero | nonan);
overallMshrUncacheable =
SUM_DEMAND(mshr_uncacheable) + SUM_NON_DEMAND(mshr_uncacheable);
for (int i = 0; i < max_masters; i++) {
- overallMshrUncacheable.subname(i, system->getMasterName(i));
+ overallMshrUncacheable.subname(i, system->getRequestorName(i));
}
@@ -2232,38 +2232,39 @@
SUM_DEMAND(mshr_uncacheable_lat) +
SUM_NON_DEMAND(mshr_uncacheable_lat);
for (int i = 0; i < max_masters; i++) {
- overallMshrUncacheableLatency.subname(i, system->getMasterName(i));
+ overallMshrUncacheableLatency.subname(i,
system->getRequestorName(i));
}
demandMshrMissRate.flags(total | nozero | nonan);
demandMshrMissRate = demandMshrMisses / demandAccesses;
for (int i = 0; i < max_masters; i++) {
- demandMshrMissRate.subname(i, system->getMasterName(i));
+ demandMshrMissRate.subname(i, system->getRequestorName(i));
}
overallMshrMissRate.flags(total | nozero | nonan);
overallMshrMissRate = overallMshrMisses / overallAccesses;
for (int i = 0; i < max_masters; i++) {
- overallMshrMissRate.subname(i, system->getMasterName(i));
+ overallMshrMissRate.subname(i, system->getRequestorName(i));
}
demandAvgMshrMissLatency.flags(total | nozero | nonan);
demandAvgMshrMissLatency = demandMshrMissLatency / demandMshrMisses;
for (int i = 0; i < max_masters; i++) {
- demandAvgMshrMissLatency.subname(i, system->getMasterName(i));
+ demandAvgMshrMissLatency.subname(i, system->getRequestorName(i));
}
overallAvgMshrMissLatency.flags(total | nozero | nonan);
overallAvgMshrMissLatency = overallMshrMissLatency / overallMshrMisses;
for (int i = 0; i < max_masters; i++) {
- overallAvgMshrMissLatency.subname(i, system->getMasterName(i));
+ overallAvgMshrMissLatency.subname(i, system->getRequestorName(i));
}
overallAvgMshrUncacheableLatency.flags(total | nozero | nonan);
overallAvgMshrUncacheableLatency =
overallMshrUncacheableLatency / overallMshrUncacheable;
for (int i = 0; i < max_masters; i++) {
- overallAvgMshrUncacheableLatency.subname(i,
system->getMasterName(i));
+ overallAvgMshrUncacheableLatency.subname(i, system->
+ getRequestorName(i));
}
dataExpansions.flags(nozero | nonan);
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 38698c9..778ae8c 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -244,12 +244,12 @@
.flags(nozero | nonan)
;
for (int i = 0; i < system->maxMasters(); i++) {
- occupancies.subname(i, system->getMasterName(i));
+ occupancies.subname(i, system->getRequestorName(i));
}
avgOccs.flags(nozero | total);
for (int i = 0; i < system->maxMasters(); i++) {
- avgOccs.subname(i, system->getMasterName(i));
+ avgOccs.subname(i, system->getRequestorName(i));
}
avgOccs = occupancies / Stats::constant(tags.numBlocks);
diff --git a/src/mem/dram_ctrl.cc b/src/mem/dram_ctrl.cc
index e451e4b..ff35da6 100644
--- a/src/mem/dram_ctrl.cc
+++ b/src/mem/dram_ctrl.cc
@@ -2769,7 +2769,7 @@
.precision(2);
for (int i = 0; i < max_masters; i++) {
- const std::string master = dram._system->getMasterName(i);
+ const std::string master = dram._system->getRequestorName(i);
masterReadBytes.subname(i, master);
masterReadRate.subname(i, master);
masterWriteBytes.subname(i, master);
diff --git a/src/mem/probes/mem_trace.cc b/src/mem/probes/mem_trace.cc
index a11b9e6..f163835 100644
--- a/src/mem/probes/mem_trace.cc
+++ b/src/mem/probes/mem_trace.cc
@@ -89,7 +89,7 @@
for (int i = 0; i < system->maxMasters(); i++) {
auto id_string = header_msg.add_id_strings();
id_string->set_key(i);
- id_string->set_value(system->getMasterName(i));
+ id_string->set_value(system->getRequestorName(i));
}
traceStream->write(header_msg);
diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index 9e71fcf..8a31406 100644
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -269,7 +269,7 @@
MemCtrl::addMaster(MasterID m_id)
{
if (!hasMaster(m_id)) {
- masters.emplace(m_id, _system->getMasterName(m_id));
+ masters.emplace(m_id, _system->getRequestorName(m_id));
packetPriorities[m_id].resize(numPriorities(), 0);
DPRINTF(QOS,
@@ -338,7 +338,7 @@
;
for (int i = 0; i < max_masters; i++) {
- const std::string master = system->getMasterName(i);
+ const std::string master = system->getRequestorName(i);
avgPriority.subname(i, master);
avgPriorityDistance.subname(i, master);
}
diff --git a/src/mem/qos/mem_ctrl.hh b/src/mem/qos/mem_ctrl.hh
index eec9561..1d82091 100644
--- a/src/mem/qos/mem_ctrl.hh
+++ b/src/mem/qos/mem_ctrl.hh
@@ -494,7 +494,7 @@
DPRINTF(QOS,
"QoSMemCtrl::qosSchedule: (syncro) escalating "
"MASTER %s to assigned priority %d\n",
- _system->getMasterName(m.first),
+ _system->getRequestorName(m.first),
prio);
escalate(queues, queue_entry_size, m.first, prio);
}
diff --git a/src/mem/qos/policy_fixed_prio.cc
b/src/mem/qos/policy_fixed_prio.cc
index 449a25d..8681b90 100644
--- a/src/mem/qos/policy_fixed_prio.cc
+++ b/src/mem/qos/policy_fixed_prio.cc
@@ -86,7 +86,7 @@
} else {
DPRINTF(QOS, "Master %s (MasterID %d) not present in priorityMap, "
"assigning default priority %d\n",
- memCtrl->system()->getMasterName(mId),
+ memCtrl->system()->getRequestorName(mId),
mId, defaultPriority);
return defaultPriority;
}
diff --git a/src/sim/system.cc b/src/sim/system.cc
index f80c5db..07dae86 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -646,10 +646,10 @@
}
std::string
-System::getMasterName(MasterID master_id)
+System::getRequestorName(MasterID master_id)
{
if (master_id >= masters.size())
- fatal("Invalid master_id passed to getMasterName()\n");
+ fatal("Invalid master_id passed to getRequestorName()\n");
const auto& master_info = masters[master_id];
return master_info.masterName;
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 8e2c472..22318f7 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -487,7 +487,7 @@
/**
* Get the name of an object for a given request id.
*/
- std::string getMasterName(MasterID master_id);
+ std::string getRequestorName(MasterID master_id);
/**
* Looks up the MasterID for a given SimObject
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33636
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: I1bfe0fbcdc19de9927db9dadbad5f9e1ea5730dd
Gerrit-Change-Number: 33636
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
