commit 2e3bf009b111a7e3076db61ed5cee4acaa28dc83
author Gabe Black <gabeblack@google.com> Thu Sep 21 17:48:33 2017 -0700
committer Gabe Black <gabeblack@google.com> Mon Sep 25 21:14:21 2017 +0000
tree d4804e5ccbbbd644bae5a7dfbb3dc692b2d231cb
parent 10cd85c67c0d55ae4aa82ab5b4b1ddc0b6379839

mem: Fill the new packet ID fields with master IDs when tracing packets.

This will let somebody consuming the memory packet trace make sense out of
the master IDs passed along with individual accesses.

Change-Id: I621d915f218728066ce95e6fc81f36d14ae7e597
Reviewed-on: https://gem5-review.googlesource.com/4800
Reviewed-by: Rahul Thakur <rjthakur@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>

src/mem/probes/MemTraceProbe.py

diff --git a/src/mem/probes/MemTraceProbe.py b/src/mem/probes/MemTraceProbe.py
index c51ec92..8daf94d 100644
--- a/src/mem/probes/MemTraceProbe.py
+++ b/src/mem/probes/MemTraceProbe.py
@@ -52,3 +52,5 @@
     # packet trace output file, disabled by default
     trace_file = Param.String("", "Packet trace output file")
 
+    # System object to look up the name associated with a master ID
+    system = Param.System(Parent.any, "System the probe belongs to")

src/mem/probes/mem_trace.cc

diff --git a/src/mem/probes/mem_trace.cc b/src/mem/probes/mem_trace.cc
index 465c100..6e55c48 100644
--- a/src/mem/probes/mem_trace.cc
+++ b/src/mem/probes/mem_trace.cc
@@ -44,10 +44,12 @@
 #include "base/output.hh"
 #include "params/MemTraceProbe.hh"
 #include "proto/packet.pb.h"
+#include "sim/system.hh"
 
 MemTraceProbe::MemTraceProbe(MemTraceProbeParams *p)
     : BaseMemProbe(p),
       traceStream(nullptr),
+      system(p->system),
       withPC(p->with_pc)
 {
     std::string filename;
@@ -72,13 +74,6 @@
 
     traceStream = new ProtoOutputStream(filename);
 
-    // Create a protobuf message for the header and write it to
-    // the stream
-    ProtoMessage::PacketHeader header_msg;
-    header_msg.set_obj_id(name());
-    header_msg.set_tick_freq(SimClock::Frequency);
-    traceStream->write(header_msg);
-
     // Register a callback to compensate for the destructor not
     // being called. The callback forces the stream to flush and
     // closes the output file.
@@ -87,6 +82,24 @@
 }
 
 void
+MemTraceProbe::startup()
+{
+    // Create a protobuf message for the header and write it to
+    // the stream
+    ProtoMessage::PacketHeader header_msg;
+    header_msg.set_obj_id(name());
+    header_msg.set_tick_freq(SimClock::Frequency);
+
+    for (int i = 0; i < system->maxMasters(); i++) {
+        auto id_string = header_msg.add_id_strings();
+        id_string->set_key(i);
+        id_string->set_value(system->getMasterName(i));
+    }
+
+    traceStream->write(header_msg);
+}
+
+void
 MemTraceProbe::closeStreams()
 {
     if (traceStream != NULL)

src/mem/probes/mem_trace.hh

diff --git a/src/mem/probes/mem_trace.hh b/src/mem/probes/mem_trace.hh
index 158c5aa..51abebc 100644
--- a/src/mem/probes/mem_trace.hh
+++ b/src/mem/probes/mem_trace.hh
@@ -45,6 +45,7 @@
 #include "proto/protoio.hh"
 
 struct MemTraceProbeParams;
+class System;
 
 class MemTraceProbe : public BaseMemProbe
 {
@@ -60,11 +61,15 @@
      */
     void closeStreams();
 
+    void startup() override;
+
   protected:
 
     /** Trace output stream */
     ProtoOutputStream *traceStream;
 
+    System *system;
+
   private:
 
     /** Include the Program Counter in the memory trace */