ElectricFence found this bug where we were reading past the vector boundary.

[oota-llvm.git] / lib / Target / TargetSchedInfo.cpp

diff --git a/lib/Target/TargetSchedInfo.cpp b/lib/Target/TargetSchedInfo.cpp
index 6a3c9c717b23c918495822add67aa8461a324732..a52f7886d3086627a5615a6f16f550110efec161 100644 (file)
--- a/lib/Target/TargetSchedInfo.cpp
+++ b/lib/Target/TargetSchedInfo.cpp
@@ -5,15 +5,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Target/MachineSchedInfo.h"
+#include "llvm/Target/TargetSchedInfo.h"
 #include "llvm/Target/TargetMachine.h"
 
-// External object describing the machine instructions
-// Initialized only when the TargetMachine class is created
-// and reset when that class is destroyed.
-// 
-const MachineInstrDescriptor* TargetInstrDescriptors = 0;
-
 resourceId_t MachineResource::nextId = 0;
 
 // Check if fromRVec and toRVec have *any* common entries.
@@ -75,17 +69,17 @@ ComputeMinGap(const InstrRUsage &fromRU,
 
 
 //---------------------------------------------------------------------------
-// class MachineSchedInfo
+// class TargetSchedInfo
 //     Interface to machine description for instruction scheduling
 //---------------------------------------------------------------------------
 
-MachineSchedInfo::MachineSchedInfo(const TargetMachine&    tgt,
-                                   int                     NumSchedClasses,
-                                   const InstrClassRUsage* ClassRUsages,
-                                   const InstrRUsageDelta* UsageDeltas,
-                                   const InstrIssueDelta*  IssueDeltas,
-                                   unsigned int                   NumUsageDeltas,
-                                   unsigned int                   NumIssueDeltas)
+TargetSchedInfo::TargetSchedInfo(const TargetMachine&    tgt,
+                                 int                     NumSchedClasses,
+                                 const InstrClassRUsage* ClassRUsages,
+                                 const InstrRUsageDelta* UsageDeltas,
+                                 const InstrIssueDelta*  IssueDeltas,
+                                 unsigned NumUsageDeltas,
+                                 unsigned NumIssueDeltas)
   : target(tgt),
     numSchedClasses(NumSchedClasses), mii(& tgt.getInstrInfo()),
     classRUsages(ClassRUsages), usageDeltas(UsageDeltas),
@@ -94,7 +88,7 @@ MachineSchedInfo::MachineSchedInfo(const TargetMachine&    tgt,
 {}
 
 void
-MachineSchedInfo::initializeResources()
+TargetSchedInfo::initializeResources()
 {
   assert(MAX_NUM_SLOTS >= (int)getMaxNumIssueTotal()
         && "Insufficient slots for static data! Increase MAX_NUM_SLOTS");
@@ -117,7 +111,7 @@ MachineSchedInfo::initializeResources()
 
 
 void
-MachineSchedInfo::computeInstrResources(const std::vector<InstrRUsage>&
+TargetSchedInfo::computeInstrResources(const std::vector<InstrRUsage>&
                                        instrRUForClasses)
 {
   int numOpCodes =  mii->getNumRealOpCodes();
@@ -126,7 +120,7 @@ MachineSchedInfo::computeInstrResources(const std::vector<InstrRUsage>&
   // First get the resource usage information from the class resource usages.
   for (MachineOpCode op = 0; op < numOpCodes; ++op) {
     InstrSchedClass sc = getSchedClass(op);
-    assert(sc >= 0 && sc < numSchedClasses);
+    assert(sc < numSchedClasses);
     instrRUsages[op] = instrRUForClasses[sc];
   }
   
@@ -147,15 +141,16 @@ MachineSchedInfo::computeInstrResources(const std::vector<InstrRUsage>&
 
 
 void
-MachineSchedInfo::computeIssueGaps(const std::vector<InstrRUsage>&
+TargetSchedInfo::computeIssueGaps(const std::vector<InstrRUsage>&
                                   instrRUForClasses)
 {
   int numOpCodes =  mii->getNumRealOpCodes();
-  instrRUsages.resize(numOpCodes);
-  
+  issueGaps.resize(numOpCodes);
+  conflictLists.resize(numOpCodes);
+
   assert(numOpCodes < (1 << MAX_OPCODE_SIZE) - 1
          && "numOpCodes invalid for implementation of class OpCodePair!");
-  
+
   // First, compute issue gaps between pairs of classes based on common
   // resources usages for each class, because most instruction pairs will
   // usually behave the same as their class.
@@ -168,27 +163,27 @@ MachineSchedInfo::computeIssueGaps(const std::vector<InstrRUsage>&
                                         instrRUForClasses[toSC]);
        classPairGaps[fromSC][toSC] = classPairGap; 
       }
-  
+
   // Now, for each pair of instructions, use the class pair gap if both
   // instructions have identical resource usage as their respective classes.
   // If not, recompute the gap for the pair from scratch.
-  
+
   longestIssueConflict = 0;
-  
+
   for (MachineOpCode fromOp=0; fromOp < numOpCodes; fromOp++)
     for (MachineOpCode toOp=0; toOp < numOpCodes; toOp++)
       {
-       int instrPairGap = 
-         (instrRUsages[fromOp].sameAsClass && instrRUsages[toOp].sameAsClass)
-         ? classPairGaps[getSchedClass(fromOp)][getSchedClass(toOp)]
-         : ComputeMinGap(instrRUsages[fromOp], instrRUsages[toOp]);
-      
-       if (instrPairGap > 0)
-         {
-           issueGaps[OpCodePair(fromOp,toOp)] = instrPairGap;
-           conflictLists[fromOp].push_back(toOp);
-           longestIssueConflict = std::max(longestIssueConflict, instrPairGap);
-         }
+        int instrPairGap = 
+          (instrRUsages[fromOp].sameAsClass && instrRUsages[toOp].sameAsClass)
+          ? classPairGaps[getSchedClass(fromOp)][getSchedClass(toOp)]
+          : ComputeMinGap(instrRUsages[fromOp], instrRUsages[toOp]);
+
+        if (instrPairGap > 0)
+          {
+            this->setGap(instrPairGap, fromOp, toOp);
+            conflictLists[fromOp].push_back(toOp);
+            longestIssueConflict=std::max(longestIssueConflict, instrPairGap);
+          }
       }
 }
 
@@ -248,7 +243,7 @@ void InstrRUsage::addUsageDelta(const InstrRUsageDelta &delta) {
        // for that resource in each cycle.
        std::vector<resourceId_t>& rvec = this->resourcesByCycle[c];
        int r;
-       for (r = (int) rvec.size(); r >= 0; r--)
+       for (r = rvec.size() - 1; r >= 0; r--)
          if (rvec[r] == delta.resourceId)
            {// found last entry for the resource
              rvec.erase(rvec.begin() + r);