}
// Insert new block at victimized entry
- tags->insertBlock(addr, is_secure, pkt->req->masterId(),
- pkt->req->taskId(), victim);
+ tags->insertBlock(pkt, victim);
return victim;
}
}
void
-BaseTags::insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk)
+BaseTags::insertBlock(const PacketPtr pkt, CacheBlk *blk)
{
assert(!blk->isValid());
// Previous block, if existed, has been removed, and now we have
// to insert the new one
+
// Deal with what we are bringing in
- assert(src_master_ID < system->maxMasters());
- occupancies[src_master_ID]++;
+ MasterID master_id = pkt->req->masterId();
+ assert(master_id < system->maxMasters());
+ occupancies[master_id]++;
// Insert block with tag, src master id and task id
- blk->insert(extractTag(addr), is_secure, src_master_ID, task_ID);
+ blk->insert(extractTag(pkt->getAddr()), pkt->isSecure(), master_id,
+ pkt->req->taskId());
// Check if cache warm up is done
if (!warmedUp && tagsInUse.value() >= warmupBound) {
#include "base/statistics.hh"
#include "base/types.hh"
#include "mem/cache/cache_blk.hh"
+#include "mem/packet.hh"
#include "params/BaseTags.hh"
#include "sim/clocked_object.hh"
/**
* Insert the new block into the cache and update stats.
*
- * @param addr Address of the block.
- * @param is_secure Whether the block is in secure space or not.
- * @param src_master_ID The source requestor ID.
- * @param task_ID The new task ID.
+ * @param pkt Packet holding the address to update
* @param blk The block to update.
*/
- virtual void insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk);
+ virtual void insertBlock(const PacketPtr pkt, CacheBlk *blk);
/**
* Regenerate the block address.
#include "mem/cache/replacement_policies/replaceable_entry.hh"
#include "mem/cache/tags/base.hh"
#include "mem/cache/tags/indexing_policies/base.hh"
+#include "mem/packet.hh"
#include "params/BaseSetAssoc.hh"
/**
/**
* Insert the new block into the cache and update replacement data.
*
- * @param addr Address of the block.
- * @param is_secure Whether the block is in secure space or not.
- * @param src_master_ID The source requestor ID.
- * @param task_ID The new task ID.
+ * @param pkt Packet holding the address to update
* @param blk The block to update.
*/
- void insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk) override
+ void insertBlock(const PacketPtr pkt, CacheBlk *blk) override
{
// Insert block
- BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk);
+ BaseTags::insertBlock(pkt, blk);
// Increment tag counter
tagsInUse++;
}
void
-FALRU::insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk)
+FALRU::insertBlock(const PacketPtr pkt, CacheBlk *blk)
{
FALRUBlk* falruBlk = static_cast<FALRUBlk*>(blk);
assert(falruBlk->inCachesMask == 0);
// Do common block insertion functionality
- BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk);
+ BaseTags::insertBlock(pkt, blk);
// Increment tag counter
tagsInUse++;
#include "base/types.hh"
#include "mem/cache/cache_blk.hh"
#include "mem/cache/tags/base.hh"
+#include "mem/packet.hh"
#include "params/FALRU.hh"
// Uncomment to enable sanity checks for the FALRU cache and the
/**
* Insert the new block into the cache and update replacement data.
*
- * @param addr Address of the block.
- * @param is_secure Whether the block is in secure space or not.
- * @param src_master_ID The source requestor ID.
- * @param task_ID The new task ID.
+ * @param pkt Packet holding the address to update
* @param blk The block to update.
*/
- void insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk) override;
+ void insertBlock(const PacketPtr pkt, CacheBlk *blk) override;
/**
* Generate the tag from the addres. For fully associative this is just the
}
void
-SectorTags::insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk)
+SectorTags::insertBlock(const PacketPtr pkt, CacheBlk *blk)
{
// Get block's sector
SectorSubBlk* sub_blk = static_cast<SectorSubBlk*>(blk);
}
// Do common block insertion functionality
- BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk);
+ BaseTags::insertBlock(pkt, blk);
}
CacheBlk*
#include "mem/cache/tags/base.hh"
#include "mem/cache/tags/sector_blk.hh"
+#include "mem/packet.hh"
#include "params/SectorTags.hh"
-class BaseCache;
class BaseReplacementPolicy;
class ReplaceableEntry;
/**
* Insert the new block into the cache and update replacement data.
*
- * @param addr Address of the block.
- * @param is_secure Whether the block is in secure space or not.
- * @param src_master_ID The source requestor ID.
- * @param task_ID The new task ID.
+ * @param pkt Packet holding the address to update
* @param blk The block to update.
*/
- void insertBlock(const Addr addr, const bool is_secure,
- const int src_master_ID, const uint32_t task_ID,
- CacheBlk *blk) override;
+ void insertBlock(const PacketPtr pkt, CacheBlk *blk) override;
/**
* Finds the given address in the cache, do not update replacement data.