Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/17538
Change subject: mem-cache: Remove secure flag from QueueEntry
......................................................................
mem-cache: Remove secure flag from QueueEntry
The secure flag was only a copy of the target's secure bit,
Therefore it can be extracted from the packet instead.
Change-Id: I2280f3ab3bf433a7f6a3eae5a14dfb3409001d13
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/mem/cache/base.cc
M src/mem/cache/cache.cc
M src/mem/cache/mshr.cc
M src/mem/cache/queue_entry.hh
M src/mem/cache/write_queue_entry.cc
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index 3de0d83..c741b1a 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1567,7 +1567,7 @@
}
}
- CacheBlk *blk = tags->findBlock(addr, mshr->isSecure());
+ CacheBlk *blk = tags->findBlock(addr, tgt_pkt->isSecure());
// either a prefetch that is not present upstream, or a normal
// MSHR request, proceed to get the packet to send downstream
diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc
index 8009496..3ffa4df 100644
--- a/src/mem/cache/cache.cc
+++ b/src/mem/cache/cache.cc
@@ -1325,7 +1325,7 @@
// we should never have hardware prefetches to allocated
// blocks
- assert(!tags->findBlock(tgt_pkt->getAddr(), mshr->isSecure()));
+ assert(!tags->findBlock(tgt_pkt->getAddr(), tgt_pkt->isSecure()));
// We need to check the caches above us to verify that
// they don't have a copy of this block in the dirty state
diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 449a18e..3dc212f 100644
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -254,7 +254,6 @@
Tick when_ready, Counter _order, bool alloc_on_fill)
{
blkSize = blk_size;
- _isSecure = target->isSecure();
readyTime = when_ready;
order = _order;
assert(target);
@@ -653,7 +652,6 @@
{
ccprintf(os, "%s[%#llx:%#llx](%s) %s %s %s state: %s %s %s %s %s %s\n",
prefix,
- isSecure() ? "s" : "ns",
isForward ? "Forward" : "",
allocOnFill() ? "AllocOnFill" : "",
needsWritable() ? "Wrtbl" : "",
diff --git a/src/mem/cache/queue_entry.hh b/src/mem/cache/queue_entry.hh
index 3f17f7d..2d37081 100644
--- a/src/mem/cache/queue_entry.hh
+++ b/src/mem/cache/queue_entry.hh
@@ -68,9 +68,6 @@
friend class Queue;
protected:
- /** True if the entry targets the secure memory space. */
- bool _isSecure;
-
/** Tick when ready to issue */
Tick readyTime;
@@ -116,12 +113,10 @@
unsigned blkSize;
QueueEntry()
- : _isSecure(false), readyTime(0), _isUncacheable(false),
+ : readyTime(0), _isUncacheable(false),
inService(false), order(0), blkSize(0)
{}
- bool isSecure() const { return _isSecure; }
-
bool isUncacheable() const { return _isUncacheable; }
/**
diff --git a/src/mem/cache/write_queue_entry.cc
b/src/mem/cache/write_queue_entry.cc
index 640affd..afe5240 100644
--- a/src/mem/cache/write_queue_entry.cc
+++ b/src/mem/cache/write_queue_entry.cc
@@ -92,7 +92,6 @@
Tick when_ready, Counter _order)
{
blkSize = blk_size;
- _isSecure = target->isSecure();
readyTime = when_ready;
order = _order;
assert(target);
@@ -181,7 +180,7 @@
const std::string &prefix) const
{
ccprintf(os, "%s(%s) %s %s %s state: %s %s %s %s %s\n",
- prefix, isSecure() ? "s" : "ns",
+ prefix,
_isUncacheable ? "Unc" : "",
inService ? "InSvc" : "");
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/17538
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: I2280f3ab3bf433a7f6a3eae5a14dfb3409001d13
Gerrit-Change-Number: 17538
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
