Subzero: Rewrite the pass timing infrastructure.

src/IceCfg.cpp

 //===- subzero/src/IceCfg.cpp - Control flow graph 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 Cfg class, including constant pool
@@ skipping 51 matching lines @@
   ImplicitArgs.push_back(Arg);
 }
 
 // Returns whether the stack frame layout has been computed yet.  This
 // is used for dumping the stack frame location of Variables.
 bool Cfg::hasComputedFrame() const { return getTarget()->hasComputedFrame(); }
 
 void Cfg::translate() {
   if (hasError())
     return;
+  TimerMarker T("translate", getContext());
 
   dump("Initial CFG");
 
-  Timer T_translate;
   // The set of translation passes and their order are determined by
   // the target.
   getTarget()->translate();
-  T_translate.printElapsedUs(getContext(), "translate()");
 
   dump("Final output");
 }
 
 void Cfg::computePredecessors() {
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->computePredecessors();
   }
 }
 
 void Cfg::renumberInstructions() {
+  TimerMarker T("renumberInstructions", getContext());
   NextInstNumber = 1;
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->renumberInstructions();
   }
 }
 
 // placePhiLoads() must be called before placePhiStores().
 void Cfg::placePhiLoads() {
+  TimerMarker T("placePhiLoads", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->placePhiLoads();
   }
 }
 
 // placePhiStores() must be called after placePhiLoads().
 void Cfg::placePhiStores() {
+  TimerMarker T("placePhiStores", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->placePhiStores();
   }
 }
 
 void Cfg::deletePhis() {
+  TimerMarker T("deletePhis", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->deletePhis();
   }
 }
 
 void Cfg::doArgLowering() {
+  TimerMarker T("doArgLowering", getContext());
   getTarget()->lowerArguments();
 }
 
 void Cfg::doAddressOpt() {
+  TimerMarker T("doAddressOpt", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->doAddressOpt();
   }
 }
 
 void Cfg::doNopInsertion() {
+  TimerMarker T("doNopInsertion", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->doNopInsertion();
   }
 }
 
 void Cfg::genCode() {
+  TimerMarker T("genCode", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->genCode();
   }
 }
 
 // Compute the stack frame layout.
 void Cfg::genFrame() {
+  TimerMarker T("genFrame", getContext());
   getTarget()->addProlog(Entry);
   // TODO: Consider folding epilog generation into the final
   // emission/assembly pass to avoid an extra iteration over the node
   // list.  Or keep a separate list of exit nodes.
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     CfgNode *Node = *I;
     if (Node->getHasReturn())
       getTarget()->addEpilog(Node);
   }
 }
 
 // This is a lightweight version of live-range-end calculation.  Marks
 // the last use of only those variables whose definition and uses are
 // completely with a single block.  It is a quick single pass and
 // doesn't need to iterate until convergence.
 void Cfg::livenessLightweight() {
+  TimerMarker T("livenessLightweight", getContext());
   getVMetadata()->init();
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->livenessLightweight();
   }
 }
 
 void Cfg::liveness(LivenessMode Mode) {
+  TimerMarker T("liveness", getContext());
   Live.reset(new Liveness(this, Mode));
   getVMetadata()->init();
   Live->init();
   // Initialize with all nodes needing to be processed.
   llvm::BitVector NeedToProcess(Nodes.size(), true);
   while (NeedToProcess.any()) {
     // Iterate in reverse topological order to speed up convergence.
     for (NodeList::reverse_iterator I = Nodes.rbegin(), E = Nodes.rend();
          I != E; ++I) {
       CfgNode *Node = *I;
@@ skipping 18 matching lines @@
     // Reset each variable's live range.
     for (VarList::const_iterator I = Variables.begin(), E = Variables.end();
          I != E; ++I) {
       if (Variable *Var = *I)
         Var->resetLiveRange();
     }
   }
   // Collect timing for just the portion that constructs the live
   // range intervals based on the end-of-live-range computation, for a
   // finer breakdown of the cost.
-  Timer T_liveRange;
   // Make a final pass over instructions to delete dead instructions
   // and build each Variable's live range.
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     (*I)->livenessPostprocess(Mode, getLiveness());
   }
   if (Mode == Liveness_Intervals) {
     // Special treatment for live in-args.  Their liveness needs to
     // extend beyond the beginning of the function, otherwise an arg
     // whose only use is in the first instruction will end up having
     // the trivial live range [1,1) and will *not* interfere with
@@ skipping 21 matching lines @@
     // Remove Variable::LiveRange and redirect to
     // Liveness::LiveRanges.  TODO: make sure Variable weights
     // are applied properly.
     SizeT NumVars = Variables.size();
     for (SizeT i = 0; i < NumVars; ++i) {
       Variable *Var = Variables[i];
       Var->setLiveRange(Live->getLiveRange(Var));
       if (Var->getWeight().isInf())
         Var->setLiveRangeInfiniteWeight();
     }
-    T_liveRange.printElapsedUs(getContext(), "live range construction");
     dump();
   }
 }
 
 // Traverse every Variable of every Inst and verify that it
 // appears within the Variable's computed live range.
 bool Cfg::validateLiveness() const {
+  TimerMarker T("validateLiveness", getContext());
   bool Valid = true;
   Ostream &Str = Ctx->getStrDump();
   for (NodeList::const_iterator I1 = Nodes.begin(), E1 = Nodes.end(); I1 != E1;
        ++I1) {
     CfgNode *Node = *I1;
     InstList &Insts = Node->getInsts();
     for (InstList::const_iterator I2 = Insts.begin(), E2 = Insts.end();
          I2 != E2; ++I2) {
       Inst *Inst = *I2;
       if (Inst->isDeleted())
@@ skipping 27 matching lines @@
             Str << " live range " << Var->getLiveRange() << "\n";
           }
         }
       }
     }
   }
   return Valid;
 }
 
 void Cfg::doBranchOpt() {
+  TimerMarker T("doBranchOpt", getContext());
   for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
     NodeList::iterator NextNode = I;
     ++NextNode;
-    (*I)->doBranchOpt(*NextNode);
+    (*I)->doBranchOpt(NextNode == E ? NULL : *NextNode);

[Jim Stichnoth, 2014/09/28 14:26:39]

This was a bug pointed out by valgrind.

   }
 }
 
 // ======================== Dump routines ======================== //
 
 void Cfg::emit() {
+  TimerMarker T("emit", getContext());
   Ostream &Str = Ctx->getStrEmit();
-  Timer T_emit;
   if (!Ctx->testAndSetHasEmittedFirstMethod()) {
     // Print a helpful command for assembling the output.
     // TODO: have the Target emit the header
     // TODO: need a per-file emit in addition to per-CFG
     Str << "# $LLVM_BIN_PATH/llvm-mc"
         << " -arch=x86"
         << " -x86-asm-syntax=intel"
         << " -filetype=obj"
         << " -o=MyObj.o"
         << "\n\n";
@@ skipping 11 matching lines @@
   for (llvm::ArrayRef<uint8_t>::iterator I = Pad.begin(), E = Pad.end();
        I != E; ++I) {
     Str.write_hex(*I);
   }
   Str << "\n";
   for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
        ++I) {
     (*I)->emit(this);
   }
   Str << "\n";
-  T_emit.printElapsedUs(Ctx, "emit()");
 }
 
 // Dumps the IR with an optional introductory message.
 void Cfg::dump(const IceString &Message) {
   if (!Ctx->isVerbose())
     return;
   Ostream &Str = Ctx->getStrDump();
   if (!Message.empty())
     Str << "================ " << Message << " ================\n";
   setCurrentNode(getEntryNode());
@@ skipping 31 matching lines @@
   for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
        ++I) {
     (*I)->dump(this);
   }
   if (getContext()->isVerbose(IceV_Instructions)) {
     Str << "}\n";
   }
 }
 
 } // end of namespace Ice