mem: Rename Packet::checkFunctional to trySatisfyFunctional
Packet::checkFunctional also wrote data to/from the packet depending on if it was read/write, respectively, which the 'check' in the name would suggest otherwise. This renames it to doFunctional, which is more suggestive. It also renames any function called checkFunctional which calls Packet::checkFunctional. These are - Bridge::BridgeMasterPort::checkFunctional - calls Packet::checkFunctional - MSHR::checkFunctional - calls Packet::checkFunctional - MSHR::TargetList::checkFunctional - calls Packet::checkFunctional - Queue<>::checkFunctional (of src/mem/cache/queue.hh, not src/cpu/minor/buffers.h) - Instantiated with Queue<WriteQueueEntry> and Queue<MSHR> - WriteQueueEntry - calls Packet::checkFunctional - WriteQueueEntry::TargetList - calls Packet::checkFunctional - MemDelay::checkFunctional - calls QueuedSlavePort/QueuedMasterPort::checkFunctional - Packet::checkFunctional - PacketQueue::checkFunctional - calls Packet::checkFunctional - QueuedSlavePort::checkFunctional - calls PacketQueue::doFunctional - QueuedMasterPort::checkFunctional - calls PacketQueue::doFunctional - SerialLink::SerialLinkMasterPort::checkFunctional - calls Packet::doFunctional Change-Id: Ieca2579c020c329040da053ba8e25820801b62c5 Reviewed-on: https://gem5-review.googlesource.com/11810 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
This commit is contained in:
committed by
Kovacsics Róbert
parent
4158138d1f
commit
2f17062dd9
10
src/mem/cache/write_queue_entry.cc
vendored
10
src/mem/cache/write_queue_entry.cc
vendored
@@ -66,10 +66,10 @@ WriteQueueEntry::TargetList::add(PacketPtr pkt, Tick readyTime,
|
||||
}
|
||||
|
||||
bool
|
||||
WriteQueueEntry::TargetList::checkFunctional(PacketPtr pkt)
|
||||
WriteQueueEntry::TargetList::trySatisfyFunctional(PacketPtr pkt)
|
||||
{
|
||||
for (auto& t : *this) {
|
||||
if (pkt->checkFunctional(t.pkt)) {
|
||||
if (pkt->trySatisfyFunctional(t.pkt)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -122,16 +122,16 @@ WriteQueueEntry::deallocate()
|
||||
}
|
||||
|
||||
bool
|
||||
WriteQueueEntry::checkFunctional(PacketPtr pkt)
|
||||
WriteQueueEntry::trySatisfyFunctional(PacketPtr pkt)
|
||||
{
|
||||
// For printing, we treat the WriteQueueEntry as a whole as single
|
||||
// entity. For other requests, we iterate over the individual
|
||||
// targets since that's where the actual data lies.
|
||||
if (pkt->isPrint()) {
|
||||
pkt->checkFunctional(this, blkAddr, isSecure, blkSize, nullptr);
|
||||
pkt->trySatisfyFunctional(this, blkAddr, isSecure, blkSize, nullptr);
|
||||
return false;
|
||||
} else {
|
||||
return targets.checkFunctional(pkt);
|
||||
return targets.trySatisfyFunctional(pkt);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user