Subzero: Fix -timing-focus .

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 186 matching lines @@
 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()) {
     if (isVerbose(IceV_Status)) {
       getContext()->getStrDump() << ">>>Translating "
                                  << getFunctionNameAndSize() << "\n";
     }
   }
   TimerMarker T_func(getContext(), getFunctionName().toStringOrEmpty());
@@ skipping 15 matching lines @@
   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()) {
-    getContext()->mergeTimersFromTLS();
-    getContext()->dumpTimers();
+    // Temporarily override the thread-local timer name to be the name of the
+    // function.  Don't do it permanently because the final timer merge at the
+    // end expects the thread-local timer names to be the same as the global
+    // timer name.
+    std::string OrigName =

[John, 2016/04/06 13:05:32]

Auto, maybe?

[Jim Stichnoth, 2016/04/06 13:23:58]

Done.

+        getContext()->getTimerName(GlobalContext::TSK_Default);
+    getContext()->setTimerName(GlobalContext::TSK_Default,
+                               getFunctionName().toString());
+    getContext()->dumpLocalTimers();

[John, 2016/04/06 13:05:32]

Maybe have dumpLocalTimers do the renaming?

[Jim Stichnoth, 2016/04/06 13:23:58]

Very nice!  Done.

+    getContext()->setTimerName(GlobalContext::TSK_Default, OrigName);
   }
 }
 
 void Cfg::fixPhiNodes() {
   for (auto *Node : Nodes) {
     // Fix all the phi edges since WASM can't tell how to make them correctly at
     // the beginning.
     assert(Node);
     const auto &InEdges = Node->getInEdges();
     for (auto &Instr : Node->getPhis()) {
@@ skipping 912 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice