[gem5-dev] changeset in gem5: mem: Remove redundant allocateUncachedReadBuf...

[Andreas Hansson]

changeset 993c2baa485a in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=993c2baa485a
description:
        mem: Remove redundant allocateUncachedReadBuffer in cache

        This patch removes the no-longer-needed
        allocateUncachedReadBuffer. Besides the checks it is exactly the same
        as allocateMissBuffer and thus provides no value.

diffstat:

 src/mem/cache/base.hh       |  14 +-------------
 src/mem/cache/cache_impl.hh |   2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diffs (50 lines):

diff -r b2071d0eb5f1 -r 993c2baa485a src/mem/cache/base.hh
--- a/src/mem/cache/base.hh     Fri Mar 27 04:55:57 2015 -0400
+++ b/src/mem/cache/base.hh     Fri Mar 27 04:55:59 2015 -0400
@@ -210,9 +210,7 @@
      *
      * allocateBufferInternal() function is called in:
      * - MSHR allocateWriteBuffer (unchached write forwarded to WriteBuffer);
-     * - MSHR allocateMissBuffer (cacheable miss in MSHR queue);
-     * - MSHR allocateUncachedReadBuffer (unchached read allocated in MSHR
-     *   queue)
+     * - MSHR allocateMissBuffer (miss in MSHR queue);
      */
     MSHR *allocateBufferInternal(MSHRQueue *mq, Addr addr, int size,
                                  PacketPtr pkt, Tick time, bool requestBus)
@@ -501,7 +499,6 @@
 
     MSHR *allocateMissBuffer(PacketPtr pkt, Tick time, bool requestBus)
     {
-        assert(!pkt->req->isUncacheable());
         return allocateBufferInternal(&mshrQueue,
                                       blockAlign(pkt->getAddr()), blkSize,
                                       pkt, time, requestBus);
@@ -515,15 +512,6 @@
                                       pkt, time, requestBus);
     }
 
-    MSHR *allocateUncachedReadBuffer(PacketPtr pkt, Tick time, bool requestBus)
-    {
-        assert(pkt->req->isUncacheable());
-        assert(pkt->isRead());
-        return allocateBufferInternal(&mshrQueue,
-                                      blockAlign(pkt->getAddr()), blkSize,
-                                      pkt, time, requestBus);
-    }
-
     /**
      * Returns true if the cache is blocked for accesses.
      */
diff -r b2071d0eb5f1 -r 993c2baa485a src/mem/cache/cache_impl.hh
--- a/src/mem/cache/cache_impl.hh       Fri Mar 27 04:55:57 2015 -0400
+++ b/src/mem/cache/cache_impl.hh       Fri Mar 27 04:55:59 2015 -0400
@@ -555,7 +555,7 @@
                                             pkt->headerDelay;
             // Reset the timing of the packet.
             pkt->headerDelay = pkt->payloadDelay = 0;
-            allocateUncachedReadBuffer(pkt, allocate_rd_buffer_time, true);
+            allocateMissBuffer(pkt, allocate_rd_buffer_time, true);
         }
         assert(pkt->needsResponse()); // else we should delete it here??
         return true;
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev