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.
This commit is contained in:
Andreas Hansson
2015-03-27 04:55:59 -04:00
parent fe806a0dd7
commit 801ce65eae
2 changed files with 2 additions and 14 deletions

14
src/mem/cache/base.hh vendored
View File

@@ -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.
*/

View File

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