fix an overly conservative caching issue that caused memdep to

[oota-llvm.git] / lib / CodeGen / ExactHazardRecognizer.cpp

diff --git a/lib/CodeGen/ExactHazardRecognizer.cpp b/lib/CodeGen/ExactHazardRecognizer.cpp
index 057d7ef6b926aaff867858278912dae5978296cd..36925b1ff375afced57867b0d20d849be95daa91 100644 (file)
--- a/lib/CodeGen/ExactHazardRecognizer.cpp
+++ b/lib/CodeGen/ExactHazardRecognizer.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define DEBUG_TYPE "exact-hazards"
+#define DEBUG_TYPE "post-RA-sched"
 #include "ExactHazardRecognizer.h"
 #include "llvm/CodeGen/ScheduleHazardRecognizer.h"
 #include "llvm/Support/Debug.h"
@@ -22,7 +22,8 @@
 
 using namespace llvm;
 
-ExactHazardRecognizer::ExactHazardRecognizer(const InstrItineraryData &LItinData) :
+ExactHazardRecognizer::
+ExactHazardRecognizer(const InstrItineraryData &LItinData) :
   ScheduleHazardRecognizer(), ItinData(LItinData) 
 {
   // Determine the maximum depth of any itinerary. This determines the
@@ -31,13 +32,11 @@ ExactHazardRecognizer::ExactHazardRecognizer(const InstrItineraryData &LItinData
   ScoreboardDepth = 1;
   if (!ItinData.isEmpty()) {
     for (unsigned idx = 0; ; ++idx) {
-      // If the begin stage of an itinerary has 0 cycles and units,
-      // then we have reached the end of the itineraries.
-      const InstrStage *IS = ItinData.beginStage(idx);
-      const InstrStage *E = ItinData.endStage(idx);
-      if ((IS->getCycles() == 0) && (IS->getUnits() == 0))
+      if (ItinData.isEndMarker(idx))
         break;
 
+      const InstrStage *IS = ItinData.beginStage(idx);
+      const InstrStage *E = ItinData.endStage(idx);
       unsigned ItinDepth = 0;
       for (; IS != E; ++IS)
         ItinDepth += IS->getCycles();
@@ -83,75 +82,77 @@ void ExactHazardRecognizer::dumpScoreboard() {
 }
 
 ExactHazardRecognizer::HazardType ExactHazardRecognizer::getHazardType(SUnit *SU) {
-  if (!ItinData.isEmpty()) {
-    unsigned cycle = 0;
-
-    // Use the itinerary for the underlying instruction to check for
-    // free FU's in the scoreboard at the appropriate future cycles.
-    unsigned idx = SU->getInstr()->getDesc().getSchedClass();
-    for (const InstrStage *IS = ItinData.beginStage(idx),
-           *E = ItinData.endStage(idx); IS != E; ++IS) {
-      // We must find one of the stage's units free for every cycle the
-      // stage is occupied. FIXME it would be more accurate to find the
-      // same unit free in all the cycles.
-      for (unsigned int i = 0; i < IS->getCycles(); ++i) {
-        assert(((cycle + i) < ScoreboardDepth) && 
-               "Scoreboard depth exceeded!");
-        
-        unsigned index = getFutureIndex(cycle + i);
-        unsigned freeUnits = IS->getUnits() & ~Scoreboard[index];
-        if (!freeUnits) {
-          DEBUG(errs() << "*** Hazard in cycle " << (cycle + i) << ", ");
-          DEBUG(errs() << "SU(" << SU->NodeNum << "): ");
-          DEBUG(SU->getInstr()->dump());
-          return Hazard;
-        }
-      }
+  if (ItinData.isEmpty())
+    return NoHazard;
+
+  unsigned cycle = 0;
+
+  // Use the itinerary for the underlying instruction to check for
+  // free FU's in the scoreboard at the appropriate future cycles.
+  unsigned idx = SU->getInstr()->getDesc().getSchedClass();
+  for (const InstrStage *IS = ItinData.beginStage(idx),
+         *E = ItinData.endStage(idx); IS != E; ++IS) {
+    // We must find one of the stage's units free for every cycle the
+    // stage is occupied. FIXME it would be more accurate to find the
+    // same unit free in all the cycles.
+    for (unsigned int i = 0; i < IS->getCycles(); ++i) {
+      assert(((cycle + i) < ScoreboardDepth) && 
+             "Scoreboard depth exceeded!");
       
-      // Advance the cycle to the next stage.
-      cycle += IS->getNextCycles();
+      unsigned index = getFutureIndex(cycle + i);
+      unsigned freeUnits = IS->getUnits() & ~Scoreboard[index];
+      if (!freeUnits) {
+        DEBUG(errs() << "*** Hazard in cycle " << (cycle + i) << ", ");
+        DEBUG(errs() << "SU(" << SU->NodeNum << "): ");
+        DEBUG(SU->getInstr()->dump());
+        return Hazard;
+      }
     }
+    
+    // Advance the cycle to the next stage.
+    cycle += IS->getNextCycles();
   }
 
   return NoHazard;
 }
     
 void ExactHazardRecognizer::EmitInstruction(SUnit *SU) {
-  if (!ItinData.isEmpty()) {
-    unsigned cycle = 0;
-
-    // Use the itinerary for the underlying instruction to reserve FU's
-    // in the scoreboard at the appropriate future cycles.
-    unsigned idx = SU->getInstr()->getDesc().getSchedClass();
-    for (const InstrStage *IS = ItinData.beginStage(idx), 
-           *E = ItinData.endStage(idx); IS != E; ++IS) {
-      // We must reserve one of the stage's units for every cycle the
-      // stage is occupied. FIXME it would be more accurate to reserve
-      // the same unit free in all the cycles.
-      for (unsigned int i = 0; i < IS->getCycles(); ++i) {
-        assert(((cycle + i) < ScoreboardDepth) &&
-               "Scoreboard depth exceeded!");
-        
-        unsigned index = getFutureIndex(cycle + i);
-        unsigned freeUnits = IS->getUnits() & ~Scoreboard[index];
-        
-        // reduce to a single unit
-        unsigned freeUnit = 0;
-        do {
-          freeUnit = freeUnits;
-          freeUnits = freeUnit & (freeUnit - 1);
-        } while (freeUnits);
-        
-        assert(freeUnit && "No function unit available!");
-        Scoreboard[index] |= freeUnit;
-      }
-
-      // Advance the cycle to the next stage.
-      cycle += IS->getNextCycles();
+  if (ItinData.isEmpty())
+    return;
+
+  unsigned cycle = 0;
+
+  // Use the itinerary for the underlying instruction to reserve FU's
+  // in the scoreboard at the appropriate future cycles.
+  unsigned idx = SU->getInstr()->getDesc().getSchedClass();
+  for (const InstrStage *IS = ItinData.beginStage(idx), 
+         *E = ItinData.endStage(idx); IS != E; ++IS) {
+    // We must reserve one of the stage's units for every cycle the
+    // stage is occupied. FIXME it would be more accurate to reserve
+    // the same unit free in all the cycles.
+    for (unsigned int i = 0; i < IS->getCycles(); ++i) {
+      assert(((cycle + i) < ScoreboardDepth) &&
+             "Scoreboard depth exceeded!");
+      
+      unsigned index = getFutureIndex(cycle + i);
+      unsigned freeUnits = IS->getUnits() & ~Scoreboard[index];
+      
+      // reduce to a single unit
+      unsigned freeUnit = 0;
+      do {
+        freeUnit = freeUnits;
+        freeUnits = freeUnit & (freeUnit - 1);
+      } while (freeUnits);
+      
+      assert(freeUnit && "No function unit available!");
+      Scoreboard[index] |= freeUnit;
     }
-
-    DEBUG(dumpScoreboard());
+    
+    // Advance the cycle to the next stage.
+    cycle += IS->getNextCycles();
   }
+  
+  DEBUG(dumpScoreboard());
 }
     
 void ExactHazardRecognizer::AdvanceCycle() {