From 37635f290d491f71a66d9b2e2a6d0d45a89f4fda Mon Sep 17 00:00:00 2001 From: Tom Rollet Date: Fri, 18 Jun 2021 17:47:57 +0200 Subject: [PATCH] mem-cache: change Cache debug flag to MSHR in MSHR code Change-Id: I97ba0d5426d51d913649dcabb6d1ca862e4d137a Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47039 Reviewed-by: Giacomo Travaglini Reviewed-by: Daniel Carvalho Maintainer: Daniel Carvalho Tested-by: kokoro --- src/mem/cache/SConscript | 3 ++- src/mem/cache/mshr.cc | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mem/cache/SConscript b/src/mem/cache/SConscript index f07a918665..0150692969 100644 --- a/src/mem/cache/SConscript +++ b/src/mem/cache/SConscript @@ -46,10 +46,11 @@ DebugFlag('CacheRepl') DebugFlag('CacheTags') DebugFlag('CacheVerbose') DebugFlag('HWPrefetch') +DebugFlag('MSHR') # CacheTags is so outrageously verbose, printing the cache's entire tag # array on each timing access, that you should probably have to ask for # it explicitly even above and beyond CacheAll. CompoundFlag('CacheAll', ['Cache', 'CacheComp', 'CachePort', 'CacheRepl', - 'CacheVerbose', 'HWPrefetch']) + 'CacheVerbose', 'HWPrefetch', 'MSHR']) diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc index 9dae03de0d..bb4e8dfdba 100644 --- a/src/mem/cache/mshr.cc +++ b/src/mem/cache/mshr.cc @@ -52,7 +52,7 @@ #include "base/logging.hh" #include "base/trace.hh" #include "base/types.hh" -#include "debug/Cache.hh" +#include "debug/MSHR.hh" #include "mem/cache/base.hh" #include "mem/request.hh" #include "sim/core.hh" @@ -184,13 +184,13 @@ replaceUpgrade(PacketPtr pkt) if (pkt->cmd == MemCmd::UpgradeReq) { pkt->cmd = MemCmd::ReadExReq; - DPRINTF(Cache, "Replacing UpgradeReq with ReadExReq\n"); + DPRINTF(MSHR, "Replacing UpgradeReq with ReadExReq\n"); } else if (pkt->cmd == MemCmd::SCUpgradeReq) { pkt->cmd = MemCmd::SCUpgradeFailReq; - DPRINTF(Cache, "Replacing SCUpgradeReq with SCUpgradeFailReq\n"); + DPRINTF(MSHR, "Replacing SCUpgradeReq with SCUpgradeFailReq\n"); } else if (pkt->cmd == MemCmd::StoreCondReq) { pkt->cmd = MemCmd::StoreCondFailReq; - DPRINTF(Cache, "Replacing StoreCondReq with StoreCondFailReq\n"); + DPRINTF(MSHR, "Replacing StoreCondReq with StoreCondFailReq\n"); } if (!has_data) { @@ -411,7 +411,7 @@ MSHR::allocateTarget(PacketPtr pkt, Tick whenReady, Counter _order, bool MSHR::handleSnoop(PacketPtr pkt, Counter _order) { - DPRINTF(Cache, "%s for %s\n", __func__, pkt->print()); + DPRINTF(MSHR, "%s for %s\n", __func__, pkt->print()); // when we snoop packets the needsWritable and isInvalidate flags // should always be the same, however, this assumes that we never