[llvm] [MCA] Extend -instruction-tables option with verbosity levels (PR #130574)

[Min-Yih Hsu via llvm-commits]

================
@@ -29,82 +60,151 @@ void InstructionInfoView::printView(raw_ostream &OS) const {
   IIVDVec IIVD(Source.size());
   collectData(IIVD);
 
-  TempStream << "\n\nInstruction Info:\n";
-  TempStream << "[1]: #uOps\n[2]: Latency\n[3]: RThroughput\n"
-             << "[4]: MayLoad\n[5]: MayStore\n[6]: HasSideEffects (U)\n";
+  if (PrintFullInfo) {
+    FOS << "\n\nResources:\n";
+    const MCSchedModel &SM = getSubTargetInfo().getSchedModel();
+    for (unsigned I = 1, ResourceIndex = 0, E = SM.getNumProcResourceKinds();
+         I < E; ++I) {
+      const MCProcResourceDesc &ProcResource = *SM.getProcResource(I);
+      unsigned NumUnits = ProcResource.NumUnits;
+      // Skip invalid resources with zero units.
+      if (!NumUnits)
+        continue;
+
+      FOS << '[' << ResourceIndex << ']';
+      FOS.PadToColumn(6);
+      FOS << "- " << ProcResource.Name << ':' << NumUnits;
+      if (ProcResource.SubUnitsIdxBegin) {
+        FOS.PadToColumn(20);
+        for (unsigned U = 0; U < NumUnits; ++U) {
+          FOS << SM.getProcResource(ProcResource.SubUnitsIdxBegin[U])->Name;
+          if ((U + 1) < NumUnits)
+            FOS << ", ";
+        }
+      }
+      FOS << '\n';
+      ResourceIndex++;
+    }
+  }
+
+  std::vector<unsigned> Paddings = {0, 7, 14, 21, 28, 35};
+  std::vector<std::string> Fields = {"#uOps",       "Latency",
+                                     "RThroughput", "MayLoad",
+                                     "MayStore",    "HasSideEffects (U)"};
+  std::vector<std::string> EndFields;
+  unsigned LastPadding = 35;
+  if (PrintFullInfo) {
+    Fields.push_back("Bypass Latency");
+    Paddings.push_back(LastPadding + 7);
+    LastPadding += 7;
+    Fields.push_back("Resources");
+    Paddings.push_back(LastPadding + 7);
+    LastPadding += 7;
+    Fields.push_back("LLVM Opcode Name");
+    Paddings.push_back(LastPadding + 57);
+    LastPadding += 57;
+  }
   if (PrintBarriers) {
-    TempStream << "[7]: LoadBarrier\n[8]: StoreBarrier\n";
+    Fields.push_back("LoadBarrier");
+    Paddings.push_back(LastPadding + 7);
+    Fields.push_back("StoreBarrier");
+    Paddings.push_back(LastPadding + 14);
+    LastPadding += 14;
   }
   if (PrintEncodings) {
-    if (PrintBarriers) {
-      TempStream << "[9]: Encoding Size\n";
-      TempStream << "\n[1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    "
-                 << "[9]    Encodings:                    Instructions:\n";
-    } else {
-      TempStream << "[7]: Encoding Size\n";
-      TempStream << "\n[1]    [2]    [3]    [4]    [5]    [6]    [7]    "
-                 << "Encodings:                    Instructions:\n";
-    }
+    Paddings.push_back(LastPadding + 7);
+    Paddings.push_back(LastPadding + 14);
+    Paddings.push_back(LastPadding + 44);
+    LastPadding += 44;
+    Fields.push_back("Encoding Size");
+    EndFields.push_back("Encodings:");
+    EndFields.push_back("Instructions:");
   } else {
-    if (PrintBarriers) {
-      TempStream << "\n[1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    "
-                 << "Instructions:\n";
+    if (PrintFullInfo) {
+      Paddings.push_back(LastPadding + 27);
+      LastPadding += 27;
     } else {
-      TempStream << "\n[1]    [2]    [3]    [4]    [5]    [6]    "
-                 << "Instructions:\n";
+      Paddings.push_back(LastPadding + 7);
+      LastPadding += 7;
     }
+    EndFields.push_back("Instructions:");
   }
 
-  for (const auto &[Index, IIVDEntry, Inst] : enumerate(IIVD, Source)) {
-    TempStream << ' ' << IIVDEntry.NumMicroOpcodes << "    ";
-    if (IIVDEntry.NumMicroOpcodes < 10)
-      TempStream << "  ";
-    else if (IIVDEntry.NumMicroOpcodes < 100)
-      TempStream << ' ';
-    TempStream << IIVDEntry.Latency << "   ";
-    if (IIVDEntry.Latency < 10)
-      TempStream << "  ";
-    else if (IIVDEntry.Latency < 100)
-      TempStream << ' ';
+  FOS << "\n\nInstruction Info:\n";
+  for (unsigned i = 0, N = Fields.size(); i < N; i++) {
+    FOS << "[" << i + 1 << "]: " << Fields[i] << "\n";
+  }
+  FOS << "\n";
 
+  for (unsigned i = 0, N = Paddings.size(); i < N; i++) {
+    if (Paddings[i])
+      FOS.PadToColumn(Paddings[i]);
+    if (i < Fields.size())
+      FOS << "[" << i + 1 << "]";
+    else
+      FOS << EndFields[i - Fields.size()];
+  }
+  FOS << "\n";
+
+  for (const auto &[Index, IIVDEntry, Inst] : enumerate(IIVD, Source)) {
+    FOS.PadToColumn(Paddings[0] + 1);
+    FOS << IIVDEntry.NumMicroOpcodes;
+    FOS.PadToColumn(Paddings[1] + 1);
+    FOS << IIVDEntry.Latency;
+    FOS.PadToColumn(Paddings[2]);
     if (IIVDEntry.RThroughput) {
       double RT = *IIVDEntry.RThroughput;
-      TempStream << format("%.2f", RT) << ' ';
-      if (RT < 10.0)
-        TempStream << "  ";
-      else if (RT < 100.0)
-        TempStream << ' ';
+      FOS << format("%.2f", RT);
     } else {
-      TempStream << " -     ";
+      FOS << " -";
+    }
+    FOS.PadToColumn(Paddings[3] + 1);
+    FOS << (IIVDEntry.mayLoad ? "*" : " ");
+    FOS.PadToColumn(Paddings[4] + 1);
+    FOS << (IIVDEntry.mayStore ? "*" : " ");
+    FOS.PadToColumn(Paddings[5] + 1);
+    FOS << (IIVDEntry.hasUnmodeledSideEffects ? "U" : " ");
+    unsigned LastPaddingIdx = 5;
+
+    if (PrintFullInfo) {
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 1] + 1);
+      FOS << IIVDEntry.Bypass;
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 2] + 1);
+      FOS << IIVDEntry.Resources;
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 3] + 1);
+      FOS << IIVDEntry.OpcodeName;
+      LastPaddingIdx += 3;
     }
