Subzero: Fix -timing-funcs and -timing-focus flags.

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 179 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;
+  if (BuildDefs::timers()) {
+    const std::string TimingFocusOn = getFlags().getTimingFocusOn();
+    if (!TimingFocusOn.empty()) {
+      const std::string Name = getFunctionName().toString();
+      if (TimingFocusOn == "*" || TimingFocusOn == Name) {
+        setFocusedTiming();
+        getContext()->resetTimer(GlobalContext::TSK_Default);
+        getContext()->setTimerName(GlobalContext::TSK_Default, Name);
+      }
+    }
+  }
   if (BuildDefs::dump()) {
-    const std::string TimingFocusOn = getFlags().getTimingFocusOn();
-    const std::string Name = getFunctionName().toString();
-    if (TimingFocusOn == "*" || TimingFocusOn == Name) {
-      setFocusedTiming();
-      getContext()->resetTimer(GlobalContext::TSK_Default);
-      getContext()->setTimerName(GlobalContext::TSK_Default, Name);
-    }
     if (isVerbose(IceV_Status)) {
       getContext()->getStrDump() << ">>>Translating "
                                  << getFunctionNameAndSize() << "\n";
     }
   }
   TimerMarker T_func(getContext(), getFunctionName().toStringOrEmpty());
   TimerMarker T(TimerStack::TT_translate, this);
 
   dump("Initial CFG");
 
@@ skipping 10 matching lines @@
   // Create the Hi and Lo variables where a split was needed
   for (Variable *Var : Variables)
     if (auto *Var64On32 = llvm::dyn_cast<Variable64On32>(Var))
       Var64On32->initHiLo(this);
 
   // The set of translation passes and their order are determined by the
   // target.
   getTarget()->translate();
 
   dump("Final output");
-  if (getFocusedTiming())
+  if (getFocusedTiming()) {
+    getContext()->mergeTimersFromTLS();
     getContext()->dumpTimers();
+  }
 }
 
 void Cfg::computeInOutEdges() {
   // Compute the out-edges.
   for (CfgNode *Node : Nodes)
     Node->computeSuccessors();
 
   // Prune any unreachable nodes before computing in-edges.
   SizeT NumNodes = getNumNodes();
   BitVector Reachable(NumNodes);
@@ skipping 909 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice