Add APFloat interface to ConstantFPSDNode. Change

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

diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp
index 63a80fd16eaf2bd32f6a205585fb7606bf37535a..9697d43bb4d763e671056f57185f46fd2eace488 100644 (file)
--- a/lib/CodeGen/LiveInterval.cpp
+++ b/lib/CodeGen/LiveInterval.cpp
@@ -109,6 +109,7 @@ bool LiveInterval::overlapsFrom(const LiveInterval& other,
 void LiveInterval::extendIntervalEndTo(Ranges::iterator I, unsigned NewEnd) {
   assert(I != ranges.end() && "Not a valid interval!");
   unsigned ValId = I->ValId;
+  unsigned OldEnd = I->end;
 
   // Search for the first interval that we can't merge with.
   Ranges::iterator MergeTo = next(I);
@@ -121,7 +122,10 @@ void LiveInterval::extendIntervalEndTo(Ranges::iterator I, unsigned NewEnd) {
 
   // Erase any dead ranges.
   ranges.erase(next(I), MergeTo);
-  
+
+  // Update kill info.
+  removeKillForValNum(ValId, OldEnd, I->end-1);
+
   // If the newly formed range now touches the range after it and if they have
   // the same value number, merge the two ranges into one range.
   Ranges::iterator Next = next(I);
@@ -228,9 +232,10 @@ void LiveInterval::removeRange(unsigned Start, unsigned End) {
 
   // If the span we are removing is at the start of the LiveRange, adjust it.
   if (I->start == Start) {
-    if (I->end == End)
+    if (I->end == End) {
+      removeKillForValNum(I->ValId, Start, End);
       ranges.erase(I);  // Removed the whole LiveRange.
-    else
+    } else
       I->start = End;
     return;
   }
@@ -238,6 +243,7 @@ void LiveInterval::removeRange(unsigned Start, unsigned End) {
   // Otherwise if the span we are removing is at the end of the LiveRange,
   // adjust the other way.
   if (I->end == End) {
+    removeKillForValNum(I->ValId, Start, End);
     I->end = Start;
     return;
   }
@@ -281,8 +287,7 @@ LiveInterval::FindLiveRangeContaining(unsigned Idx) {
 /// the intervals are not joinable, this aborts.
 void LiveInterval::join(LiveInterval &Other, int *LHSValNoAssignments,
                         int *RHSValNoAssignments, 
-                        SmallVector<std::pair<unsigned, 
-                                           unsigned>, 16> &NewValueNumberInfo) {
+                        SmallVector<VNInfo, 16> &NewValueNumberInfo) {
   
   // Try to do the least amount of work possible.  In particular, if there are
   // more liverange chunks in the other set than there are in the 'this' set,
@@ -301,7 +306,7 @@ void LiveInterval::join(LiveInterval &Other, int *LHSValNoAssignments,
   // we want to avoid the interval scan if not.
   bool MustMapCurValNos = false;
   for (unsigned i = 0, e = getNumValNums(); i != e; ++i) {
-    if (ValueNumberInfo[i].first == ~2U) continue;  // tombstone value #
+    if (ValueNumberInfo[i].def == ~1U) continue;  // tombstone value #
     if (i != (unsigned)LHSValNoAssignments[i]) {
       MustMapCurValNos = true;
       break;
@@ -337,7 +342,11 @@ void LiveInterval::join(LiveInterval &Other, int *LHSValNoAssignments,
     // If we merge some live ranges, chop off the end.
     ranges.erase(OutIt, end());
   }
-  
+
+  // Update val# info first. Increasing live ranges may invalidate some kills.
+  ValueNumberInfo.clear();
+  ValueNumberInfo.append(NewValueNumberInfo.begin(), NewValueNumberInfo.end());
+
   // Okay, now insert the RHS live ranges into the LHS.
   iterator InsertPos = begin();
   for (iterator I = Other.begin(), E = Other.end(); I != E; ++I) {
@@ -346,9 +355,9 @@ void LiveInterval::join(LiveInterval &Other, int *LHSValNoAssignments,
     InsertPos = addRangeFrom(*I, InsertPos);
   }
 
-  ValueNumberInfo.clear();
-  ValueNumberInfo.append(NewValueNumberInfo.begin(), NewValueNumberInfo.end());
   weight += Other.weight;
+  if (Other.preference && !preference)
+    preference = Other.preference;
 }
 
 /// MergeRangesInAsValue - Merge all of the intervals in RHS into this live
@@ -416,7 +425,7 @@ void LiveInterval::MergeValueNumberInto(unsigned V1, unsigned V2) {
 
   // Make sure V2 is smaller than V1.
   if (V1 < V2) {
-    setValueNumberInfo(V1, getValNumInfo(V2));
+    copyValNumInfo(V1, V2);
     std::swap(V1, V2);
   }
 
@@ -461,12 +470,19 @@ void LiveInterval::MergeValueNumberInto(unsigned V1, unsigned V2) {
   if (V1 == getNumValNums()-1) {
     do {
       ValueNumberInfo.pop_back();
-    } while (ValueNumberInfo.back().first == ~1U);
+    } while (ValueNumberInfo.back().def == ~1U);
   } else {
-    ValueNumberInfo[V1].first = ~1U;
+    ValueNumberInfo[V1].def = ~1U;
   }
 }
 
+unsigned LiveInterval::getSize() const {
+  unsigned Sum = 0;
+  for (const_iterator I = begin(), E = end(); I != E; ++I)
+    Sum += I->end - I->start;
+  return Sum;
+}
+
 std::ostream& llvm::operator<<(std::ostream& os, const LiveRange &LR) {
   return os << '[' << LR.start << ',' << LR.end << ':' << LR.ValId << ")";
 }
@@ -475,7 +491,7 @@ void LiveRange::dump() const {
   cerr << *this << "\n";
 }
 
-void LiveInterval::print(OStream OS, const MRegisterInfo *MRI) const {
+void LiveInterval::print(std::ostream &OS, const MRegisterInfo *MRI) const {
   if (MRI && MRegisterInfo::isPhysicalRegister(reg))
     OS << MRI->getName(reg);
   else
@@ -498,10 +514,23 @@ void LiveInterval::print(OStream OS, const MRegisterInfo *MRI) const {
     for (unsigned i = 0; i != getNumValNums(); ++i) {
       if (i) OS << " ";
       OS << i << "@";
-      if (ValueNumberInfo[i].first == ~0U) {
-        OS << "?";
+      if (ValueNumberInfo[i].def == ~1U) {
+        OS << "x";
       } else {
-        OS << ValueNumberInfo[i].first;
+        if (ValueNumberInfo[i].def == ~0U)
+          OS << "?";
+        else
+          OS << ValueNumberInfo[i].def;
+        unsigned e = ValueNumberInfo[i].kills.size();
+        if (e) {
+          OS << "-(";
+          for (unsigned j = 0; j != e; ++j) {
+            OS << ValueNumberInfo[i].kills[j];
+            if (j != e-1)
+              OS << " ";
+          }
+          OS << ")";
+        }
       }
     }
   }