[trace][intelpt] Instruction count in trace info

[zrthxn]

Summary

Added a line to thread trace dump info results which shows total number of instructions executed until now.

[zrthxn]

Fix failing test

[wallace]

just some minor details and good to go

lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp

108

use -> instead of dereferencing. It's less characters and more readable

116

no need to create a new variable. You can just inline everything here. It's not complex

lldb/test/API/commands/trace/TestTraceDumpInfo.py

38–42

thanks for putting the entire output here

[zrthxn]

Using arrow op and made it inline. I think creating a variable looks a bit better but this is fine too.

[wallace]

Lgtm!

lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp

 }
 
 lldb::TraceCursorUP TraceIntelPT::GetCursor(Thread &thread) {
   return Decode(thread)->GetCursor();
 }
 
 void TraceIntelPT::DumpTraceInfo(Thread &thread, Stream &s, bool verbose) {
   Optional<size_t> raw_size = GetRawTraceSize(thread);
+  size_t inst_size = (*Decode(thread)).GetInstructions().size();
   s.Printf("\nthread #%u: tid = %" PRIu64, thread.GetIndexID(), thread.GetID());
   if (!raw_size) {
     s.Printf(", not traced\n");
     return;
   }
-  s.Printf("\n  Raw trace size: %zu bytes\n", *raw_size);
+  s.Printf("\n");
+  s.Printf("  Raw trace size: %zu bytes\n", *raw_size);
+  s.Printf("  Total number of instructions: %zu\n", inst_size);
   return;
 }
 
 Optional<size_t> TraceIntelPT::GetRawTraceSize(Thread &thread) {
   if (IsTraced(thread.GetID()))
     return Decode(thread)->GetRawTraceSize();
   else
     return None;

lldb/test/API/commands/trace/TestTraceDumpInfo.py

def testErrorMessages(self):
             error=True)
 
     def testDumpRawTraceSize(self):
         self.expect("trace load -v " +
         os.path.join(self.getSourceDir(), "intelpt-trace", "trace.json"),
         substrs=["intel-pt"])
 
         self.expect("thread trace dump info",
             substrs=['''Trace technology: intel-pt
 
 thread #1: tid = 3842849
-  Raw trace size: 4096 bytes'''])
+  Raw trace size: 4096 bytes
+  Total number of instructions: 21'''])