diff options
| -rw-r--r-- | configs/common/Caches.py | 4 | ||||
| -rw-r--r-- | configs/common/O3_ARM_v7a.py | 6 | ||||
| -rw-r--r-- | src/mem/abstract_mem.cc | 2 | ||||
| -rw-r--r-- | src/mem/cache/Cache.py | 8 | ||||
| -rw-r--r-- | src/mem/cache/base.hh | 3 | ||||
| -rw-r--r-- | src/mem/cache/cache.cc | 161 | ||||
| -rw-r--r-- | src/mem/cache/cache.hh | 9 | ||||
| -rw-r--r-- | src/mem/coherent_xbar.cc | 16 | ||||
| -rw-r--r-- | src/mem/packet.cc | 13 | ||||
| -rw-r--r-- | src/mem/packet.hh | 32 | ||||
| -rwxr-xr-x | src/mem/snoop_filter.cc | 6 |
11 files changed, 178 insertions, 82 deletions
diff --git a/configs/common/Caches.py b/configs/common/Caches.py index 0a3c56297..c65910e23 100644 --- a/configs/common/Caches.py +++ b/configs/common/Caches.py @@ -55,6 +55,8 @@ class L1Cache(Cache): class L1_ICache(L1Cache): is_read_only = True + # Writeback clean lines as well + writeback_clean = True class L1_DCache(L1Cache): pass @@ -89,3 +91,5 @@ class PageTableWalkerCache(Cache): is_read_only = False else: is_read_only = True + # Writeback clean lines as well + writeback_clean = True diff --git a/configs/common/O3_ARM_v7a.py b/configs/common/O3_ARM_v7a.py index 02beb11d1..103158290 100644 --- a/configs/common/O3_ARM_v7a.py +++ b/configs/common/O3_ARM_v7a.py @@ -151,6 +151,8 @@ class O3_ARM_v7a_ICache(Cache): assoc = 2 forward_snoops = False is_read_only = True + # Writeback clean lines as well + writeback_clean = True # Data Cache class O3_ARM_v7a_DCache(Cache): @@ -161,6 +163,8 @@ class O3_ARM_v7a_DCache(Cache): size = '32kB' assoc = 2 write_buffers = 16 + # Consider the L2 a victim cache also for clean lines + writeback_clean = True # TLB Cache # Use a cache as a L2 TLB @@ -174,6 +178,8 @@ class O3_ARM_v7aWalkCache(Cache): write_buffers = 16 forward_snoops = False is_read_only = True + # Writeback clean lines as well + writeback_clean = True # L2 Cache class O3_ARM_v7aL2(Cache): diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc index 9b9c6e2c3..74d0c4a3f 100644 --- a/src/mem/abstract_mem.cc +++ b/src/mem/abstract_mem.cc @@ -329,7 +329,7 @@ AbstractMemory::access(PacketPtr pkt) return; } - if (pkt->cmd == MemCmd::CleanEvict) { + if (pkt->cmd == MemCmd::CleanEvict || pkt->cmd == MemCmd::WritebackClean) { DPRINTF(MemoryAccess, "CleanEvict on 0x%x: not responding\n", pkt->getAddr()); return; diff --git a/src/mem/cache/Cache.py b/src/mem/cache/Cache.py index 48e52a8d5..531337f19 100644 --- a/src/mem/cache/Cache.py +++ b/src/mem/cache/Cache.py @@ -103,3 +103,11 @@ class Cache(BaseCache): # cache a line is dropped for a mostly exclusive cache. clusivity = Param.Clusivity('mostly_incl', "Clusivity with upstream cache") + + # Determine if this cache sends out writebacks for clean lines, or + # simply clean evicts. In cases where a downstream cache is mostly + # exclusive with respect to this cache (acting as a victim cache), + # the clean writebacks are essential for performance. In general + # this should be set to True for anything but the last-level + # cache. + writeback_clean = Param.Bool(False, "Writeback clean lines") diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh index cb1baa3f4..5f6456fb9 100644 --- a/src/mem/cache/base.hh +++ b/src/mem/cache/base.hh @@ -521,9 +521,6 @@ class BaseCache : public MemObject // should only see writes or clean evicts here assert(pkt->isWrite() || pkt->cmd == MemCmd::CleanEvict); - // if this is a read-only cache we should never see any writes - assert(!(isReadOnly && pkt->isWrite())); - return allocateBufferInternal(&writeBuffer, blockAlign(pkt->getAddr()), blkSize, pkt, time, true); diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index 58afdc79a..29919ccdf 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -70,6 +70,7 @@ Cache::Cache(const CacheParams *p) doFastWrites(true), prefetchOnAccess(p->prefetch_on_access), clusivity(p->clusivity), + writebackClean(p->writeback_clean), tempBlockWriteback(nullptr), writebackTempBlockAtomicEvent(this, false, EventBase::Delayed_Writeback_Pri) @@ -317,7 +318,7 @@ Cache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, // flush and invalidate any existing block CacheBlk *old_blk(tags->findBlock(pkt->getAddr(), pkt->isSecure())); if (old_blk && old_blk->isValid()) { - if (old_blk->isDirty()) + if (old_blk->isDirty() || writebackClean) writebacks.push_back(writebackBlk(old_blk)); else writebacks.push_back(cleanEvictBlk(old_blk)); @@ -343,7 +344,7 @@ Cache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, blk ? "hit " + blk->print() : "miss"); - if (pkt->evictingBlock()) { + if (pkt->isEviction()) { // We check for presence of block in above caches before issuing // Writeback or CleanEvict to write buffer. Therefore the only // possible cases can be of a CleanEvict packet coming from above @@ -356,26 +357,49 @@ Cache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, if (writeBuffer.findMatches(pkt->getAddr(), pkt->isSecure(), outgoing)) { assert(outgoing.size() == 1); - PacketPtr wbPkt = outgoing[0]->getTarget()->pkt; - assert(pkt->cmd == MemCmd::CleanEvict && - wbPkt->cmd == MemCmd::Writeback); - // As the CleanEvict is coming from above, it would have snooped - // into other peer caches of the same level while traversing the - // crossbar. If a copy of the block had been found, the CleanEvict - // would have been deleted in the crossbar. Now that the - // CleanEvict is here we can be sure none of the other upper level - // caches connected to this cache have the block, so we can clear - // the BLOCK_CACHED flag in the Writeback if set and discard the - // CleanEvict by returning true. - wbPkt->clearBlockCached(); - return true; + MSHR *wb_entry = outgoing[0]; + assert(wb_entry->getNumTargets() == 1); + PacketPtr wbPkt = wb_entry->getTarget()->pkt; + assert(wbPkt->isWriteback()); + + if (pkt->isCleanEviction()) { + // The CleanEvict and WritebackClean snoops into other + // peer caches of the same level while traversing the + // crossbar. If a copy of the block is found, the + // packet is deleted in the crossbar. Hence, none of + // the other upper level caches connected to this + // cache have the block, so we can clear the + // BLOCK_CACHED flag in the Writeback if set and + // discard the CleanEvict by returning true. + wbPkt->clearBlockCached(); + return true; + } else { + assert(pkt->cmd == MemCmd::WritebackDirty); + // Dirty writeback from above trumps our clean + // writeback... discard here + // Note: markInService will remove entry from writeback buffer. + markInService(wb_entry, false); + delete wbPkt; + } } } // Writeback handling is special case. We can write the block into // the cache without having a writeable copy (or any copy at all). - if (pkt->cmd == MemCmd::Writeback) { + if (pkt->isWriteback()) { assert(blkSize == pkt->getSize()); + + // we could get a clean writeback while we are having + // outstanding accesses to a block, do the simple thing for + // now and drop the clean writeback so that we do not upset + // any ordering/decisions about ownership already taken + if (pkt->cmd == MemCmd::WritebackClean && + mshrQueue.findMatch(pkt->getAddr(), pkt->isSecure())) { + DPRINTF(Cache, "Clean writeback %#llx to block with MSHR, " + "dropping\n", pkt->getAddr()); + return true; + } + if (blk == NULL) { // need to do a replacement blk = allocateBlock(pkt->getAddr(), pkt->isSecure(), writebacks); @@ -391,7 +415,11 @@ Cache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, blk->status |= BlkSecure; } } - blk->status |= BlkDirty; + // only mark the block dirty if we got a writeback command, + // and leave it as is for a clean writeback + if (pkt->cmd == MemCmd::WritebackDirty) { + blk->status |= BlkDirty; + } // if shared is not asserted we got the writeback in modified // state, if it is asserted we are in the owned state if (!pkt->sharedAsserted()) { @@ -463,7 +491,13 @@ Cache::doWritebacks(PacketList& writebacks, Tick forward_time) // this is a non-snoop request packet which does not require a // response. delete wbPkt; + } else if (wbPkt->cmd == MemCmd::WritebackClean) { + // clean writeback, do not send since the block is + // still cached above + assert(writebackClean); + delete wbPkt; } else { + assert(wbPkt->cmd == MemCmd::WritebackDirty); // Set BLOCK_CACHED flag in Writeback and send below, so that // the Writeback does not reset the bit corresponding to this // address in the snoop filter below. @@ -490,7 +524,7 @@ Cache::doWritebacksAtomic(PacketList& writebacks) // isCachedAbove returns true we set BLOCK_CACHED flag in Writebacks // and discard CleanEvicts. if (isCachedAbove(wbPkt, false)) { - if (wbPkt->cmd == MemCmd::Writeback) { + if (wbPkt->cmd == MemCmd::WritebackDirty) { // Set BLOCK_CACHED flag in Writeback and send below, // so that the Writeback does not reset the bit // corresponding to this address in the snoop filter @@ -694,6 +728,10 @@ Cache::recvTimingReq(PacketPtr pkt) // by access(), that calls accessBlock() function. cpuSidePort->schedTimingResp(pkt, request_time, true); } else { + DPRINTF(Cache, "%s satisfied %s addr %#llx, no response needed\n", + __func__, pkt->cmdString(), pkt->getAddr(), + pkt->getSize()); + // queue the packet for deletion, as the sending cache is // still relying on it; if the block is found in access(), // CleanEvict and Writeback messages will be deleted @@ -765,9 +803,9 @@ Cache::recvTimingReq(PacketPtr pkt) // Coalesce unless it was a software prefetch (see above). if (pkt) { - assert(pkt->cmd != MemCmd::Writeback); - // CleanEvicts corresponding to blocks which have outstanding - // requests in MSHRs can be deleted here. + assert(!pkt->isWriteback()); + // CleanEvicts corresponding to blocks which have + // outstanding requests in MSHRs are simply sunk here if (pkt->cmd == MemCmd::CleanEvict) { pendingDelete.reset(pkt); } else { @@ -820,7 +858,7 @@ Cache::recvTimingReq(PacketPtr pkt) mshr_misses[pkt->cmdToIndex()][pkt->req->masterId()]++; } - if (pkt->evictingBlock() || + if (pkt->isEviction() || (pkt->req->isUncacheable() && pkt->isWrite())) { // We use forward_time here because there is an // uncached memory write, forwarded to WriteBuffer. @@ -888,7 +926,7 @@ Cache::getBusPacket(PacketPtr cpu_pkt, CacheBlk *blk, if (!blkValid && (cpu_pkt->isUpgrade() || - cpu_pkt->evictingBlock())) { + cpu_pkt->isEviction())) { // Writebacks that weren't allocated in access() and upgrades // from upper-level caches that missed completely just go // through. @@ -1108,8 +1146,8 @@ Cache::recvAtomic(PacketPtr pkt) schedule(writebackTempBlockAtomicEvent, curTick()); } - tempBlockWriteback = blk->isDirty() ? writebackBlk(blk) : - cleanEvictBlk(blk); + tempBlockWriteback = (blk->isDirty() || writebackClean) ? + writebackBlk(blk) : cleanEvictBlk(blk); blk->invalidate(); } @@ -1458,7 +1496,7 @@ Cache::recvTimingResp(PacketPtr pkt) // Writebacks/CleanEvicts to write buffer. It specifies the latency to // allocate an internal buffer and to schedule an event to the // queued port. - if (blk->isDirty()) { + if (blk->isDirty() || writebackClean) { PacketPtr wbPkt = writebackBlk(blk); allocateWriteBuffer(wbPkt, forward_time); // Set BLOCK_CACHED flag if cached above. @@ -1484,41 +1522,50 @@ Cache::recvTimingResp(PacketPtr pkt) PacketPtr Cache::writebackBlk(CacheBlk *blk) { - chatty_assert(!isReadOnly, "Writeback from read-only cache"); - assert(blk && blk->isValid() && blk->isDirty()); + chatty_assert(!isReadOnly || writebackClean, + "Writeback from read-only cache"); + assert(blk && blk->isValid() && (blk->isDirty() || writebackClean)); writebacks[Request::wbMasterId]++; - Request *writebackReq = - new Request(tags->regenerateBlkAddr(blk->tag, blk->set), blkSize, 0, - Request::wbMasterId); + Request *req = new Request(tags->regenerateBlkAddr(blk->tag, blk->set), + blkSize, 0, Request::wbMasterId); if (blk->isSecure()) - writebackReq->setFlags(Request::SECURE); + req->setFlags(Request::SECURE); - writebackReq->taskId(blk->task_id); + req->taskId(blk->task_id); blk->task_id= ContextSwitchTaskId::Unknown; blk->tickInserted = curTick(); - PacketPtr writeback = new Packet(writebackReq, MemCmd::Writeback); + PacketPtr pkt = + new Packet(req, blk->isDirty() ? + MemCmd::WritebackDirty : MemCmd::WritebackClean); + + DPRINTF(Cache, "Create Writeback %#llx writable: %d, dirty: %d\n", + pkt->getAddr(), blk->isWritable(), blk->isDirty()); + if (blk->isWritable()) { // not asserting shared means we pass the block in modified // state, mark our own block non-writeable blk->status &= ~BlkWritable; } else { // we are in the owned state, tell the receiver - writeback->assertShared(); + pkt->assertShared(); } - writeback->allocate(); - std::memcpy(writeback->getPtr<uint8_t>(), blk->data, blkSize); - + // make sure the block is not marked dirty blk->status &= ~BlkDirty; - return writeback; + + pkt->allocate(); + std::memcpy(pkt->getPtr<uint8_t>(), blk->data, blkSize); + + return pkt; } PacketPtr Cache::cleanEvictBlk(CacheBlk *blk) { + assert(!writebackClean); assert(blk && blk->isValid() && !blk->isDirty()); // Creating a zero sized write, a message to the snoop filter Request *req = @@ -1628,7 +1675,7 @@ Cache::allocateBlock(Addr addr, bool is_secure, PacketList &writebacks) // Will send up Writeback/CleanEvict snoops via isCachedAbove // when pushing this writeback list into the write buffer. - if (blk->isDirty()) { + if (blk->isDirty() || writebackClean) { // Save writeback packet for handling by caller writebacks.push_back(writebackBlk(blk)); } else { @@ -2051,9 +2098,9 @@ Cache::recvTimingSnoopReq(PacketPtr pkt) // Writebacks/CleanEvicts. assert(wb_entry->getNumTargets() == 1); PacketPtr wb_pkt = wb_entry->getTarget()->pkt; - assert(wb_pkt->evictingBlock()); + assert(wb_pkt->isEviction()); - if (pkt->evictingBlock()) { + if (pkt->isEviction()) { // if the block is found in the write queue, set the BLOCK_CACHED // flag for Writeback/CleanEvict snoop. On return the snoop will // propagate the BLOCK_CACHED flag in Writeback packets and prevent @@ -2064,7 +2111,7 @@ Cache::recvTimingSnoopReq(PacketPtr pkt) return; } - if (wb_pkt->cmd == MemCmd::Writeback) { + if (wb_pkt->cmd == MemCmd::WritebackDirty) { assert(!pkt->memInhibitAsserted()); pkt->assertMemInhibit(); if (!pkt->needsExclusive()) { @@ -2082,18 +2129,26 @@ Cache::recvTimingSnoopReq(PacketPtr pkt) doTimingSupplyResponse(pkt, wb_pkt->getConstPtr<uint8_t>(), false, false); } else { - assert(wb_pkt->cmd == MemCmd::CleanEvict); + // on hitting a clean writeback we play it safe and do not + // provide a response, the block may be dirty somewhere + // else + assert(wb_pkt->isCleanEviction()); // The cache technically holds the block until the - // corresponding CleanEvict message reaches the crossbar + // corresponding message reaches the crossbar // below. Therefore when a snoop encounters a CleanEvict - // message we must set assertShared (just like when it - // encounters a Writeback) to avoid the snoop filter - // prematurely clearing the holder bit in the crossbar - // below - if (!pkt->needsExclusive()) + // or WritebackClean message we must set assertShared + // (just like when it encounters a Writeback) to avoid the + // snoop filter prematurely clearing the holder bit in the + // crossbar below + if (!pkt->needsExclusive()) { pkt->assertShared(); - else + // the writeback is no longer passing exclusivity (the + // receiving cache should consider the block owned + // rather than modified) + wb_pkt->assertShared(); + } else { assert(pkt->isInvalidate()); + } } if (pkt->isInvalidate()) { @@ -2243,7 +2298,7 @@ Cache::isCachedAbove(PacketPtr pkt, bool is_timing) const // Assert that packet is either Writeback or CleanEvict and not a // prefetch request because prefetch requests need an MSHR and may // generate a snoop response. - assert(pkt->evictingBlock()); + assert(pkt->isEviction()); snoop_pkt.senderState = NULL; cpuSidePort->sendTimingSnoopReq(&snoop_pkt); // Writeback/CleanEvict snoops do not generate a snoop response. @@ -2312,7 +2367,7 @@ Cache::getTimingPacket() mshr->blkAddr); // Deallocate the mshr target - if (tgt_pkt->cmd != MemCmd::Writeback) { + if (!tgt_pkt->isWriteback()) { if (mshr->queue->forceDeallocateTarget(mshr)) { // Clear block if this deallocation resulted freed an // mshr when all had previously been utilized diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index 6da837003..eb40ddb18 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -202,6 +202,15 @@ class Cache : public BaseCache */ const Enums::Clusivity clusivity; + /** + * Determine if clean lines should be written back or not. In + * cases where a downstream cache is mostly inclusive we likely + * want it to act as a victim cache also for lines that have not + * been modified. Hence, we cannot simply drop the line (or send a + * clean evict), but rather need to send the actual data. + */ + const bool writebackClean; + /** * Upstream caches need this packet until true is returned, so * hold it for deletion until a subsequent call diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc index 8407f5350..b44009a42 100644 --- a/src/mem/coherent_xbar.cc +++ b/src/mem/coherent_xbar.cc @@ -199,7 +199,7 @@ CoherentXBar::recvTimingReq(PacketPtr pkt, PortID slave_port_id) pkt->cmdString(), pkt->getAddr(), sf_res.first.size(), sf_res.second); - if (pkt->evictingBlock()) { + if (pkt->isEviction()) { // for block-evicting packets, i.e. writebacks and // clean evictions, there is no need to snoop up, as // all we do is determine if the block is cached or @@ -220,10 +220,11 @@ CoherentXBar::recvTimingReq(PacketPtr pkt, PortID slave_port_id) } // forwardTiming snooped into peer caches of the sender, and if - // this is a clean evict, but the packet is found in a cache, do - // not forward it - if (pkt->cmd == MemCmd::CleanEvict && pkt->isBlockCached()) { - DPRINTF(CoherentXBar, "recvTimingReq: Clean evict 0x%x still cached, " + // this is a clean evict or clean writeback, but the packet is + // found in a cache, do not forward it + if ((pkt->cmd == MemCmd::CleanEvict || + pkt->cmd == MemCmd::WritebackClean) && pkt->isBlockCached()) { + DPRINTF(CoherentXBar, "Clean evict/writeback %#llx still cached, " "not forwarding\n", pkt->getAddr()); // update the layer state and schedule an idle event @@ -634,8 +635,9 @@ CoherentXBar::recvAtomic(PacketPtr pkt, PortID slave_port_id) // forwardAtomic snooped into peer caches of the sender, and if // this is a clean evict, but the packet is found in a cache, do // not forward it - if (pkt->cmd == MemCmd::CleanEvict && pkt->isBlockCached()) { - DPRINTF(CoherentXBar, "recvAtomic: Clean evict 0x%x still cached, " + if ((pkt->cmd == MemCmd::CleanEvict || + pkt->cmd == MemCmd::WritebackClean) && pkt->isBlockCached()) { + DPRINTF(CoherentXBar, "Clean evict/writeback %#llx still cached, " "not forwarding\n", pkt->getAddr()); return 0; } diff --git a/src/mem/packet.cc b/src/mem/packet.cc index 80b079138..c79deb680 100644 --- a/src/mem/packet.cc +++ b/src/mem/packet.cc @@ -84,11 +84,16 @@ MemCmd::commandInfo[] = WriteResp, "WriteReq" }, /* WriteResp */ { SET3(IsWrite, NeedsExclusive, IsResponse), InvalidCmd, "WriteResp" }, - /* Writeback */ - { SET4(IsWrite, NeedsExclusive, IsRequest, HasData), - InvalidCmd, "Writeback" }, + /* WritebackDirty */ + { SET4(IsWrite, IsRequest, IsEviction, HasData), + InvalidCmd, "WritebackDirty" }, + /* WritebackClean - This allows the upstream cache to writeback a + * line to the downstream cache without it being considered + * dirty. */ + { SET4(IsWrite, IsRequest, IsEviction, HasData), + InvalidCmd, "WritebackClean" }, /* CleanEvict */ - { SET1(IsRequest), InvalidCmd, "CleanEvict" }, + { SET2(IsRequest, IsEviction), InvalidCmd, "CleanEvict" }, /* SoftPFReq */ { SET4(IsRead, IsRequest, IsSWPrefetch, NeedsResponse), SoftPFResp, "SoftPFReq" }, diff --git a/src/mem/packet.hh b/src/mem/packet.hh index f33ee120d..d1c285f04 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -86,7 +86,8 @@ class MemCmd ReadRespWithInvalidate, WriteReq, WriteResp, - Writeback, + WritebackDirty, + WritebackClean, CleanEvict, SoftPFReq, HardPFReq, @@ -144,6 +145,7 @@ class MemCmd IsRequest, //!< Issued by requester IsResponse, //!< Issue by responder NeedsResponse, //!< Requester needs response from target + IsEviction, IsSWPrefetch, IsHWPrefetch, IsLlsc, //!< Alpha/MIPS LL or SC access @@ -192,6 +194,13 @@ class MemCmd bool needsExclusive() const { return testCmdAttrib(NeedsExclusive); } bool needsResponse() const { return testCmdAttrib(NeedsResponse); } bool isInvalidate() const { return testCmdAttrib(IsInvalidate); } + bool isEviction() const { return testCmdAttrib(IsEviction); } + + /** + * A writeback is an eviction that carries data. + */ + bool isWriteback() const { return testCmdAttrib(IsEviction) && + testCmdAttrib(HasData); } /** * Check if this particular packet type carries payload data. Note @@ -491,6 +500,8 @@ class Packet : public Printable bool needsExclusive() const { return cmd.needsExclusive(); } bool needsResponse() const { return cmd.needsResponse(); } bool isInvalidate() const { return cmd.isInvalidate(); } + bool isEviction() const { return cmd.isEviction(); } + bool isWriteback() const { return cmd.isWriteback(); } bool hasData() const { return cmd.hasData(); } bool isLLSC() const { return cmd.isLLSC(); } bool isError() const { return cmd.isError(); } @@ -1008,24 +1019,23 @@ class Packet : public Printable } /** - * Is this request notification of a clean or dirty eviction from the cache. + * Does the request need to check for cached copies of the same block + * in the memory hierarchy above. **/ bool - evictingBlock() const + mustCheckAbove() const { - return (cmd == MemCmd::Writeback || - cmd == MemCmd::CleanEvict); + return cmd == MemCmd::HardPFReq || isEviction(); } /** - * Does the request need to check for cached copies of the same block - * in the memory hierarchy above. - **/ + * Is this packet a clean eviction, including both actual clean + * evict packets, but also clean writebacks. + */ bool - mustCheckAbove() const + isCleanEviction() const { - return (cmd == MemCmd::HardPFReq || - evictingBlock()); + return cmd == MemCmd::CleanEvict || cmd == MemCmd::WritebackClean; } /** diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc index 55763998a..6e8621960 100755 --- a/src/mem/snoop_filter.cc +++ b/src/mem/snoop_filter.cc @@ -128,7 +128,7 @@ SnoopFilter::lookupRequest(const Packet* cpkt, const SlavePort& slave_port) __func__, sf_item.requested, sf_item.holder); } } else { // if (!cpkt->needsResponse()) - assert(cpkt->evictingBlock()); + assert(cpkt->isEviction()); // make sure that the sender actually had the line panic_if(!(sf_item.holder & req_port), "requester %x is not a " \ "holder :( SF value %x.%x\n", req_port, @@ -207,7 +207,7 @@ SnoopFilter::lookupSnoop(const Packet* cpkt) // not the invalidation. Previously Writebacks did not generate upward // snoops so this was never an aissue. Now that Writebacks generate snoops // we need to special case for Writebacks. - assert(cpkt->cmd == MemCmd::Writeback || cpkt->req->isUncacheable() || + assert(cpkt->isWriteback() || cpkt->req->isUncacheable() || (cpkt->isInvalidate() == cpkt->needsExclusive())); if (cpkt->isInvalidate() && !sf_item.requested) { // Early clear of the holder, if no other request is currently going on @@ -270,7 +270,7 @@ SnoopFilter::updateSnoopResponse(const Packet* cpkt, //assert(sf_item.holder == 0); sf_item.holder = 0; } - assert(cpkt->cmd != MemCmd::Writeback); + assert(!cpkt->isWriteback()); sf_item.holder |= req_mask; sf_item.requested &= ~req_mask; assert(sf_item.requested | sf_item.holder); |