Subzero: Rewrite the pass timing infrastructure.

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.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares aspects of the compilation that persist across
@@ skipping 51 matching lines @@
 // the output streams.
 class GlobalContext {
 public:
   GlobalContext(llvm::raw_ostream *OsDump, llvm::raw_ostream *OsEmit,
                 VerboseMask Mask, TargetArch Arch, OptLevel Opt,
                 IceString TestPrefix, const ClFlags &Flags);
   ~GlobalContext();
 
   // Returns true if any of the specified options in the verbose mask
   // are set.  If the argument is omitted, it checks if any verbose
-  // options at all are set.  IceV_Timing is treated specially, so
-  // that running with just IceV_Timing verbosity doesn't trigger an
-  // avalanche of extra output.
-  bool isVerbose(VerboseMask Mask = (IceV_All & ~IceV_Timing)) const {
-    return VMask & Mask;
-  }
+  // options at all are set.
+  bool isVerbose(VerboseMask Mask = IceV_All) const { return VMask & Mask; }
   void setVerbose(VerboseMask Mask) { VMask = Mask; }
   void addVerbose(VerboseMask Mask) { VMask |= Mask; }
   void subVerbose(VerboseMask Mask) { VMask &= ~Mask; }
 
   Ostream &getStrDump() { return *StrDump; }
   Ostream &getStrEmit() { return *StrEmit; }
 
   TargetArch getTargetArch() const { return Arch; }
   OptLevel getOptLevel() const { return Opt; }
 
@@ skipping 59 matching lines @@
   }
   void statsUpdateSpills() {
     StatsFunction.updateSpills();
     StatsCumulative.updateSpills();
   }
   void statsUpdateFills() {
     StatsFunction.updateFills();
     StatsCumulative.updateFills();
   }
 
+  static TimerIdT getTimerID(const IceString &Name);
+  void pushTimer(TimerIdT ID);
+  void popTimer(TimerIdT ID);
+  void dumpTimers();
+
 private:
   Ostream *StrDump; // Stream for dumping / diagnostics
   Ostream *StrEmit; // Stream for code emission
 
   llvm::BumpPtrAllocator Allocator;
   VerboseMask VMask;
   llvm::OwningPtr<class ConstantPool> ConstPool;
   Intrinsics IntrinsicsInfo;
   const TargetArch Arch;
   const OptLevel Opt;
   const IceString TestPrefix;
   const ClFlags &Flags;
   bool HasEmittedFirstMethod;
   RandomNumberGenerator RNG;
   CodeStats StatsFunction;
   CodeStats StatsCumulative;
+  llvm::OwningPtr<class TimerStack> Timers;
   GlobalContext(const GlobalContext &) LLVM_DELETED_FUNCTION;
   GlobalContext &operator=(const GlobalContext &) LLVM_DELETED_FUNCTION;
 
   // Private helpers for mangleName()
   typedef llvm::SmallVector<char, 32> ManglerVector;
   void incrementSubstitutions(ManglerVector &OldName) const;
 };
 
+// Helper class to push and pop a timer marker.  The constructor
+// pushes a marker, and the destructor pops it.  This is for
+// convenient timing of regions of code.
+class TimerMarker {
+  TimerMarker(const TimerMarker &) LLVM_DELETED_FUNCTION;
+  TimerMarker &operator=(const TimerMarker &) LLVM_DELETED_FUNCTION;
+
+public:
+  TimerMarker(TimerIdT ID, GlobalContext *Ctx)
+      : ID(ID), Ctx(Ctx), Active(Ctx->getFlags().SubzeroTimingEnabled) {
+    if (Active)
+      Ctx->pushTimer(ID);
+  }
+  ~TimerMarker() {
+    if (Active)
+      Ctx->popTimer(ID);
+  }
+
+private:
+  TimerIdT ID;
+  GlobalContext *const Ctx;
+  const bool Active;
+};
+
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEGLOBALCONTEXT_H