cache: make tags->insertBlock() and tags->accessBlock() context aware so that the cache can make context-specific decisions within their various tag policy implementations.
This commit is contained in:
parent
9f63548478
commit
8b4e8690b7
9
src/mem/cache/cache_impl.hh
vendored
9
src/mem/cache/cache_impl.hh
vendored
|
@ -266,7 +266,8 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
blk = tags->accessBlock(pkt->getAddr(), lat);
|
int id = pkt->req->hasContextId() ? pkt->req->contextId() : -1;
|
||||||
|
blk = tags->accessBlock(pkt->getAddr(), lat, id);
|
||||||
|
|
||||||
DPRINTF(Cache, "%s%s %x %s\n", pkt->cmdString(),
|
DPRINTF(Cache, "%s%s %x %s\n", pkt->cmdString(),
|
||||||
pkt->req->isInstFetch() ? " (ifetch)" : "",
|
pkt->req->isInstFetch() ? " (ifetch)" : "",
|
||||||
|
@ -299,7 +300,8 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk,
|
||||||
incMissCount(pkt);
|
incMissCount(pkt);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
tags->insertBlock(pkt->getAddr(), blk);
|
int id = pkt->req->hasContextId() ? pkt->req->contextId() : -1;
|
||||||
|
tags->insertBlock(pkt->getAddr(), blk, id);
|
||||||
blk->status = BlkValid | BlkReadable;
|
blk->status = BlkValid | BlkReadable;
|
||||||
}
|
}
|
||||||
std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize);
|
std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize);
|
||||||
|
@ -976,7 +978,8 @@ Cache<TagStore>::handleFill(PacketPtr pkt, BlkType *blk,
|
||||||
tempBlock->tag = tags->extractTag(addr);
|
tempBlock->tag = tags->extractTag(addr);
|
||||||
DPRINTF(Cache, "using temp block for %x\n", addr);
|
DPRINTF(Cache, "using temp block for %x\n", addr);
|
||||||
} else {
|
} else {
|
||||||
tags->insertBlock(addr, blk);
|
int id = pkt->req->hasContextId() ? pkt->req->contextId() : -1;
|
||||||
|
tags->insertBlock(pkt->getAddr(), blk, id);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// existing block... probably an upgrade
|
// existing block... probably an upgrade
|
||||||
|
|
4
src/mem/cache/tags/fa_lru.cc
vendored
4
src/mem/cache/tags/fa_lru.cc
vendored
|
@ -154,7 +154,7 @@ FALRU::invalidateBlk(FALRU::BlkType *blk)
|
||||||
}
|
}
|
||||||
|
|
||||||
FALRUBlk*
|
FALRUBlk*
|
||||||
FALRU::accessBlock(Addr addr, int &lat, int *inCache)
|
FALRU::accessBlock(Addr addr, int &lat, int context_src, int *inCache)
|
||||||
{
|
{
|
||||||
accesses++;
|
accesses++;
|
||||||
int tmp_in_cache = 0;
|
int tmp_in_cache = 0;
|
||||||
|
@ -228,7 +228,7 @@ FALRU::findVictim(Addr addr, PacketList &writebacks)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
FALRU::insertBlock(Addr addr, FALRU::BlkType *blk)
|
FALRU::insertBlock(Addr addr, FALRU::BlkType *blk, int context_src)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
src/mem/cache/tags/fa_lru.hh
vendored
4
src/mem/cache/tags/fa_lru.hh
vendored
|
@ -182,7 +182,7 @@ public:
|
||||||
* @param inCache The FALRUBlk::inCache flags.
|
* @param inCache The FALRUBlk::inCache flags.
|
||||||
* @return Pointer to the cache block.
|
* @return Pointer to the cache block.
|
||||||
*/
|
*/
|
||||||
FALRUBlk* accessBlock(Addr addr, int &lat, int *inCache = 0);
|
FALRUBlk* accessBlock(Addr addr, int &lat, int context_src, int *inCache = 0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find the block in the cache, do not update the replacement data.
|
* Find the block in the cache, do not update the replacement data.
|
||||||
|
@ -200,7 +200,7 @@ public:
|
||||||
*/
|
*/
|
||||||
FALRUBlk* findVictim(Addr addr, PacketList & writebacks);
|
FALRUBlk* findVictim(Addr addr, PacketList & writebacks);
|
||||||
|
|
||||||
void insertBlock(Addr addr, BlkType *blk);
|
void insertBlock(Addr addr, BlkType *blk, int context_src);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the hit latency of this cache.
|
* Return the hit latency of this cache.
|
||||||
|
|
4
src/mem/cache/tags/iic.cc
vendored
4
src/mem/cache/tags/iic.cc
vendored
|
@ -219,7 +219,7 @@ IIC::regStats(const string &name)
|
||||||
|
|
||||||
|
|
||||||
IICTag*
|
IICTag*
|
||||||
IIC::accessBlock(Addr addr, int &lat)
|
IIC::accessBlock(Addr addr, int &lat, int context_src)
|
||||||
{
|
{
|
||||||
Addr tag = extractTag(addr);
|
Addr tag = extractTag(addr);
|
||||||
unsigned set = hash(addr);
|
unsigned set = hash(addr);
|
||||||
|
@ -338,7 +338,7 @@ IIC::findVictim(Addr addr, PacketList &writebacks)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
IIC::insertBlock(Addr addr, BlkType* blk)
|
IIC::insertBlock(Addr addr, BlkType* blk, int context_src)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
src/mem/cache/tags/iic.hh
vendored
4
src/mem/cache/tags/iic.hh
vendored
|
@ -422,7 +422,7 @@ class IIC : public BaseTags
|
||||||
* @param lat The access latency.
|
* @param lat The access latency.
|
||||||
* @return A pointer to the block found, if any.
|
* @return A pointer to the block found, if any.
|
||||||
*/
|
*/
|
||||||
IICTag* accessBlock(Addr addr, int &lat);
|
IICTag* accessBlock(Addr addr, int &lat, int context_src);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find the block, do not update the replacement data.
|
* Find the block, do not update the replacement data.
|
||||||
|
@ -440,7 +440,7 @@ class IIC : public BaseTags
|
||||||
*/
|
*/
|
||||||
IICTag* findVictim(Addr addr, PacketList &writebacks);
|
IICTag* findVictim(Addr addr, PacketList &writebacks);
|
||||||
|
|
||||||
void insertBlock(Addr addr, BlkType *blk);
|
void insertBlock(Addr addr, BlkType *blk, int context_src);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called at end of simulation to complete average block reference stats.
|
* Called at end of simulation to complete average block reference stats.
|
||||||
|
|
4
src/mem/cache/tags/lru.cc
vendored
4
src/mem/cache/tags/lru.cc
vendored
|
@ -150,7 +150,7 @@ LRU::~LRU()
|
||||||
}
|
}
|
||||||
|
|
||||||
LRUBlk*
|
LRUBlk*
|
||||||
LRU::accessBlock(Addr addr, int &lat)
|
LRU::accessBlock(Addr addr, int &lat, int context_src)
|
||||||
{
|
{
|
||||||
Addr tag = extractTag(addr);
|
Addr tag = extractTag(addr);
|
||||||
unsigned set = extractSet(addr);
|
unsigned set = extractSet(addr);
|
||||||
|
@ -200,7 +200,7 @@ LRU::findVictim(Addr addr, PacketList &writebacks)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
LRU::insertBlock(Addr addr, LRU::BlkType *blk)
|
LRU::insertBlock(Addr addr, LRU::BlkType *blk, int context_src)
|
||||||
{
|
{
|
||||||
if (!blk->isTouched) {
|
if (!blk->isTouched) {
|
||||||
tagsInUse++;
|
tagsInUse++;
|
||||||
|
|
4
src/mem/cache/tags/lru.hh
vendored
4
src/mem/cache/tags/lru.hh
vendored
|
@ -172,7 +172,7 @@ public:
|
||||||
* @param lat The access latency.
|
* @param lat The access latency.
|
||||||
* @return Pointer to the cache block if found.
|
* @return Pointer to the cache block if found.
|
||||||
*/
|
*/
|
||||||
LRUBlk* accessBlock(Addr addr, int &lat);
|
LRUBlk* accessBlock(Addr addr, int &lat, int context_src);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finds the given address in the cache, do not update replacement data.
|
* Finds the given address in the cache, do not update replacement data.
|
||||||
|
@ -197,7 +197,7 @@ public:
|
||||||
* @param addr The address to update.
|
* @param addr The address to update.
|
||||||
* @param blk The block to update.
|
* @param blk The block to update.
|
||||||
*/
|
*/
|
||||||
void insertBlock(Addr addr, BlkType *blk);
|
void insertBlock(Addr addr, BlkType *blk, int context_src);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate the tag from the given address.
|
* Generate the tag from the given address.
|
||||||
|
|
Loading…
Reference in a new issue