Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45009 )
Change subject: misc: Collapse all uses of DTRACE(x) to Debug::x.
......................................................................
misc: Collapse all uses of DTRACE(x) to Debug::x.
Change-Id: I99d9a9544b539117b375186e3e425d73d3c5cab7
---
M src/arch/arm/kvm/arm_cpu.cc
M src/arch/riscv/process.cc
M src/base/remote_gdb.cc
M src/base/stats/group.cc
M src/base/trace.cc
M src/cpu/base.cc
M src/cpu/kvm/base.cc
M src/cpu/kvm/x86_cpu.cc
M src/cpu/minor/execute.cc
M src/cpu/minor/fetch1.cc
M src/cpu/minor/fetch2.cc
M src/cpu/minor/func_unit.cc
M src/cpu/minor/pipeline.cc
M src/cpu/minor/scoreboard.cc
M src/cpu/o3/commit_impl.hh
M src/cpu/o3/decode_impl.hh
M src/cpu/o3/dyn_inst.cc
M src/cpu/o3/fetch_impl.hh
M src/cpu/o3/iew_impl.hh
M src/cpu/o3/lsq_unit_impl.hh
M src/cpu/o3/mem_dep_unit_impl.hh
M src/cpu/o3/rename_impl.hh
M src/cpu/profile.hh
M src/cpu/simple/base.cc
M src/cpu/trace/trace_cpu.cc
M src/dev/net/i8254xGBe.cc
M src/dev/net/ns_gige.cc
M src/dev/net/sinic.cc
M src/dev/serial/terminal.cc
M src/dev/virtio/base.cc
M src/dev/virtio/fs9p.cc
M src/kern/linux/events.hh
M src/mem/external_slave.cc
M src/mem/qos/mem_sink.cc
M src/sim/drain.cc
M src/sim/eventq.cc
M src/sim/eventq.hh
37 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/arch/arm/kvm/arm_cpu.cc b/src/arch/arm/kvm/arm_cpu.cc
index e827c22..9846996 100644
--- a/src/arch/arm/kvm/arm_cpu.cc
+++ b/src/arch/arm/kvm/arm_cpu.cc
@@ -586,7 +586,7 @@
setOneReg(ri->id, value);
}
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dumpKvmStateCore();
}
@@ -624,7 +624,7 @@
}
warned = true;
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dumpKvmStateMisc();
}
@@ -730,7 +730,7 @@
pc.set(getOneRegU32(REG_CORE32(usr_regs.ARM_pc)));
tc->pcState(pc);
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dumpKvmStateCore();
}
@@ -763,7 +763,7 @@
warned = true;
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dumpKvmStateMisc();
}
diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc
index be4e3a9..30aebd6 100644
--- a/src/arch/riscv/process.cc
+++ b/src/arch/riscv/process.cc
@@ -167,7 +167,7 @@
memState->setStackMin(memState->getStackMin() - (arg.size() + 1));
initVirtMem->writeString(memState->getStackMin(), arg.c_str());
argPointers.push_back(memState->getStackMin());
- if (DTRACE(Stack)) {
+ if (Debug::Stack) {
std::string wrote;
initVirtMem->readString(wrote, argPointers.back());
DPRINTFN("Wrote arg \"%s\" to address %p\n",
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index fc6813c..7b9788a 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -649,8 +649,8 @@
proxy.readBlob(vaddr, data, size);
#if TRACING_ON
- if (DTRACE(GDBRead)) {
- if (DTRACE(GDBExtra)) {
+ if (Debug::GDBRead) {
+ if (Debug::GDBExtra) {
char buf[1024];
mem2hex(buf, data, size);
DPRINTFNR(": %s\n", buf);
@@ -666,9 +666,9 @@
bool
BaseRemoteGDB::write(Addr vaddr, size_t size, const char *data)
{
- if (DTRACE(GDBWrite)) {
+ if (Debug::GDBWrite) {
DPRINTFN("write: addr=%#x, size=%d", vaddr, size);
- if (DTRACE(GDBExtra)) {
+ if (Debug::GDBExtra) {
char buf[1024];
mem2hex(buf, data, size);
DPRINTFNR(": %s\n", buf);
diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc
index de546cd..459adae 100644
--- a/src/base/stats/group.cc
+++ b/src/base/stats/group.cc
@@ -66,7 +66,7 @@
g->regStats();
for (auto &g : statGroups) {
- if (DTRACE(Stats)) {
+ if (Debug::Stats) {
M5_VAR_USED const SimObject *so =
dynamic_cast<const SimObject *>(this);
DPRINTF(Stats, "%s: regStats in group %s\n",
diff --git a/src/base/trace.cc b/src/base/trace.cc
index eee6a4d..0137ad7 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -148,10 +148,10 @@
if (!name.empty() && ignore.match(name))
return;
- if (!DTRACE(FmtTicksOff) && (when != MaxTick))
+ if (!Debug::FmtTicksOff && (when != MaxTick))
ccprintf(stream, "%7d: ", when);
- if (DTRACE(FmtFlag) && !flag.empty())
+ if (Debug::FmtFlag && !flag.empty())
stream << flag << ": ";
if (!name.empty())
@@ -160,7 +160,7 @@
stream << message;
stream.flush();
- if (DTRACE(FmtStackTrace)) {
+ if (Debug::FmtStackTrace) {
print_backtrace();
STATIC_ERR("\n");
}
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index c40c001..1badf0f 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -579,7 +579,7 @@
/* This code no longer works since the zero register (e.g.,
* r31 on Alpha) doesn't necessarily contain zero at this
* point.
- if (DTRACE(Context))
+ if (Debug::Context)
ThreadContext::compare(oldTC, newTC);
*/
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index 706b8f6..403cf01 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -279,7 +279,7 @@
void
BaseKvmCPU::serializeThread(CheckpointOut &cp, ThreadID tid) const
{
- if (DTRACE(Checkpoint)) {
+ if (Debug::Checkpoint) {
DPRINTF(Checkpoint, "KVM: Serializing thread %i:\n", tid);
dump();
}
diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc
index 320a241..78864d2 100644
--- a/src/cpu/kvm/x86_cpu.cc
+++ b/src/cpu/kvm/x86_cpu.cc
@@ -683,7 +683,7 @@
updateKvmStateMSRs();
DPRINTF(KvmContext, "X86KvmCPU::updateKvmState():\n");
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dump();
}
@@ -947,7 +947,7 @@
getSpecialRegisters(sregs);
DPRINTF(KvmContext, "X86KvmCPU::updateThreadContext():\n");
- if (DTRACE(KvmContext))
+ if (Debug::KvmContext)
dump();
updateThreadContextRegs(regs, sregs);
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index a85a2c3..1b50594 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -780,7 +780,7 @@
if (issued) {
/* Generate MinorTrace's MinorInst lines. Do this at commit
* to allow better instruction annotation? */
- if (DTRACE(MinorTrace) && !inst->isBubble()) {
+ if (Debug::MinorTrace && !inst->isBubble()) {
inst->minorTraceInst(*this,
cpu.threads[0]->getIsaPtr()->regClasses());
}
@@ -986,7 +986,7 @@
if (fault != NoFault) {
if (inst->traceData) {
- if (DTRACE(ExecFaulting)) {
+ if (Debug::ExecFaulting) {
inst->traceData->setFaulting(true);
} else {
delete inst->traceData;
@@ -1390,7 +1390,7 @@
/* Don't show no cost instructions as having taken a commit
* slot */
- if (DTRACE(MinorTrace) && !is_no_cost_inst)
+ if (Debug::MinorTrace && !is_no_cost_inst)
ex_info.instsBeingCommitted.insts[num_insts_committed] =
inst;
if (!is_no_cost_inst)
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index e20aacf..82165be 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -254,7 +254,7 @@
response->request->getPaddr() : 0),
response->request->getVaddr());
- if (DTRACE(MinorTrace))
+ if (Debug::MinorTrace)
minorTraceResponseLine(name(), response);
} else {
DPRINTF(Fetch, "Got ITLB response\n");
@@ -423,7 +423,7 @@
numFetchesInMemorySystem--;
fetch_request->state = FetchRequest::Complete;
- if (DTRACE(MinorTrace))
+ if (Debug::MinorTrace)
minorTraceResponseLine(name(), fetch_request);
if (response->isError()) {
diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index 58d3ad8..7f791f8 100644
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -489,7 +489,7 @@
/* Output MinorTrace instruction info for
* pre-microop decomposition macroops */
- if (DTRACE(MinorTrace) && !dyn_inst->isFault() &&
+ if (Debug::MinorTrace && !dyn_inst->isFault() &&
dyn_inst->staticInst->isMacroop())
{
dyn_inst->minorTraceInst(*this,
diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index b5024c3..32cce24 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -105,7 +105,7 @@
for (unsigned int i = 0; i < description.timings.size(); i++) {
MinorFUTiming &timing = *(description.timings[i]);
- if (DTRACE(MinorTiming)) {
+ if (Debug::MinorTiming) {
std::ostringstream lats;
unsigned int num_lats = timing.srcRegsRelativeLats.size();
diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index 3997c89..c3b1d27 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -132,7 +132,7 @@
fetch2.evaluate();
fetch1.evaluate();
- if (DTRACE(MinorTrace))
+ if (Debug::MinorTrace)
minorTrace();
/* Update the time buffers after the stages */
diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index 33b6b40..4e5c35d 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -261,7 +261,7 @@
src_index++;
}
- if (DTRACE(MinorTiming)) {
+ if (Debug::MinorTiming) {
if (ret && num_srcs > num_relative_latencies &&
num_relative_latencies != 0)
{
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 3642bc1..88536d0 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -1312,7 +1312,7 @@
if (head_inst->traceData) {
// We ignore ReExecution "faults" here as they are not real
// (architectural) faults but signal flush/replays.
- if (DTRACE(ExecFaulting)
+ if (Debug::ExecFaulting
&& dynamic_cast<ReExec*>(inst_fault.get()) == nullptr) {
head_inst->traceData->setFaulting(true);
@@ -1362,7 +1362,7 @@
rob->retireHead(tid);
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
head_inst->commitTick = curTick() - head_inst->fetchTick;
}
#endif
diff --git a/src/cpu/o3/decode_impl.hh b/src/cpu/o3/decode_impl.hh
index 192d057..9908184 100644
--- a/src/cpu/o3/decode_impl.hh
+++ b/src/cpu/o3/decode_impl.hh
@@ -700,7 +700,7 @@
--insts_available;
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
inst->decodeTick = curTick() - inst->fetchTick;
}
#endif
diff --git a/src/cpu/o3/dyn_inst.cc b/src/cpu/o3/dyn_inst.cc
index 42204cf..51e35f6 100644
--- a/src/cpu/o3/dyn_inst.cc
+++ b/src/cpu/o3/dyn_inst.cc
@@ -93,7 +93,7 @@
BaseO3DynInst::~BaseO3DynInst()
{
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
Tick fetch = this->fetchTick;
// fetchTick can be -1 if the instruction fetched outside the trace
// window.
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index d5aef80..0376451 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -1299,7 +1299,7 @@
numInst++;
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
instruction->fetchTick = curTick();
}
#endif
diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 075d246..5593074 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -1603,7 +1603,7 @@
iewStats.executedInstStats.numInsts++;
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
inst->completeTick = curTick() - inst->fetchTick;
}
#endif
diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 525f19d..a4c7895 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -1186,7 +1186,7 @@
store_inst->seqNum, store_idx.idx() - 1, storeQueue.head() -
1);
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
store_inst->storeTick =
curTick() - store_inst->fetchTick;
}
diff --git a/src/cpu/o3/mem_dep_unit_impl.hh
b/src/cpu/o3/mem_dep_unit_impl.hh
index 0ba5fc8..7a97cf7 100644
--- a/src/cpu/o3/mem_dep_unit_impl.hh
+++ b/src/cpu/o3/mem_dep_unit_impl.hh
@@ -178,7 +178,7 @@
if (barr_inst->isWriteBarrier() || barr_inst->isHtmCmd())
storeBarrierSNs.insert(barr_sn);
- if (DTRACE(MemDepUnit)) {
+ if (Debug::MemDepUnit) {
const char *barrier_type = nullptr;
if (barr_inst->isReadBarrier() && barr_inst->isWriteBarrier())
barrier_type = "memory";
@@ -460,7 +460,7 @@
assert(hasLoadBarrier());
loadBarrierSNs.erase(barr_sn);
}
- if (DTRACE(MemDepUnit)) {
+ if (Debug::MemDepUnit) {
const char *barrier_type = nullptr;
if (inst->isWriteBarrier() && inst->isReadBarrier())
barrier_type = "Memory";
diff --git a/src/cpu/o3/rename_impl.hh b/src/cpu/o3/rename_impl.hh
index f784eec..a14544a 100644
--- a/src/cpu/o3/rename_impl.hh
+++ b/src/cpu/o3/rename_impl.hh
@@ -807,7 +807,7 @@
const DynInstPtr &inst = fromDecode->insts[i];
insts[inst->threadNumber].push_back(inst);
#if TRACING_ON
- if (DTRACE(O3PipeView)) {
+ if (Debug::O3PipeView) {
inst->renameTick = curTick() - inst->fetchTick;
}
#endif
diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index b58447a..f29bdae 100644
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -86,7 +86,7 @@
const std::vector<Addr> &getstack() const { return stack; }
- void dprintf() { if (DTRACE(Stack)) dump(); }
+ void dprintf() { if (Debug::Stack) dump(); }
// This function can be overridden so that special addresses which
don't
// actually refer to PCs can be translated into special names. For
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 7939cfb..e51f5a5 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -246,7 +246,7 @@
void
BaseSimpleCPU::traceFault()
{
- if (DTRACE(ExecFaulting)) {
+ if (Debug::ExecFaulting) {
traceData->setFaulting(true);
} else {
delete traceData;
diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc
index dd031e6..bf532bf 100644
--- a/src/cpu/trace/trace_cpu.cc
+++ b/src/cpu/trace/trace_cpu.cc
@@ -257,7 +257,7 @@
depGraph.size());
// Print readyList
- if (DTRACE(TraceCPUData)) {
+ if (Debug::TraceCPUData) {
printReadyList();
}
auto free_itr = readyList.begin();
@@ -509,7 +509,7 @@
} // end of while loop
// Print readyList, sizes of queues and resource status after updating
- if (DTRACE(TraceCPUData)) {
+ if (Debug::TraceCPUData) {
printReadyList();
DPRINTF(TraceCPUData, "Execute end occupancy:\n");
DPRINTFR(TraceCPUData, "\tdepGraph = %d, readyList = %d, "
@@ -713,7 +713,7 @@
depGraph.erase(graph_itr);
}
- if (DTRACE(TraceCPUData)) {
+ if (Debug::TraceCPUData) {
printReadyList();
}
diff --git a/src/dev/net/i8254xGBe.cc b/src/dev/net/i8254xGBe.cc
index 8388b3b..30e38f0 100644
--- a/src/dev/net/i8254xGBe.cc
+++ b/src/dev/net/i8254xGBe.cc
@@ -1798,7 +1798,7 @@
tsoPrevSeq = tsoUsedLen;
}
- if (DTRACE(EthernetDesc)) {
+ if (Debug::EthernetDesc) {
IpPtr ip(pktPtr);
if (ip)
DPRINTF(EthernetDesc, "Proccesing Ip packet with Id=%d\n",
@@ -2291,7 +2291,7 @@
if (etherInt->sendPacket(txFifo.front())) {
- if (DTRACE(EthernetSM)) {
+ if (Debug::EthernetSM) {
IpPtr ip(txFifo.front());
if (ip)
DPRINTF(EthernetSM, "Transmitting Ip packet with Id=%d\n",
diff --git a/src/dev/net/ns_gige.cc b/src/dev/net/ns_gige.cc
index 2c77ad9..cda5ad6 100644
--- a/src/dev/net/ns_gige.cc
+++ b/src/dev/net/ns_gige.cc
@@ -1163,7 +1163,7 @@
rxPacketBufPtr = rxPacket->data;
#if TRACING_ON
- if (DTRACE(Ethernet)) {
+ if (Debug::Ethernet) {
IpPtr ip(rxPacket);
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());
@@ -1360,7 +1360,7 @@
txFifo.size());
if (interface->sendPacket(txFifo.front())) {
#if TRACING_ON
- if (DTRACE(Ethernet)) {
+ if (Debug::Ethernet) {
IpPtr ip(txFifo.front());
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index 0607d26..4a38905 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -711,7 +711,7 @@
switch (rxState) {
case rxFifoBlock:
- if (DTRACE(EthernetSM)) {
+ if (Debug::EthernetSM) {
PacketFifo::iterator end = rxFifo.end();
int size = virtualRegs.size();
for (int i = 0; i < size; ++i) {
@@ -965,7 +965,7 @@
txFifo.pop();
#if TRACING_ON
- if (DTRACE(Ethernet)) {
+ if (Debug::Ethernet) {
IpPtr ip(packet);
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());
diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc
index 2da9c3f..67cc643 100644
--- a/src/dev/serial/terminal.cc
+++ b/src/dev/serial/terminal.cc
@@ -324,7 +324,7 @@
Terminal::writeData(uint8_t c)
{
#if TRACING_ON == 1
- if (DTRACE(Terminal)) {
+ if (Debug::Terminal) {
static char last = '\0';
if ((c != '\n' && c != '\r') || (last != '\n' && last != '\r')) {
diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc
index c19cf92..17fe9c8 100644
--- a/src/dev/virtio/base.cc
+++ b/src/dev/virtio/base.cc
@@ -105,7 +105,7 @@
void
VirtDescriptor::dump() const
{
- if (!DTRACE(VIO))
+ if (!Debug::VIO)
return;
DPRINTF(VIO, "Descriptor[%i]: "
@@ -122,7 +122,7 @@
void
VirtDescriptor::dumpChain() const
{
- if (!DTRACE(VIO))
+ if (!Debug::VIO)
return;
const VirtDescriptor *desc(this);
@@ -314,7 +314,7 @@
void
VirtQueue::dump() const
{
- if (!DTRACE(VIO))
+ if (!Debug::VIO)
return;
for (const VirtDescriptor &d : descriptors)
diff --git a/src/dev/virtio/fs9p.cc b/src/dev/virtio/fs9p.cc
index 025a173..4b7ae07 100644
--- a/src/dev/virtio/fs9p.cc
+++ b/src/dev/virtio/fs9p.cc
@@ -194,7 +194,7 @@
VirtIO9PBase::dumpMsg(const P9MsgHeader &header, const uint8_t *data,
size_t size)
{
#ifndef NDEBUG
- if (!DTRACE(VIO9P))
+ if (!Debug::VIO9P)
return;
const P9MsgInfoMap::const_iterator
it_msg(p9_msg_info.find(header.type));
@@ -386,7 +386,7 @@
// Start diod
execlp(p.diod.c_str(), p.diod.c_str(),
- "-d", DTRACE(VIO9P) ? "1" : "0", // show debug output
+ "-d", Debug::VIO9P ? "1" : "0", // show debug output
"-f", // start in foreground
"-r", diod_rfd_s.c_str(), // setup read FD
"-w", diod_wfd_s.c_str(), // setup write FD
diff --git a/src/kern/linux/events.hh b/src/kern/linux/events.hh
index 8785345..d833ed5 100644
--- a/src/kern/linux/events.hh
+++ b/src/kern/linux/events.hh
@@ -64,7 +64,7 @@
void
process(ThreadContext *tc) override
{
- if (DTRACE(DebugPrintf)) {
+ if (Debug::DebugPrintf) {
std::string str;
std::function<int(ThreadContext *, Addr, PrintkVarArgs)> func =
[&str](ThreadContext *tc, Addr format_ptr,
diff --git a/src/mem/external_slave.cc b/src/mem/external_slave.cc
index 11f8d22..16ac7aa 100644
--- a/src/mem/external_slave.cc
+++ b/src/mem/external_slave.cc
@@ -96,7 +96,7 @@
Tick
StubSlavePort::recvAtomic(PacketPtr packet)
{
- if (DTRACE(ExternalPort)) {
+ if (Debug::ExternalPort) {
M5_VAR_USED unsigned int size = packet->getSize();
DPRINTF(ExternalPort, "StubSlavePort: recvAtomic a: 0x%x size: %d"
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 4034fb1..e81788b 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -222,7 +222,7 @@
"%s DUMPING %s queues status\n", __func__,
(busState == WRITE ? "WRITE" : "READ"));
- if (DTRACE(QOS)) {
+ if (Debug::QOS) {
for (uint8_t i = 0; i < numPriorities(); ++i) {
std::string plist = "";
for (auto& e : (busState == WRITE ? writeQueue[i]:
readQueue[i])) {
diff --git a/src/sim/drain.cc b/src/sim/drain.cc
index 3006768..a9afd50 100644
--- a/src/sim/drain.cc
+++ b/src/sim/drain.cc
@@ -70,7 +70,7 @@
_state = DrainState::Draining;
for (auto *obj : _allDrainable) {
DrainState status = obj->dmDrain();
- if (DTRACE(Drain) && status != DrainState::Drained) {
+ if (Debug::Drain && status != DrainState::Drained) {
SimObject *temp = dynamic_cast<SimObject*>(obj);
if (temp)
DPRINTF(Drain, "Failed to drain %s\n", temp->name());
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index 92863b1..f6eeb03 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -216,7 +216,7 @@
if (!event->squashed()) {
// forward current cycle to the time when this event occurs.
setCurTick(event->when());
- if (DTRACE(Event))
+ if (Debug::Event)
event->trace("executed");
event->process();
if (event->isExitEvent()) {
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index a9ab29b..5c8813a 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -781,7 +781,7 @@
event->flags.set(Event::Scheduled);
event->acquire();
- if (DTRACE(Event))
+ if (Debug::Event)
event->trace("scheduled");
}
@@ -802,7 +802,7 @@
event->flags.clear(Event::Squashed);
event->flags.clear(Event::Scheduled);
- if (DTRACE(Event))
+ if (Debug::Event)
event->trace("descheduled");
event->release();
@@ -833,7 +833,7 @@
event->flags.clear(Event::Squashed);
event->flags.set(Event::Scheduled);
- if (DTRACE(Event))
+ if (Debug::Event)
event->trace("rescheduled");
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45009
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I99d9a9544b539117b375186e3e425d73d3c5cab7
Gerrit-Change-Number: 45009
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
