Subzero: Clean up live range construction.

src/IceCfgNode.cpp

 //===- subzero/src/IceCfgNode.cpp - Basic block (node) implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the CfgNode class, including the complexities
@@ skipping 621 matching lines @@
   // Check result, set LiveIn=Live
   SizeT &PrevNumNonDeadPhis = Liveness->getNumNonDeadPhis(this);
   bool LiveInChanged = (Live != LiveIn);
   Changed = (NumNonDeadPhis != PrevNumNonDeadPhis || LiveInChanged);
   if (LiveInChanged)
     LiveIn = Live;
   PrevNumNonDeadPhis = NumNonDeadPhis;
   return Changed;
 }
 
-// Now that basic liveness is complete, remove dead instructions that
-// were tentatively marked as dead, and compute actual live ranges.
-// It is assumed that within a single basic block, a live range begins
-// at most once and ends at most once.  This is certainly true for
-// pure SSA form.  It is also true once phis are lowered, since each
+// Once basic liveness is complete, compute actual live ranges.  It is
+// assumed that within a single basic block, a live range begins at
+// most once and ends at most once.  This is certainly true for pure
+// SSA form.  It is also true once phis are lowered, since each
 // assignment to the phi-based temporary is in a different basic
 // block, and there is a single read that ends the live in the basic
 // block that contained the actual phi instruction.
-void CfgNode::livenessPostprocess(LivenessMode Mode, Liveness *Liveness) {
-  InstNumberT FirstInstNum = Inst::NumberSentinel;
-  InstNumberT LastInstNum = Inst::NumberSentinel;
-  // Process phis in any order.  Process only Dest operands.
-  for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
-    I->deleteIfDead();
-    if (I->isDeleted())
-      continue;
-    if (FirstInstNum == Inst::NumberSentinel)
-      FirstInstNum = I->getNumber();
-    assert(I->getNumber() > LastInstNum);
-    LastInstNum = I->getNumber();
-  }
-  // Process instructions
-  for (auto I = Insts.begin(), E = Insts.end(); I != E; ++I) {
-    I->deleteIfDead();
-    if (I->isDeleted())
-      continue;
-    if (FirstInstNum == Inst::NumberSentinel)
-      FirstInstNum = I->getNumber();
-    assert(I->getNumber() > LastInstNum);
-    LastInstNum = I->getNumber();
-  }
-  if (Mode != Liveness_Intervals)
-    return;
-  TimerMarker T1(TimerStack::TT_liveRangeCtor, Func);
+void CfgNode::livenessAddIntervals(Liveness *Liveness, InstNumberT FirstInstNum,
+                                   InstNumberT LastInstNum) {
+  TimerMarker T1(TimerStack::TT_liveRange, Func);
 
   SizeT NumVars = Liveness->getNumVarsInNode(this);
   LivenessBV &LiveIn = Liveness->getLiveIn(this);
   LivenessBV &LiveOut = Liveness->getLiveOut(this);
   LiveBeginEndMap &MapBegin = *Liveness->getLiveBegin(this);
   LiveBeginEndMap &MapEnd = *Liveness->getLiveEnd(this);
   std::sort(MapBegin.begin(), MapBegin.end());
   std::sort(MapEnd.begin(), MapEnd.end());
   // Verify there are no duplicates.
   struct ComparePair {
@@ skipping 327 matching lines @@
       if (!First)
         Str << ", ";
       First = false;
       Str << "%" << I->getName();
     }
     Str << "\n";
   }
 }
 
 } // end of namespace Ice