Subzero. Performance tweaks.

src/IceCfg.h

 //===- subzero/src/IceCfg.h - Control flow graph ----------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 18 matching lines @@
   Cfg(const Cfg &) = delete;
   Cfg &operator=(const Cfg &) = delete;
 
 public:
   ~Cfg();
 
   static std::unique_ptr<Cfg> create(GlobalContext *Ctx,
                                      uint32_t SequenceNumber) {
     return std::unique_ptr<Cfg>(new Cfg(Ctx, SequenceNumber));
   }
-  /// Gets a pointer to the current thread's Cfg.
-  static const Cfg *getCurrentCfg() { return ICE_TLS_GET_FIELD(CurrentCfg); }
-  static void setCurrentCfg(const Cfg *Func) {
-    ICE_TLS_SET_FIELD(CurrentCfg, Func);
-  }
-  /// Gets a pointer to the current thread's Cfg's allocator.
-  static ArenaAllocator<> *getCurrentCfgAllocator() {
-    assert(ICE_TLS_GET_FIELD(CurrentCfg));
-    return ICE_TLS_GET_FIELD(CurrentCfg)->Allocator.get();
-  }
 
   GlobalContext *getContext() const { return Ctx; }
   uint32_t getSequenceNumber() const { return SequenceNumber; }
 
   static constexpr VerboseMask defaultVerboseMask() {
     return IceV_All & ~IceV_Status & ~IceV_AvailableRegs;
   }
   /// 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.
@@ skipping 188 matching lines @@
   template <typename T> void deallocate(T *Object) {
     Allocator->Deallocate(Object);
   }
 
   /// Deallocate data that was allocated via allocateArrayOf<T>().
   template <typename T> void deallocateArrayOf(T *Array) {
     Allocator->Deallocate(Array);
   }
 
 private:
+  friend class CfgAllocatorTraits; // for Allocator access.
+
   Cfg(GlobalContext *Ctx, uint32_t SequenceNumber);
 
   /// Adds a call to the ProfileSummary runtime function as the first
   /// instruction in this CFG's entry block.
   void addCallToProfileSummary();
 
   /// Iterates over the basic blocks in this CFG, adding profiling code to each
   /// one of them. It returns a list with all the globals that the profiling
   /// code needs to be defined.
   void profileBlocks();
@@ skipping 24 matching lines @@
   bool HasError = false;
   bool FocusedTiming = false;
   IceString ErrorMessage = "";
   CfgNode *Entry = nullptr; /// entry basic block
   NodeList Nodes;           /// linearized node list; Entry should be first
   std::vector<IceString> IdentifierNames;
   InstNumberT NextInstNumber;
   VarList Variables;
   VarList Args;         /// subset of Variables, in argument order
   VarList ImplicitArgs; /// subset of Variables
-  std::unique_ptr<ArenaAllocator<>> Allocator;
+  std::unique_ptr<ArenaAllocator> Allocator;
   std::unique_ptr<Liveness> Live;
   std::unique_ptr<TargetLowering> Target;
   std::unique_ptr<VariablesMetadata> VMetadata;
   std::unique_ptr<Assembler> TargetAssembler;
   /// Globals required by this CFG. Mostly used for the profiler's globals.
   std::unique_ptr<VariableDeclarationList> GlobalInits;
   CfgVector<InstJumpTable *> JumpTables;
 
   /// CurrentNode is maintained during dumping/emitting just for validating
   /// Variable::DefNode. Normally, a traversal over CfgNodes maintains this, but
   /// before global operations like register allocation, resetCurrentNode()
   /// should be called to avoid spurious validation failures.
   const CfgNode *CurrentNode = nullptr;
 
-  /// Maintain a pointer in TLS to the current Cfg being translated. This is
-  /// primarily for accessing its allocator statelessly, but other uses are
-  /// possible.
-  ICE_TLS_DECLARE_FIELD(const Cfg *, CurrentCfg);
-
 public:
-  static void TlsInit() { ICE_TLS_INIT_FIELD(CurrentCfg); }
+  static void TlsInit() { CfgAllocatorTraits::init(); }
 };
 
 template <> Variable *Cfg::makeVariable<Variable>(Type Ty);
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFG_H