summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2015-03-27 04:55:59 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2015-03-27 04:55:59 -0400
commit801ce65eaeda04017ac0df544eaa4c8ffae98455 (patch)
tree1e6460eeda8a806a611af3d0b806044e80a2cb6d
parentfe806a0dd7daef6cd42f78d7caaafcb5db9fd6a5 (diff)
downloadgem5-801ce65eaeda04017ac0df544eaa4c8ffae98455.tar.xz
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.
-rw-r--r--src/mem/cache/base.hh14
-rw-r--r--src/mem/cache/cache_impl.hh2
2 files changed, 2 insertions, 14 deletions
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 16160dba3..2bac2d30f 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -210,9 +210,7 @@ class BaseCache : public MemObject
*
* 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 @@ class BaseCache : public MemObject
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 @@ class BaseCache : public MemObject
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 --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 93ef34bb2..daff61d8e 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -555,7 +555,7 @@ Cache<TagStore>::recvTimingReq(PacketPtr pkt)
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;