-    TempStream << (IIVDEntry.mayLoad ? " *     " : "       ");
-    TempStream << (IIVDEntry.mayStore ? " *     " : "       ");
-    TempStream << (IIVDEntry.hasUnmodeledSideEffects ? " U     " : "       ");
 
     if (PrintBarriers) {
-      TempStream << (LoweredInsts[Index]->isALoadBarrier() ? " *     "
-                                                           : "       ");
-      TempStream << (LoweredInsts[Index]->isAStoreBarrier() ? " *     "
-                                                            : "       ");
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 1] + 1);
+      FOS << (LoweredInsts[Index]->isALoadBarrier() ? "*" : " ");
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 2] + 1);
+      FOS << (LoweredInsts[Index]->isAStoreBarrier() ? "*" : " ");
+      LastPaddingIdx += 2;
     }
 
     if (PrintEncodings) {
       StringRef Encoding(CE.getEncoding(Index));
       unsigned EncodingSize = Encoding.size();
-      TempStream << " " << EncodingSize
-                 << (EncodingSize < 10 ? "     " : "    ");
-      TempStream.flush();
-      formatted_raw_ostream FOS(TempStream);
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 1] + 1);
+      FOS << EncodingSize;
+      FOS.PadToColumn(Paddings[LastPaddingIdx + 2]);
       for (unsigned i = 0, e = Encoding.size(); i != e; ++i)
         FOS << format("%02x ", (uint8_t)Encoding[i]);
-      FOS.PadToColumn(30);
-      FOS.flush();
+      LastPaddingIdx += 2;
     }
-
-    TempStream << printInstructionString(Inst) << '\n';
+    FOS.PadToColumn(Paddings[LastPaddingIdx + 1]);
+    FOS << printInstructionString(Inst);
+    if (PrintFullInfo) {
+      std::string CommentString;
+      getComment(Inst, CommentString);
+      FOS << "\t" << CommentString;
+    }
+    FOS << '\n';
   }
 
-  TempStream.flush();
+  FOS.flush();
----------------
mshockwave wrote:

I don't think you addressed my previous comment on this line.

https://github.com/llvm/llvm-project/pull/130574