commit 1ef80a590e509daa70e08c44f22f8f2cfbcf4bc1
author Ciro Santilli <ciro.santilli@arm.com> Fri Oct 11 17:57:14 2019 +0100
committer Ciro Santilli <ciro.santilli@arm.com> Tue Nov 26 12:46:59 2019 +0000
tree 7a63af66c35e0ba6f03a9ac777ae023ded99d9b6
parent 2841aaae7e5d53cc5b634873a8d689119556c875

base: generalize ExecTicks to all messages with FmtTicksOff

If FmtTicksOff is given, ticks are disabled for all log messages.

The original motivation of this is to bring the implementation of native
traces closer to that of other traces to help refactoring done in future
patches.

One additional advantage of this is that sometimes we want to compare
traces of a given program under different conditions, so the start of the
ROI is different, and the different initial timestamp makes a diff
useless by showing differences on every line.

Change-Id: Idd6cb105d301b3b9b064996043f4ca75ddafe0af
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22006
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/base/SConscript

diff --git a/src/base/SConscript b/src/base/SConscript
index 5bf0633..548fda7 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -112,6 +112,7 @@
 DebugFlag('AnnotateQ', "State machine annotation queue debugging")
 DebugFlag('AnnotateVerbose', "Dump all state machine annotation details")
 DebugFlag('FmtFlag', "Show the --debug-flag that enabled each debug message")
+DebugFlag('FmtTicksOff', "Don't show tick count on debug messages")
 DebugFlag('GDBAcc', "Remote debugger accesses")
 DebugFlag('GDBExtra', "Dump extra information on reads and writes")
 DebugFlag('GDBMisc', "Breakpoints, traps, watchpoints, etc.")

src/base/trace.cc

diff --git a/src/base/trace.cc b/src/base/trace.cc
index c7f338b..6b18787 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -46,6 +46,7 @@
 #include "base/output.hh"
 #include "base/str.hh"
 #include "debug/FmtFlag.hh"
+#include "debug/FmtTicksOff.hh"
 
 const std::string &name()
 {
@@ -150,7 +151,7 @@
     if (!name.empty() && ignore.match(name))
         return;
 
-    if (when != MaxTick)
+    if (!DTRACE(FmtTicksOff) && (when != MaxTick))
         ccprintf(stream, "%7d: ", when);
 
     if (DTRACE(FmtFlag) && !flag.empty())

src/cpu/SConscript

diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index bd66390..0cbe013 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -46,7 +46,6 @@
 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 @@
 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')
 

src/cpu/exetrace.cc

diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index a228893..bbfd3d3 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 @@
         if (!in_user_mode && !Debug::ExecKernel) return;
     }
 
-    if (Debug::ExecTicks)
+    if (!DTRACE(FmtTicksOff))
         dumpTicks(outs);
 
     outs << thread->getCpuPtr()->name() << " ";