diff options
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/cache/blk.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/mshr.hh | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mem/cache/blk.hh b/src/mem/cache/blk.hh index 39d45d6e1..700847030 100644 --- a/src/mem/cache/blk.hh +++ b/src/mem/cache/blk.hh @@ -335,6 +335,8 @@ class CacheBlk */ bool checkWrite(PacketPtr pkt) { + assert(pkt->isWrite()); + // common case if (!pkt->isLLSC() && lockList.empty()) return true; diff --git a/src/mem/cache/mshr.hh b/src/mem/cache/mshr.hh index 82a674672..ea3719343 100644 --- a/src/mem/cache/mshr.hh +++ b/src/mem/cache/mshr.hh @@ -149,7 +149,13 @@ class MSHR : public Packet::SenderState, public Printable bool isReset() const { return !needsWritable && !hasUpgrade; } void add(PacketPtr pkt, Tick readyTime, Counter order, Target::Source source, bool markPending); + + /** + * Convert upgrades to the equivalent request if the cache line they + * refer to would have been invalid (Upgrade -> ReadEx, SC* -> Fail). + * Used to rejig ordering between targets waiting on an MSHR. */ void replaceUpgrades(); + void clearDownstreamPending(); bool checkFunctional(PacketPtr pkt); void print(std::ostream &os, int verbosity, |