mem: Add an option to perform clean writebacks from caches

This patch adds the necessary commands and cache functionality to
allow clean writebacks. This functionality is crucial, especially when
having exclusive (victim) caches. For example, if read-only L1
instruction caches are not sending clean writebacks, there will never
be any spills from the L1 to the L2. At the moment the cache model
defaults to not sending clean writebacks, and this should possibly be
re-evaluated.

The implementation of clean writebacks relies on a new packet command
WritebackClean, which acts much like a Writeback (renamed
WritebackDirty), and also much like a CleanEvict. On eviction of a
clean block the cache either sends a clean evict, or a clean
writeback, and if any copies are still cached upstream the clean
evict/writeback is dropped. Similarly, if a clean evict/writeback
reaches a cache where there are outstanding MSHRs for the block, the
packet is dropped. In the typical case though, the clean writeback
allocates a block in the downstream cache, and marks it writable if
the evicted block was writable.

The patch changes the O3_ARM_v7a L1 cache configuration and the
default L1 caches in config/common/Caches.py

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

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):

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;

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")

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);

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;
+            MSHR *wb_entry = outgoing[0];
-            assert(pkt->cmd == MemCmd::CleanEvict &&
+            assert(wb_entry->getNumTargets() == 1);
-                   wbPkt->cmd == MemCmd::Writeback);
+            PacketPtr wbPkt = wb_entry->getTarget()->pkt;
-            // As the CleanEvict is coming from above, it would have snooped
+            assert(wbPkt->isWriteback());
-            // into other peer caches of the same level while traversing the
+
-            // crossbar. If a copy of the block had been found, the CleanEvict
+            if (pkt->isCleanEviction()) {
-            // would have been deleted in the crossbar. Now that the
+                // The CleanEvict and WritebackClean snoops into other
-            // CleanEvict is here we can be sure none of the other upper level
+                // peer caches of the same level while traversing the
-            // caches connected to this cache have the block, so we can clear
+                // crossbar. If a copy of the block is found, the
-            // the BLOCK_CACHED flag in the Writeback if set and discard the
+                // packet is deleted in the crossbar. Hence, none of
-            // CleanEvict by returning true.
+                // the other upper level caches connected to this
-            wbPkt->clearBlockCached();
+                // cache have the block, so we can clear the
-            return true;
+                // 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);
+                assert(!pkt->isWriteback());
-                // CleanEvicts corresponding to blocks which have outstanding
+                // CleanEvicts corresponding to blocks which have
-                // requests in MSHRs can be deleted here.
+                // 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) :
+        tempBlockWriteback = (blk->isDirty() || writebackClean) ?
-            cleanEvictBlk(blk);
+            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");
+    chatty_assert(!isReadOnly || writebackClean,
-    assert(blk && blk->isValid() && blk->isDirty());
+                  "Writeback from read-only cache");
+    assert(blk && blk->isValid() && (blk->isDirty() || writebackClean));
 
     writebacks[Request::wbMasterId]++;
 
-    Request *writebackReq =
+    Request *req = new Request(tags->regenerateBlkAddr(blk->tag, blk->set),
-        new Request(tags->regenerateBlkAddr(blk->tag, blk->set), blkSize, 0,
+                               blkSize, 0, Request::wbMasterId);
-                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();
+    // make sure the block is not marked dirty
-    std::memcpy(writeback->getPtr<uint8_t>(), blk->data, blkSize);
-
     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
+            // or WritebackClean message we must set assertShared
-            // encounters a Writeback) to avoid the snoop filter
+            // (just like when it encounters a Writeback) to avoid the
-            // prematurely clearing the holder bit in the crossbar
+            // snoop filter prematurely clearing the holder bit in the
-            // below
+            // crossbar below
-            if (!pkt->needsExclusive())
+            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

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

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
+    // this is a clean evict or clean writeback, but the packet is
-    // not forward it
+    // found in a cache, do not forward it
-    if (pkt->cmd == MemCmd::CleanEvict && pkt->isBlockCached()) {
+    if ((pkt->cmd == MemCmd::CleanEvict ||
-        DPRINTF(CoherentXBar, "recvTimingReq: Clean evict 0x%x still cached, "
+         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()) {
+    if ((pkt->cmd == MemCmd::CleanEvict ||
-        DPRINTF(CoherentXBar, "recvAtomic: Clean evict 0x%x still cached, "
+         pkt->cmd == MemCmd::WritebackClean) && pkt->isBlockCached()) {
+        DPRINTF(CoherentXBar, "Clean evict/writeback %#llx still cached, "
                 "not forwarding\n", pkt->getAddr());
         return 0;
     }

src/mem/packet.cc

@@ -84,11 +84,16 @@ MemCmd::commandInfo[] =
             WriteResp, "WriteReq" },
     /* WriteResp */
     { SET3(IsWrite, NeedsExclusive, IsResponse), InvalidCmd, "WriteResp" },
-    /* Writeback */
+    /* WritebackDirty */
-    { SET4(IsWrite, NeedsExclusive, IsRequest, HasData),
+    { SET4(IsWrite, IsRequest, IsEviction, HasData),
-            InvalidCmd, "Writeback" },
+            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" },

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(); }
@@ -1007,16 +1018,6 @@ class Packet : public Printable
                                other->getPtr<uint8_t>() : NULL);
     }
 
-    /**
-     * Is this request notification of a clean or dirty eviction from the cache.
-     **/
-    bool
-    evictingBlock() const
-    {
-        return (cmd == MemCmd::Writeback ||
-                cmd == MemCmd::CleanEvict);
-    }
-
     /**
      * Does the request need to check for cached copies of the same block
      * in the memory hierarchy above.
@@ -1024,8 +1025,17 @@ class Packet : public Printable
     bool
     mustCheckAbove() const
     {
-        return (cmd == MemCmd::HardPFReq ||
+        return cmd == MemCmd::HardPFReq || isEviction();
-                evictingBlock());
+    }
+
+    /**
+     * Is this packet a clean eviction, including both actual clean
+     * evict packets, but also clean writebacks.
+     */
+    bool
+    isCleanEviction() const
+    {
+        return cmd == MemCmd::CleanEvict || cmd == MemCmd::WritebackClean;
     }
 
     /**

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);