Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/11098 )
Change subject: mem-cache: Remove Packet dependency in Tags
......................................................................
mem-cache: Remove Packet dependency in Tags
Decouple Tags from Packets, only extracting the necessary
functionality for block insertion. As a side effect, create
a new function to update common insertion statistics.
Change-Id: I5c58f7c17de3255beee531f72a3fd25a30d74c90
Reviewed-on: https://gem5-review.googlesource.com/c/11098
Reviewed-by: Jason Lowe-Power <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M src/mem/cache/base.cc
M src/mem/cache/tags/base.cc
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/fa_lru.cc
M src/mem/cache/tags/fa_lru.hh
M src/mem/cache/tags/sector_tags.cc
M src/mem/cache/tags/sector_tags.hh
8 files changed, 47 insertions(+), 30 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Nikos Nikoleris: Looks good to me, but someone else must approve
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index a061410..6c79fd6 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1280,7 +1280,8 @@
}
// Insert new block at victimized entry
- tags->insertBlock(pkt, victim);
+ tags->insertBlock(addr, is_secure, pkt->req->masterId(),
+ pkt->req->taskId(), victim);
return victim;
}
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 9548d49..7f848e0 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -52,7 +52,6 @@
#include "base/types.hh"
#include "mem/cache/base.hh"
-#include "mem/packet.hh"
#include "mem/request.hh"
#include "sim/core.hh"
#include "sim/sim_exit.hh"
@@ -80,25 +79,22 @@
}
void
-BaseTags::insertBlock(const PacketPtr pkt, CacheBlk *blk)
+BaseTags::insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk)
{
assert(!blk->isValid());
- // Get address
- Addr addr = pkt->getAddr();
-
// Previous block, if existed, has been removed, and now we have
// to insert the new one
-
// Deal with what we are bringing in
- MasterID master_id = pkt->req->masterId();
- assert(master_id < cache->system->maxMasters());
- occupancies[master_id]++;
+ assert(src_master_ID < cache->system->maxMasters());
+ occupancies[src_master_ID]++;
// Insert block with tag, src master id and task id
- blk->insert(extractTag(addr), pkt->isSecure(), master_id,
- pkt->req->taskId());
+ blk->insert(extractTag(addr), is_secure, src_master_ID, task_ID);
+ // Check if cache warm up is done
if (!warmedUp && tagsInUse.value() >= warmupBound) {
warmedUp = true;
warmupCycle = curTick();
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 9a9de8c..30a7af7 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -58,7 +58,6 @@
#include "base/statistics.hh"
#include "base/types.hh"
#include "mem/cache/blk.hh"
-#include "mem/packet.hh"
#include "params/BaseTags.hh"
#include "sim/clocked_object.hh"
@@ -285,10 +284,15 @@
/**
* Insert the new block into the cache and update stats.
*
- * @param pkt Packet holding the address to update
+ * @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 blk The block to update.
*/
- virtual void insertBlock(const PacketPtr pkt, CacheBlk *blk);
+ virtual void insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t
task_ID,
+ CacheBlk *blk);
/**
* Regenerate the block address.
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 8e4657f..dc0e042 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -60,7 +60,6 @@
#include "mem/cache/replacement_policies/base.hh"
#include "mem/cache/tags/base.hh"
#include "mem/cache/tags/cacheset.hh"
-#include "mem/packet.hh"
#include "params/BaseSetAssoc.hh"
/**
@@ -245,13 +244,18 @@
/**
* Insert the new block into the cache and update replacement data.
*
- * @param pkt Packet holding the address to update
+ * @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 blk The block to update.
*/
- void insertBlock(const PacketPtr pkt, CacheBlk *blk) override
+ void insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk) override
{
// Insert block
- BaseTags::insertBlock(pkt, blk);
+ BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID,
blk);
// Increment tag counter
tagsInUse++;
diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc
index 51f360e..1b43e98 100644
--- a/src/mem/cache/tags/fa_lru.cc
+++ b/src/mem/cache/tags/fa_lru.cc
@@ -208,7 +208,9 @@
}
void
-FALRU::insertBlock(const PacketPtr pkt, CacheBlk *blk)
+FALRU::insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk)
{
FALRUBlk* falruBlk = static_cast<FALRUBlk*>(blk);
@@ -216,7 +218,7 @@
assert(falruBlk->inCachesMask == 0);
// Do common block insertion functionality
- BaseTags::insertBlock(pkt, blk);
+ BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk);
// Increment tag counter
tagsInUse++;
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 43e5804..c8ccc66 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -62,7 +62,6 @@
#include "base/types.hh"
#include "mem/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
@@ -214,10 +213,15 @@
/**
* Insert the new block into the cache and update replacement data.
*
- * @param pkt Packet holding the address to update
+ * @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 blk The block to update.
*/
- void insertBlock(const PacketPtr pkt, CacheBlk *blk) override;
+ void insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk) override;
/**
* Generate the tag from the addres. For fully associative this is
just the
diff --git a/src/mem/cache/tags/sector_tags.cc
b/src/mem/cache/tags/sector_tags.cc
index 33269ec..76034e1 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -194,10 +194,12 @@
}
void
-SectorTags::insertBlock(const PacketPtr pkt, CacheBlk *blk)
+SectorTags::insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk)
{
- // Insert block
- BaseTags::insertBlock(pkt, blk);
+ // Do common block insertion functionality
+ BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk);
// Get block's sector
SectorSubBlk* sub_blk = static_cast<SectorSubBlk*>(blk);
diff --git a/src/mem/cache/tags/sector_tags.hh
b/src/mem/cache/tags/sector_tags.hh
index c0dae8d..109b983 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -41,7 +41,6 @@
#include "mem/cache/sector_blk.hh"
#include "mem/cache/tags/base.hh"
-#include "mem/packet.hh"
#include "params/SectorTags.hh"
class BaseReplacementPolicy;
@@ -150,10 +149,15 @@
/**
* Insert the new block into the cache and update replacement data.
*
- * @param pkt Packet holding the address to update
+ * @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 blk The block to update.
*/
- void insertBlock(const PacketPtr pkt, CacheBlk *blk) override;
+ void insertBlock(const Addr addr, const bool is_secure,
+ const int src_master_ID, const uint32_t task_ID,
+ CacheBlk *blk) override;
/**
* Finds the given address in the cache, do not update replacement
data.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/11098
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I5c58f7c17de3255beee531f72a3fd25a30d74c90
Gerrit-Change-Number: 11098
Gerrit-PatchSet: 8
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
