Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/17537 )
Change subject: mem-cache: Remove blk_addr from Queue::trySatisfyFunctional
......................................................................
mem-cache: Remove blk_addr from Queue::trySatisfyFunctional
The blk_addr is pkt->getBlockAddr(), and therefore can be
acquired internally, when needed, as long as the pkt is
provided.
Change-Id: I2780445d2a0cb9e27257961efc4f438cc19550e5
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17537
Tested-by: kokoro <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Maintainer: Nikos Nikoleris <[email protected]>
---
M src/mem/cache/base.cc
M src/mem/cache/queue.hh
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
kokoro: Statistics mismatch
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index 2a6bc2a..70e7ba1 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -649,8 +649,8 @@
bool done = have_dirty ||
cpuSidePort.trySatisfyFunctional(pkt) ||
- mshrQueue.trySatisfyFunctional(pkt, blk_addr) ||
- writeBuffer.trySatisfyFunctional(pkt, blk_addr) ||
+ mshrQueue.trySatisfyFunctional(pkt) ||
+ writeBuffer.trySatisfyFunctional(pkt) ||
memSidePort.trySatisfyFunctional(pkt);
DPRINTF(CacheVerbose, "%s: %s %s%s%s\n", __func__, pkt->print(),
diff --git a/src/mem/cache/queue.hh b/src/mem/cache/queue.hh
index 30fe4ba..c75894a 100644
--- a/src/mem/cache/queue.hh
+++ b/src/mem/cache/queue.hh
@@ -181,11 +181,11 @@
return nullptr;
}
- bool trySatisfyFunctional(PacketPtr pkt, Addr blk_addr)
+ bool trySatisfyFunctional(PacketPtr pkt)
{
pkt->pushLabel(label);
for (const auto& entry : allocatedList) {
- if (entry->matchBlockAddr(blk_addr, pkt->isSecure()) &&
+ if (entry->matchBlockAddr(pkt) &&
entry->trySatisfyFunctional(pkt)) {
pkt->popLabel();
return true;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/17537
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I2780445d2a0cb9e27257961efc4f438cc19550e5
Gerrit-Change-Number: 17537
Gerrit-PatchSet: 6
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
