Subzero: Rewrite the pass timing infrastructure.

src/IceTargetLoweringX8632.cpp

 //===- subzero/src/IceTargetLoweringX8632.cpp - x86-32 lowering -----------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the TargetLoweringX8632 class, which
@@ skipping 284 matching lines @@
   TypeToRegisterSet[IceType_v8i1] = VectorRegisters;
   TypeToRegisterSet[IceType_v16i1] = VectorRegisters;
   TypeToRegisterSet[IceType_v16i8] = VectorRegisters;
   TypeToRegisterSet[IceType_v8i16] = VectorRegisters;
   TypeToRegisterSet[IceType_v4i32] = VectorRegisters;
   TypeToRegisterSet[IceType_v4f32] = VectorRegisters;
 }
 
 void TargetX8632::translateO2() {
   GlobalContext *Context = Func->getContext();
+  static TimerIdT IDO2 = GlobalContext::getTimerID("O2");
+  TimerMarker T(IDO2, Context);
 
   // Lower Phi instructions.
-  Timer T_placePhiLoads;
   Func->placePhiLoads();
   if (Func->hasError())
     return;
-  T_placePhiLoads.printElapsedUs(Context, "placePhiLoads()");
-  Timer T_placePhiStores;
   Func->placePhiStores();
   if (Func->hasError())
     return;
-  T_placePhiStores.printElapsedUs(Context, "placePhiStores()");
-  Timer T_deletePhis;
   Func->deletePhis();
   if (Func->hasError())
     return;
-  T_deletePhis.printElapsedUs(Context, "deletePhis()");
   Func->dump("After Phi lowering");
 
   // Address mode optimization.
-  Timer T_doAddressOpt;
   Func->getVMetadata()->init();
   Func->doAddressOpt();
-  T_doAddressOpt.printElapsedUs(Context, "doAddressOpt()");
 
   // Argument lowering
-  Timer T_argLowering;
   Func->doArgLowering();
-  T_argLowering.printElapsedUs(Context, "lowerArguments()");
 
   // Target lowering.  This requires liveness analysis for some parts
   // of the lowering decisions, such as compare/branch fusing.  If
   // non-lightweight liveness analysis is used, the instructions need
   // to be renumbered first.  TODO: This renumbering should only be
   // necessary if we're actually calculating live intervals, which we
   // only do for register allocation.
-  Timer T_renumber1;
   Func->renumberInstructions();
   if (Func->hasError())
     return;
-  T_renumber1.printElapsedUs(Context, "renumberInstructions()");
 
   // TODO: It should be sufficient to use the fastest liveness
   // calculation, i.e. livenessLightweight().  However, for some
   // reason that slows down the rest of the translation.  Investigate.
-  Timer T_liveness1;
   Func->liveness(Liveness_Basic);
   if (Func->hasError())
     return;
-  T_liveness1.printElapsedUs(Context, "liveness()");
   Func->dump("After x86 address mode opt");
 
-  Timer T_genCode;
   Func->genCode();
   if (Func->hasError())
     return;
-  T_genCode.printElapsedUs(Context, "genCode()");
 
   // Register allocation.  This requires instruction renumbering and
   // full liveness analysis.
-  Timer T_renumber2;
   Func->renumberInstructions();
   if (Func->hasError())
     return;
-  T_renumber2.printElapsedUs(Context, "renumberInstructions()");
-  Timer T_liveness2;
   Func->liveness(Liveness_Intervals);
   if (Func->hasError())
     return;
-  T_liveness2.printElapsedUs(Context, "liveness()");
   // Validate the live range computations.  Do it outside the timing
   // code.  TODO: Put this under a flag.
   bool ValidLiveness = Func->validateLiveness();
   assert(ValidLiveness);
   (void)ValidLiveness; // used only in assert()
   ComputedLiveRanges = true;
   // The post-codegen dump is done here, after liveness analysis and
   // associated cleanup, to make the dump cleaner and more useful.
   Func->dump("After initial x8632 codegen");
-  Timer T_regAlloc;
   Func->getVMetadata()->init();
   regAlloc();
   if (Func->hasError())
     return;
-  T_regAlloc.printElapsedUs(Context, "regAlloc()");
   Func->dump("After linear scan regalloc");
 
   // Stack frame mapping.
-  Timer T_genFrame;
   Func->genFrame();
   if (Func->hasError())
     return;
-  T_genFrame.printElapsedUs(Context, "genFrame()");
   Func->dump("After stack frame mapping");
 
   // Branch optimization.  This needs to be done just before code
   // emission.  In particular, no transformations that insert or
   // reorder CfgNodes should be done after branch optimization.  We go
   // ahead and do it before nop insertion to reduce the amount of work
   // needed for searching for opportunities.
   Func->doBranchOpt();
   Func->dump("After branch optimization");
 
   // Nop insertion
   if (shouldDoNopInsertion()) {
     Func->doNopInsertion();
   }
 }
 
 void TargetX8632::translateOm1() {
   GlobalContext *Context = Func->getContext();
-  Timer T_placePhiLoads;
+  static TimerIdT IDOm1 = GlobalContext::getTimerID("Om1");
+  TimerMarker T(IDOm1, Context);
   Func->placePhiLoads();
   if (Func->hasError())
     return;
-  T_placePhiLoads.printElapsedUs(Context, "placePhiLoads()");
-  Timer T_placePhiStores;
   Func->placePhiStores();
   if (Func->hasError())
     return;
-  T_placePhiStores.printElapsedUs(Context, "placePhiStores()");
-  Timer T_deletePhis;
   Func->deletePhis();
   if (Func->hasError())
     return;
-  T_deletePhis.printElapsedUs(Context, "deletePhis()");
   Func->dump("After Phi lowering");
 
-  Timer T_argLowering;
   Func->doArgLowering();
-  T_argLowering.printElapsedUs(Context, "lowerArguments()");
 
-  Timer T_genCode;
   Func->genCode();
   if (Func->hasError())
     return;
-  T_genCode.printElapsedUs(Context, "genCode()");
   Func->dump("After initial x8632 codegen");
 
-  Timer T_genFrame;
   Func->genFrame();
   if (Func->hasError())
     return;
-  T_genFrame.printElapsedUs(Context, "genFrame()");
   Func->dump("After stack frame mapping");
 
   // Nop insertion
   if (shouldDoNopInsertion()) {
     Func->doNopInsertion();
   }
 }
 
 bool TargetX8632::doBranchOpt(Inst *I, const CfgNode *NextNode) {
   if (InstX8632Br *Br = llvm::dyn_cast<InstX8632Br>(I)) {
@@ skipping 4099 matching lines @@
     Str << "\t.align\t" << Align << "\n";
     Str << MangledName << ":\n";
     for (SizeT i = 0; i < Size; ++i) {
       Str << "\t.byte\t" << (((unsigned)Data[i]) & 0xff) << "\n";
     }
     Str << "\t.size\t" << MangledName << ", " << Size << "\n";
   }
 }
 
 } // end of namespace Ice