Subzero: Improve the use of timers.

src/IceGlobalContext.h

 //===- subzero/src/IceGlobalContext.h - Global context defs -----*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 100 matching lines @@
     TimerList(const TimerList &) = delete;
     TimerList &operator=(const TimerList &) = delete;
 
   public:
     TimerList() = default;
     /// initInto() initializes a target list of timers based on the
     /// current list.  In particular, it creates the same number of
     /// timers, in the same order, with the same names, but initially
     /// empty of timing data.
     void initInto(TimerList &Dest) const {
-      if (!BuildDefs::dump())
+      if (!BuildDefs::timers())
         return;
       Dest.clear();
       for (const TimerStack &Stack : *this) {
         Dest.push_back(TimerStack(Stack.getName()));
       }
     }
     void mergeFrom(TimerList &Src) {
-      if (!BuildDefs::dump())
+      if (!BuildDefs::timers())
         return;
       assert(size() == Src.size());
       size_type i = 0;
       for (TimerStack &Stack : *this) {
         assert(Stack.getName() == Src[i].getName());
         Stack.mergeFrom(Src[i]);
         ++i;
       }
     }
   };
@@ skipping 234 matching lines @@
     TranslationThreads.clear();
 
     // Only notify the emit queue to end after all the translation threads have
     // ended.
     emitQueueNotifyEnd();
     for (std::thread &Worker : EmitterThreads) {
       Worker.join();
     }
     EmitterThreads.clear();
 
-    if (BuildDefs::dump()) {
+    if (BuildDefs::timers()) {
       auto Timers = getTimers();
       for (ThreadContext *TLS : AllThreadContexts)
         Timers->mergeFrom(TLS->Timers);
     }
     if (BuildDefs::dump()) {
       // Do a separate loop over AllThreadContexts to avoid holding two locks
       // at once.
       auto Stats = getStatsCumulative();
       for (ThreadContext *TLS : AllThreadContexts)
         Stats->add(TLS->StatsCumulative);
@@ skipping 158 matching lines @@
 /// of code.
 class TimerMarker {
   TimerMarker() = delete;
   TimerMarker(const TimerMarker &) = delete;
   TimerMarker &operator=(const TimerMarker &) = delete;
 
 public:
   TimerMarker(TimerIdT ID, GlobalContext *Ctx,
               TimerStackIdT StackID = GlobalContext::TSK_Default)
       : ID(ID), Ctx(Ctx), StackID(StackID) {
-    if (BuildDefs::dump())
+    if (BuildDefs::timers())
       push();
   }
   TimerMarker(TimerIdT ID, const Cfg *Func,
               TimerStackIdT StackID = GlobalContext::TSK_Default)
       : ID(ID), Ctx(nullptr), StackID(StackID) {
     // Ctx gets set at the beginning of pushCfg().
-    if (BuildDefs::dump())
+    if (BuildDefs::timers())
       pushCfg(Func);
   }
+  TimerMarker(GlobalContext *Ctx, const IceString &FuncName)
+      : ID(getTimerIdFromFuncName(Ctx, FuncName)), Ctx(Ctx),
+        StackID(GlobalContext::TSK_Funcs) {
+    if (BuildDefs::timers())
+      push();
+  }
 
   ~TimerMarker() {
-    if (BuildDefs::dump() && Active)
+    if (BuildDefs::timers() && Active)
       Ctx->popTimer(ID, StackID);
   }
 
 private:
   void push();
   void pushCfg(const Cfg *Func);
+  static TimerIdT getTimerIdFromFuncName(GlobalContext *Ctx,
+                                         const IceString &FuncName);
   const TimerIdT ID;
   GlobalContext *Ctx;
   const TimerStackIdT StackID;
   bool Active = false;
 };
 
 /// Helper class for locking the streams and then automatically unlocking them.
 class OstreamLocker {
 private:
   OstreamLocker() = delete;
   OstreamLocker(const OstreamLocker &) = delete;
   OstreamLocker &operator=(const OstreamLocker &) = delete;
 
 public:
   explicit OstreamLocker(GlobalContext *Ctx) : Ctx(Ctx) { Ctx->lockStr(); }
   ~OstreamLocker() { Ctx->unlockStr(); }
 
 private:
   GlobalContext *const Ctx;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEGLOBALCONTEXT_H