3 files changed, 34 insertions, 0 deletions
diff --git a/src/mem/cache/tags/cacheset.cc b/src/mem/cache/tags/cacheset.cc
index dea1a6b45..8f96b947a 100644
--- a/src/mem/cache/tags/cacheset.cc
+++ b/src/mem/cache/tags/cacheset.cc
@@ -66,3 +66,27 @@ CacheSet::moveToHead(CacheBlk *blk)
     } while (next != blk);
 }
 
+void
+CacheSet::moveToTail(CacheBlk *blk)
+{
+    // nothing to do if blk is already tail
+    if (blks[assoc-1] == blk)
+        return;
+
+    // write 'next' block into blks[i], moving from LRU to MRU
+    // until we overwrite the block we moved to tail.
+
+    // start by setting up to write 'blk' into tail
+    int i = assoc - 1;
+    CacheBlk *next = blk;
+
+    do {
+        assert(i >= 0);
+        // swap blks[i] and next
+        CacheBlk *tmp = blks[i];
+        blks[i] = next;
+        next = tmp;
+        --i;
+    } while (next != blk);
+}
+
diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
index a1cf937cf..d38a1e927 100644
--- a/src/mem/cache/tags/cacheset.hh
+++ b/src/mem/cache/tags/cacheset.hh
@@ -66,6 +66,12 @@ class CacheSet
      */
     void moveToHead(CacheBlk *blk);
 
+    /**
+     * Move the given block to the tail of the list.
+     * @param blk The block to move
+     */
+    void moveToTail(CacheBlk *blk);
+
 };
 
 #endif
diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index babcedc89..c73f557b9 100644
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -213,6 +213,10 @@ LRU::invalidateBlk(BlkType *blk)
         blk->status = 0;
         blk->isTouched = false;
         blk->clearLoadLocks();
+
+        // should be evicted before valid blocks
+        unsigned set = blk->set;
+        sets[set].moveToTail(blk);
     }
 }