Subzero. Performance tweaks.

src/IceConverter.cpp

 //===- subzero/src/IceConverter.cpp - Converts LLVM to Ice  ---------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 78 matching lines @@
   LLVM2ICEFunctionConverter(const LLVM2ICEFunctionConverter &) = delete;
   LLVM2ICEFunctionConverter &
   operator=(const LLVM2ICEFunctionConverter &) = delete;
 
 public:
   explicit LLVM2ICEFunctionConverter(Ice::Converter &Converter)
       : LLVM2ICEConverter(Converter), Func(nullptr) {}
 
   void convertFunction(const Function *F) {
     Func = Ice::Cfg::create(Ctx, Converter.getNextSequenceNumber());
-    Ice::Cfg::setCurrentCfg(Func.get());
+    {
+      Ice::CfgLocalAllocatorScope _(Func.get());
 
-    VarMap.clear();
-    NodeMap.clear();
-    Func->setFunctionName(F->getName());
-    Func->setReturnType(convertToIceType(F->getReturnType()));
-    Func->setInternal(F->hasInternalLinkage());
-    Ice::TimerMarker T(Ice::TimerStack::TT_llvmConvert, Func.get());
+      VarMap.clear();
+      NodeMap.clear();
+      Func->setFunctionName(F->getName());
+      Func->setReturnType(convertToIceType(F->getReturnType()));
+      Func->setInternal(F->hasInternalLinkage());
+      Ice::TimerMarker T(Ice::TimerStack::TT_llvmConvert, Func.get());
 
-    // The initial definition/use of each arg is the entry node.
-    for (auto ArgI = F->arg_begin(), ArgE = F->arg_end(); ArgI != ArgE;
-         ++ArgI) {
-      Func->addArg(mapValueToIceVar(ArgI));
+      // The initial definition/use of each arg is the entry node.
+      for (auto ArgI = F->arg_begin(), ArgE = F->arg_end(); ArgI != ArgE;
+           ++ArgI) {
+        Func->addArg(mapValueToIceVar(ArgI));
+      }
+
+      // Make an initial pass through the block list just to resolve the blocks
+      // in the original linearized order. Otherwise the ICE linearized order
+      // will be affected by branch targets in terminator instructions.
+      for (const BasicBlock &BBI : *F)
+        mapBasicBlockToNode(&BBI);
+      for (const BasicBlock &BBI : *F)
+        convertBasicBlock(&BBI);
+      Func->setEntryNode(mapBasicBlockToNode(&F->getEntryBlock()));
+      Func->computeInOutEdges();
     }
-
-    // Make an initial pass through the block list just to resolve the blocks
-    // in the original linearized order. Otherwise the ICE linearized order
-    // will be affected by branch targets in terminator instructions.
-    for (const BasicBlock &BBI : *F)
-      mapBasicBlockToNode(&BBI);
-    for (const BasicBlock &BBI : *F)
-      convertBasicBlock(&BBI);
-    Func->setEntryNode(mapBasicBlockToNode(&F->getEntryBlock()));
-    Func->computeInOutEdges();
-
-    Ice::Cfg::setCurrentCfg(nullptr);
     Converter.translateFcn(std::move(Func));
   }
 
   // convertConstant() does not use Func or require it to be a valid Ice::Cfg
   // pointer. As such, it's suitable for e.g. constructing global initializers.
   Ice::Constant *convertConstant(const Constant *Const) {
     if (const auto GV = dyn_cast<GlobalValue>(Const)) {
       Ice::GlobalDeclaration *Decl = getConverter().getGlobalDeclaration(GV);
       bool IsUndefined = false;
       if (const auto *Func = llvm::dyn_cast<Ice::FunctionDeclaration>(Decl))
@@ skipping 789 matching lines @@
       Ctx->pushTimer(TimerID, StackID);
     }
     LLVM2ICEFunctionConverter FunctionConverter(*this);
     FunctionConverter.convertFunction(&I);
     if (TimeThisFunction)
       Ctx->popTimer(TimerID, StackID);
   }
 }
 
 } // end of namespace Ice