From fa2d16f4abc02740ec0790f64fd35f813b86f773 Mon Sep 17 00:00:00 2001
From: Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net>
Date: Thu, 5 Jul 2018 16:13:49 +0000
Subject: [PATCH] [llvm-mca] Fix RegisterFile debug prints. NFC

llvm-svn: 336367
---
 llvm/tools/llvm-mca/Instruction.cpp  | 3 ++-
 llvm/tools/llvm-mca/RegisterFile.cpp | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/llvm/tools/llvm-mca/Instruction.cpp b/llvm/tools/llvm-mca/Instruction.cpp
index c8eb63f..dbf2d5f 100644
--- a/llvm/tools/llvm-mca/Instruction.cpp
+++ b/llvm/tools/llvm-mca/Instruction.cpp
@@ -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
diff --git a/llvm/tools/llvm-mca/RegisterFile.cpp b/llvm/tools/llvm-mca/RegisterFile.cpp
index 427b32a..502807e 100644
--- a/llvm/tools/llvm-mca/RegisterFile.cpp
+++ b/llvm/tools/llvm-mca/RegisterFile.cpp
@@ -215,7 +215,7 @@ void RegisterFile::collectWrites(SmallVectorImpl<WriteRef> &Writes,
       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(ArrayRef<unsigned> Regs) const {
 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) {
-- 
2.7.4