Always run perf.data through PerfParser when converting.

In order to allow hugepage deduction against perf.data files, via
  $ perf_converter -i perf.data.before -I perf -o perf.data.after -O perf
always run PerfParser on PerfReader regardless of output type. Thus, any
quirks/fixes applied by quipper can be applied to a perf.data file.

PiperOrigin-RevId: 183144568

1 files changed, 6 insertions, 4 deletions

diff --git a/quipper/conversion_utils.cc b/quipper/conversion_utils.cc
index b1bd056..5e1819c 100644
--- a/quipper/conversion_utils.cc
+++ b/quipper/conversion_utils.cc
@@ -78,16 +78,18 @@ bool WriteOutput(const FormatAndFile& output,
                  const PerfParserOptions& options,
                  PerfReader* reader) {
   LOG(INFO) << "Writing output.";
+
+  // Apply use PerfParser to modify data in reader, applying hacks all hacks,
+  // regardless of output format.
+  PerfParser parser(reader, options);
+  if (!parser.ParseRawEvents()) return false;
+
   string output_string;
   if (output.format == kPerfFormat) {
     return reader->WriteFile(output.filename);
   }
 
   if (output.format == kProtoTextFormat) {
-    PerfParser parser(reader, options);
-    if (!parser.ParseRawEvents())
-      return false;
-
     PerfDataProto perf_data_proto;
     reader->Serialize(&perf_data_proto);