Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33533 )
Change subject: mem-cache: Update instances of masterId
......................................................................
mem-cache: Update instances of masterId
Change-Id: Ia7fb3472d6013ea2c8b993434c82cdda3501c966
---
M src/mem/cache/prefetch/base.cc
M src/mem/cache/prefetch/base.hh
M src/mem/cache/prefetch/queued.cc
M src/mem/cache/prefetch/stride.cc
M src/mem/cache/tags/base.cc
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc
index d4223aa..9306dc4 100644
--- a/src/mem/cache/prefetch/base.cc
+++ b/src/mem/cache/prefetch/base.cc
@@ -57,7 +57,7 @@
Base::PrefetchInfo::PrefetchInfo(PacketPtr pkt, Addr addr, bool miss)
: address(addr), pc(pkt->req->hasPC() ? pkt->req->getPC() : 0),
- masterId(pkt->req->masterId()), validPC(pkt->req->hasPC()),
+ _id(pkt->req->masterId()), validPC(pkt->req->hasPC()),
secure(pkt->isSecure()), size(pkt->req->getSize()),
write(pkt->isWrite()),
paddress(pkt->req->getPaddr()), cacheMiss(miss)
{
@@ -72,7 +72,7 @@
}
Base::PrefetchInfo::PrefetchInfo(PrefetchInfo const &pfi, Addr addr)
- : address(addr), pc(pfi.pc), masterId(pfi.masterId),
validPC(pfi.validPC),
+ : address(addr), pc(pfi.pc), _id(pfi._id), validPC(pfi.validPC),
secure(pfi.secure), size(pfi.size), write(pfi.write),
paddress(pfi.paddress), cacheMiss(pfi.cacheMiss), data(nullptr)
{
@@ -92,7 +92,7 @@
: ClockedObject(p), listeners(), cache(nullptr),
blkSize(p->block_size),
lBlkSize(floorLog2(blkSize)), onMiss(p->on_miss), onRead(p->on_read),
onWrite(p->on_write), onData(p->on_data), onInst(p->on_inst),
- masterId(p->sys->getMasterId(this)),
pageBytes(p->sys->getPageBytes()),
+ _id(p->sys->getMasterId(this)), pageBytes(p->sys->getPageBytes()),
prefetchOnAccess(p->prefetch_on_access),
useVirtualAddresses(p->use_virtual_addresses), issuedPrefetches(0),
usefulPrefetches(0), tlb(nullptr)
diff --git a/src/mem/cache/prefetch/base.hh b/src/mem/cache/prefetch/base.hh
index 7009db7..5bf4ed8 100644
--- a/src/mem/cache/prefetch/base.hh
+++ b/src/mem/cache/prefetch/base.hh
@@ -94,7 +94,7 @@
/** The program counter that generated this address. */
Addr pc;
/** The requestor ID that generated this address. */
- MasterID masterId;
+ MasterID _id;
/** Validity bit for the PC of this address. */
bool validPC;
/** Whether this address targets the secure memory space. */
@@ -154,7 +154,7 @@
*/
MasterID getMasterId() const
{
- return masterId;
+ return _id;
}
/**
@@ -281,7 +281,7 @@
const bool onInst;
/** Request id for prefetches */
- const MasterID masterId;
+ const MasterID _id;
const Addr pageBytes;
diff --git a/src/mem/cache/prefetch/queued.cc
b/src/mem/cache/prefetch/queued.cc
index c2ae090..681fd7c 100644
--- a/src/mem/cache/prefetch/queued.cc
+++ b/src/mem/cache/prefetch/queued.cc
@@ -291,7 +291,7 @@
} else {
Tick pf_time = curTick() + clockPeriod() * latency;
it->createPkt(it->translationRequest->getPaddr(), blkSize,
- masterId, tagPrefetch, pf_time);
+ _id, tagPrefetch, pf_time);
addToQueue(pfq, *it);
}
} else {
@@ -342,7 +342,7 @@
PacketPtr pkt)
{
RequestPtr translation_req = std::make_shared<Request>(
- addr, blkSize, pkt->req->getFlags(), masterId, pfi.getPC(),
+ addr, blkSize, pkt->req->getFlags(), _id, pfi.getPC(),
pkt->req->contextId());
translation_req->setFlags(Request::PREFETCH);
return translation_req;
@@ -431,7 +431,7 @@
DeferredPacket dpp(this, new_pfi, 0, priority);
if (has_target_pa) {
Tick pf_time = curTick() + clockPeriod() * latency;
- dpp.createPkt(target_paddr, blkSize, masterId, tagPrefetch,
pf_time);
+ dpp.createPkt(target_paddr, blkSize, _id, tagPrefetch, pf_time);
DPRINTF(HWPrefetch, "Prefetch queued. "
"addr:%#x priority: %3d tick:%lld.\n",
new_pfi.getAddr(), priority, pf_time);
diff --git a/src/mem/cache/prefetch/stride.cc
b/src/mem/cache/prefetch/stride.cc
index 36773c6..e6544db 100644
--- a/src/mem/cache/prefetch/stride.cc
+++ b/src/mem/cache/prefetch/stride.cc
@@ -124,10 +124,10 @@
Addr pf_addr = pfi.getAddr();
Addr pc = pfi.getPC();
bool is_secure = pfi.isSecure();
- MasterID master_id = useMasterId ? pfi.getMasterId() : 0;
+ MasterID unique_id = useMasterId ? pfi.getMasterId() : 0;
// Get corresponding pc table
- PCTable* pcTable = findTable(master_id);
+ PCTable* pcTable = findTable(unique_id);
// Search for entry in the pc table
StrideEntry *entry = pcTable->findEntry(pc, is_secure);
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index faad7be..df29a85 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -105,12 +105,12 @@
// to insert the new one
// Deal with what we are bringing in
- MasterID master_id = pkt->req->masterId();
- assert(master_id < system->maxMasters());
- stats.occupancies[master_id]++;
+ MasterID unique_id = pkt->req->masterId();
+ assert(unique_id < system->maxMasters());
+ stats.occupancies[unique_id]++;
// Insert block with tag, src master id and task id
- blk->insert(extractTag(pkt->getAddr()), pkt->isSecure(), master_id,
+ blk->insert(extractTag(pkt->getAddr()), pkt->isSecure(), unique_id,
pkt->req->taskId());
// Check if cache warm up is done
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33533
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: Ia7fb3472d6013ea2c8b993434c82cdda3501c966
Gerrit-Change-Number: 33533
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
