[llvm] r336367 - [llvm-mca] Fix RegisterFile debug prints. NFC

[Andrea Di Biagio via llvm-commits]

Author: adibiagio
Date: Thu Jul  5 09:13:49 2018
New Revision: 336367

URL: http://llvm.org/viewvc/llvm-project?rev=336367&view=rev
Log:
[llvm-mca] Fix RegisterFile debug prints. NFC

Modified:
    llvm/trunk/tools/llvm-mca/Instruction.cpp
    llvm/trunk/tools/llvm-mca/RegisterFile.cpp

Modified: llvm/trunk/tools/llvm-mca/Instruction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/Instruction.cpp?rev=336367&r1=336366&r2=336367&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/Instruction.cpp (original)
+++ llvm/trunk/tools/llvm-mca/Instruction.cpp Thu Jul  5 09:13:49 2018
@@ -94,10 +94,11 @@ void ReadState::cycleEvent() {
 #ifndef NDEBUG
 void WriteState::dump() const {
   dbgs() << "{ OpIdx=" << WD.OpIndex << ", Lat=" << WD.Latency << ", RegID "
-         << getRegisterID() << ", Cycles Left=" << getCyclesLeft() << " }\n";
+         << getRegisterID() << ", Cycles Left=" << getCyclesLeft() << " }";
 }
 
 void WriteRef::dump() const {
+  dbgs() << "IID=" << getSourceIndex() << ' ';
   if (isValid())
     getWriteState()->dump();
   else

Modified: llvm/trunk/tools/llvm-mca/RegisterFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/RegisterFile.cpp?rev=336367&r1=336366&r2=336367&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/RegisterFile.cpp (original)
+++ llvm/trunk/tools/llvm-mca/RegisterFile.cpp Thu Jul  5 09:13:49 2018
@@ -215,7 +215,7 @@ void RegisterFile::collectWrites(SmallVe
       const WriteState &WS = *WR.getWriteState();
       dbgs() << "Found a dependent use of Register "
              << MRI.getName(WS.getRegisterID()) << " (defined by intruction #"
-             << WR.getSourceIndex() << '\n';
+             << WR.getSourceIndex() << ")\n";
     }
   });
 }
@@ -264,9 +264,14 @@ unsigned RegisterFile::isAvailable(Array
 void RegisterFile::dump() const {
   for (unsigned I = 0, E = MRI.getNumRegs(); I < E; ++I) {
     const RegisterMapping &RM = RegisterMappings[I];
-    dbgs() << MRI.getName(I) << ", " << I << ", Map=" << RM.second.first
+    if (!RM.first.getWriteState())
+      continue;
+    const std::pair<unsigned, unsigned> &IndexPlusCost = RM.second;
+    dbgs() << MRI.getName(I) << ", " << I << ", PRF=" << IndexPlusCost.first
+           << ", Cost=" << IndexPlusCost.second 
            << ", ";
     RM.first.dump();
+    dbgs() << '\n';
   }
 
   for (unsigned I = 0, E = getNumRegisterFiles(); I < E; ++I) {