Subzero: Improve the use of timers.

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.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 169 matching lines @@
   constexpr Variable *Void = nullptr;
   constexpr bool HasTailCall = false;
   auto *Call =
       InstCall::create(this, NumArgs, Void, ProfileSummarySym, HasTailCall);
   getEntryNode()->getInsts().push_front(Call);
 }
 
 void Cfg::translate() {
   if (hasError())
     return;
-  // FunctionTimer conditionally pushes/pops a TimerMarker if TimeEachFunction
-  // is enabled.
-  std::unique_ptr<TimerMarker> FunctionTimer;
   if (BuildDefs::dump()) {
     const IceString &TimingFocusOn =
         getContext()->getFlags().getTimingFocusOn();
     const IceString &Name = getFunctionName();
     if (TimingFocusOn == "*" || TimingFocusOn == Name) {
       setFocusedTiming();
       getContext()->resetTimer(GlobalContext::TSK_Default);
       getContext()->setTimerName(GlobalContext::TSK_Default, Name);
     }
-    if (getContext()->getFlags().getTimeEachFunction())
-      FunctionTimer.reset(new TimerMarker(
-          getContext()->getTimerID(GlobalContext::TSK_Funcs, Name),
-          getContext(), GlobalContext::TSK_Funcs));
     if (isVerbose(IceV_Status)) {
       getContext()->getStrDump() << ">>>Translating "
                                  << getFunctionNameAndSize() << "\n";
     }
   }
+  TimerMarker T_func(getContext(), getFunctionName());
   TimerMarker T(TimerStack::TT_translate, this);
 
   dump("Initial CFG");
 
   if (getContext()->getFlags().getEnableBlockProfile()) {
     profileBlocks();
     // TODO(jpp): this is fragile, at best. Figure out a better way of
     // detecting exit functions.
     if (GlobalContext::matchSymbolName(getFunctionName(), "exit")) {
       addCallToProfileSummary();
@@ skipping 345 matching lines @@
       Insts.push_front(Def);
       Alloca->setDeleted();
     }
     // Allocate the fixed area in the function prolog.
     getTarget()->reserveFixedAllocaArea(TotalSize, CombinedAlignment);
   } break;
   }
 }
 
 void Cfg::processAllocas(bool SortAndCombine) {
+  TimerMarker _(TimerStack::TT_alloca, this);
   const uint32_t StackAlignment = getTarget()->getStackAlignment();
   CfgNode *EntryNode = getEntryNode();
   // LLVM enforces power of 2 alignment.
   assert(llvm::isPowerOf2_32(StackAlignment));
   // Determine if there are large alignment allocations in the entry block or
   // dynamic allocations (variable size in the entry block).
   bool HasLargeAlignment = false;
   bool HasDynamicAllocation = false;
   for (Inst &Instr : EntryNode->getInsts()) {
     if (auto *Alloca = llvm::dyn_cast<InstAlloca>(&Instr)) {
@@ skipping 490 matching lines @@
 
 size_t Cfg::getTotalMemoryMB() {
   constexpr size_t OneMB = 1024 * 1024;
   using ArbitraryType = int;
   // CfgLocalAllocator draws from the same memory pool regardless of allocated
   // object type, so pick an arbitrary type for the template parameter.
   return CfgLocalAllocator<ArbitraryType>().current()->getTotalMemory() / OneMB;
 }
 
 // Dumps the IR with an optional introductory message.
-void Cfg::dump(const IceString &Message) {
+void Cfg::dump(const char *Message) {
   if (!BuildDefs::dump())
     return;
   if (!isVerbose())
     return;
   OstreamLocker L(Ctx);
   Ostream &Str = Ctx->getStrDump();
-  if (!Message.empty())
+  if (Message[0])
     Str << "================ " << Message << " ================\n";
   if (isVerbose(IceV_Mem)) {
     Str << "Memory size = " << getTotalMemoryMB() << " MB\n";
   }
   setCurrentNode(getEntryNode());
   // Print function name+args
   if (isVerbose(IceV_Instructions)) {
     Str << "define ";
     if (getInternal() && !Ctx->getFlags().getDisableInternal())
       Str << "internal ";
@@ skipping 39 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice