Subzero: Improve the use of timers.

src/IceELFObjectWriter.cpp

 //===- subzero/src/IceELFObjectWriter.cpp - ELF object file writer --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 201 matching lines @@
   if (AlignDiff == 0)
     return OffsetInFile;
   Str.writeZeroPadding(AlignDiff);
   OffsetInFile += AlignDiff;
   return OffsetInFile;
 }
 
 void ELFObjectWriter::writeFunctionCode(const IceString &FuncName,
                                         bool IsInternal, Assembler *Asm) {
   assert(!SectionNumbersAssigned);
+  TimerMarker T_func(&Ctx, FuncName);
   TimerMarker Timer(TimerStack::TT_writeELF, &Ctx);
-  constexpr TimerStackIdT StackID = GlobalContext::TSK_Funcs;
-  TimerIdT TimerID = 0;
-  bool TimeThisFunction = Ctx.getFlags().getTimeEachFunction();
-  if (TimeThisFunction) {
-    TimerID = Ctx.getTimerID(StackID, FuncName);
-    Ctx.pushTimer(TimerID, StackID);
-  }
   ELFTextSection *Section = nullptr;
   ELFRelocationSection *RelSection = nullptr;
   const bool FunctionSections = Ctx.getFlags().getFunctionSections();
   if (TextSections.empty() || FunctionSections) {
     IceString SectionName = ".text";
     if (FunctionSections)
       SectionName += "." + FuncName;
     constexpr Elf64_Xword ShFlags = SHF_ALLOC | SHF_EXECINSTR;
     const Elf64_Xword ShAlign = 1 << Asm->getBundleAlignLog2Bytes();
     Section = createSection<ELFTextSection>(SectionName, SHT_PROGBITS, ShFlags,
@@ skipping 31 matching lines @@
     if (!RelSection->isRela()) {
       // This is a non-rela section, so we need to update the instruction stream
       // with the relocation addends.
       for (const auto *Fixup : Fixups) {
         Fixup->emitOffset(Asm);
       }
     }
     RelSection->addRelocations(OffsetInSection, Asm->fixups(), SymTab);
   }
   Section->appendData(Str, Asm->getBufferView());
-  if (TimeThisFunction)
-    Ctx.popTimer(TimerID, StackID);
 }
 
 namespace {
 
 ELFObjectWriter::SectionType
 classifyGlobalSection(const VariableDeclaration *Var) {
   if (Var->getIsConstant())
     return ELFObjectWriter::ROData;
   if (Var->hasNonzeroInitializer())
     return ELFObjectWriter::Data;
@@ skipping 408 matching lines @@
   if (ELF64) {
     writeELFHeaderInternal<true>(ShOffset, ShStrTab->getNumber(),
                                  AllSections.size());
   } else {
     writeELFHeaderInternal<false>(ShOffset, ShStrTab->getNumber(),
                                   AllSections.size());
   }
 }
 
 } // end of namespace Ice