[llvm-commits] [llvm] r78634 - in /llvm/trunk/lib/CodeGen: ExactHazardRecognizer.cpp PostRASchedulerList.cpp

[David Goodwin]

Author: david_goodwin
Date: Mon Aug 10 20:44:26 2009
New Revision: 78634

URL: http://llvm.org/viewvc/llvm-project?rev=78634&view=rev
Log:
Replace DOUT.

Modified:
    llvm/trunk/lib/CodeGen/ExactHazardRecognizer.cpp
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp

Modified: llvm/trunk/lib/CodeGen/ExactHazardRecognizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ExactHazardRecognizer.cpp?rev=78634&r1=78633&r2=78634&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ExactHazardRecognizer.cpp (original)
+++ llvm/trunk/lib/CodeGen/ExactHazardRecognizer.cpp Mon Aug 10 20:44:26 2009
@@ -17,6 +17,7 @@
 #include "llvm/CodeGen/ScheduleHazardRecognizer.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetInstrItineraries.h"
 
 namespace llvm {
@@ -47,8 +48,8 @@
   Scoreboard = new unsigned[ScoreboardDepth];
   ScoreboardHead = 0;
 
-  DOUT << "Using exact hazard recognizer: ScoreboardDepth = " 
-       << ScoreboardDepth << '\n';
+  DEBUG(errs() << "Using exact hazard recognizer: ScoreboardDepth = " 
+        << ScoreboardDepth << '\n');
 }
 
 ExactHazardRecognizer::~ExactHazardRecognizer() {
@@ -65,7 +66,7 @@
 }
 
 void ExactHazardRecognizer::dumpScoreboard() {
-  DOUT << "Scoreboard:\n";
+  DEBUG(errs() << "Scoreboard:\n");
   
   unsigned last = ScoreboardDepth - 1;
   while ((last > 0) && (Scoreboard[getFutureIndex(last)] == 0))
@@ -73,10 +74,10 @@
 
   for (unsigned i = 0; i <= last; i++) {
     unsigned FUs = Scoreboard[getFutureIndex(i)];
-    DOUT << "\t";
+    DEBUG(errs() << "\t");
     for (int j = 31; j >= 0; j--)
-      DOUT << ((FUs & (1 << j)) ? '1' : '0');
-    DOUT << '\n';
+      DEBUG(errs() << ((FUs & (1 << j)) ? '1' : '0'));
+    DEBUG(errs() << '\n');
   }
 }
 
@@ -96,8 +97,8 @@
       unsigned index = getFutureIndex(cycle);
       unsigned freeUnits = IS->Units & ~Scoreboard[index];
       if (!freeUnits) {
-        DOUT << "*** Hazard in cycle " << cycle << ", ";
-        DOUT << "SU(" << SU->NodeNum << "): ";
+        DEBUG(errs() << "*** Hazard in cycle " << cycle << ", ");
+        DEBUG(errs() << "SU(" << SU->NodeNum << "): ");
         DEBUG(SU->getInstr()->dump());
         return Hazard;
       }

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=78634&r1=78633&r2=78634&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Mon Aug 10 20:44:26 2009
@@ -37,6 +37,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/Statistic.h"
 #include <map>
 using namespace llvm;
@@ -183,7 +184,7 @@
 }
 
 bool PostRAScheduler::runOnMachineFunction(MachineFunction &Fn) {
-  DOUT << "PostRAScheduler\n";
+  DEBUG(errs() << "PostRAScheduler\n");
 
   const MachineLoopInfo &MLI = getAnalysis<MachineLoopInfo>();
   const MachineDominatorTree &MDT = getAnalysis<MachineDominatorTree>();
@@ -310,7 +311,7 @@
 /// Schedule - Schedule the instruction range using list scheduling.
 ///
 void SchedulePostRATDList::Schedule() {
-  DOUT << "********** List Scheduling **********\n";
+  DEBUG(errs() << "********** List Scheduling **********\n");
   
   // Build the scheduling graph.
   BuildSchedGraph();
@@ -525,8 +526,8 @@
       Max = SU;
   }
 
-  DOUT << "Critical path has total latency "
-       << (Max->getDepth() + Max->Latency) << "\n";
+  DEBUG(errs() << "Critical path has total latency "
+        << (Max->getDepth() + Max->Latency) << "\n");
 
   // Track progress along the critical path through the SUnit graph as we walk
   // the instructions.
@@ -691,10 +692,10 @@
         if (KillIndices[NewReg] == ~0u &&
             Classes[NewReg] != reinterpret_cast<TargetRegisterClass *>(-1) &&
             KillIndices[AntiDepReg] <= DefIndices[NewReg]) {
-          DOUT << "Breaking anti-dependence edge on "
-               << TRI->getName(AntiDepReg)
-               << " with " << RegRefs.count(AntiDepReg) << " references"
-               << " using " << TRI->getName(NewReg) << "!\n";
+          DEBUG(errs() << "Breaking anti-dependence edge on "
+                << TRI->getName(AntiDepReg)
+                << " with " << RegRefs.count(AntiDepReg) << " references"
+                << " using " << TRI->getName(NewReg) << "!\n");
 
           // Update the references to the old register to refer to the new
           // register.
@@ -777,7 +778,7 @@
 /// count of its successors. If a successor pending count is zero, add it to
 /// the Available queue.
 void SchedulePostRATDList::ScheduleNodeTopDown(SUnit *SU, unsigned CurCycle) {
-  DOUT << "*** Scheduling [" << CurCycle << "]: ";
+  DEBUG(errs() << "*** Scheduling [" << CurCycle << "]: ");
   DEBUG(SU->dump(this));
   
   Sequence.push_back(SU);
@@ -866,7 +867,7 @@
     } else if (!HasNoopHazards) {
       // Otherwise, we have a pipeline stall, but no other problem, just advance
       // the current cycle and try again.
-      DOUT << "*** Advancing cycle, no work to do\n";
+      DEBUG(errs() << "*** Advancing cycle, no work to do\n");
       HazardRec->AdvanceCycle();
       ++NumStalls;
       ++CurCycle;
@@ -874,7 +875,7 @@
       // Otherwise, we have no instructions to issue and we have instructions
       // that will fault if we don't do this right.  This is the case for
       // processors without pipeline interlocks and other cases.
-      DOUT << "*** Emitting noop\n";
+      DEBUG(errs() << "*** Emitting noop\n");
       HazardRec->EmitNoop();
       Sequence.push_back(0);   // NULL here means noop
       ++NumNoops;