diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/SConscript | 9 | ||||
| -rw-r--r-- | src/cpu/exetrace.cc | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/cpu/SConscript b/src/cpu/SConscript index bd6639061..0cbe013ec 100644 --- a/src/cpu/SConscript +++ b/src/cpu/SConscript @@ -46,7 +46,6 @@ DebugFlag('ExecRegDelta') DebugFlag('ExecResult', 'Format: Include results from execution') DebugFlag('ExecSymbol', 'Format: Try to include symbol names') DebugFlag('ExecThread', 'Format: Include thread ID in trace') -DebugFlag('ExecTicks', 'Format: Include tick count') DebugFlag('ExecMicro', 'Filter: Include microops') DebugFlag('ExecMacro', 'Filter: Include macroops') DebugFlag('ExecUser', 'Filter: Trace user mode instructions') @@ -63,14 +62,12 @@ DebugFlag('Mwait') CompoundFlag('ExecAll', [ 'ExecEnable', 'ExecCPSeq', 'ExecEffAddr', 'ExecFaulting', 'ExecFetchSeq', 'ExecOpClass', 'ExecRegDelta', 'ExecResult', 'ExecSymbol', 'ExecThread', - 'ExecTicks', 'ExecMicro', 'ExecMacro', 'ExecUser', 'ExecKernel', + 'ExecMicro', 'ExecMacro', 'ExecUser', 'ExecKernel', 'ExecAsid', 'ExecFlags' ]) -CompoundFlag('Exec', [ 'ExecEnable', 'ExecTicks', 'ExecOpClass', 'ExecThread', +CompoundFlag('Exec', [ 'ExecEnable', 'ExecOpClass', 'ExecThread', 'ExecEffAddr', 'ExecResult', 'ExecSymbol', 'ExecMicro', 'ExecMacro', 'ExecFaulting', 'ExecUser', 'ExecKernel' ]) -CompoundFlag('ExecNoTicks', [ 'ExecEnable', 'ExecOpClass', 'ExecThread', - 'ExecEffAddr', 'ExecResult', 'ExecMicro', 'ExecMacro', 'ExecFaulting', - 'ExecUser', 'ExecKernel' ]) +CompoundFlag('ExecNoTicks', [ 'Exec', 'FmtTicksOff' ]) Source('pc_event.cc') diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index a228893f2..bbfd3d3cd 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited + * Copyright (c) 2017, 2019 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -55,6 +55,7 @@ #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "debug/ExecAll.hh" +#include "debug/FmtTicksOff.hh" #include "enums/OpClass.hh" using namespace std; @@ -79,7 +80,7 @@ Trace::ExeTracerRecord::traceInst(const StaticInstPtr &inst, bool ran) if (!in_user_mode && !Debug::ExecKernel) return; } - if (Debug::ExecTicks) + if (!DTRACE(FmtTicksOff)) dumpTicks(outs); outs << thread->getCpuPtr()->name() << " "; |