Subzero: Initial implementation of multithreaded translation.

src/IceCfg.cpp

 //===- subzero/src/IceCfg.cpp - Control flow graph implementation ---------===//
 //
 //                        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 Cfg class, including constant pool
@@ skipping 14 matching lines @@
 
 namespace Ice {
 
 thread_local const Cfg *Cfg::CurrentCfg = nullptr;
 
 ArenaAllocator<> *getCurrentCfgAllocator() {
   return Cfg::getCurrentCfgAllocator();
 }
 
 Cfg::Cfg(GlobalContext *Ctx)
-    : Ctx(Ctx), FunctionName(""), ReturnType(IceType_void),
-      IsInternalLinkage(false), HasError(false), FocusedTiming(false),
-      ErrorMessage(""), Entry(nullptr), NextInstNumber(Inst::NumberInitial),
-      Allocator(new ArenaAllocator<>()), Live(nullptr),
+    : Ctx(Ctx), VMask(Ctx->getVerbose()), FunctionName(""),
+      ReturnType(IceType_void), IsInternalLinkage(false), HasError(false),
+      FocusedTiming(false), ErrorMessage(""), Entry(nullptr),
+      NextInstNumber(Inst::NumberInitial), Allocator(new ArenaAllocator<>()),
+      Live(nullptr),
       Target(TargetLowering::createLowering(Ctx->getTargetArch(), this)),
       VMetadata(new VariablesMetadata(this)),
       TargetAssembler(
           TargetLowering::createAssembler(Ctx->getTargetArch(), this)),
       CurrentNode(nullptr) {
   assert(!Ctx->isIRGenerationDisabled() &&
          "Attempt to build cfg when IR generation disabled");
 }
 
-Cfg::~Cfg() {
-  // TODO(stichnot,kschimpf): Set CurrentCfg=nullptr in the dtor for
-  // safety.  This can't be done currently because the translator
-  // manages the Cfg by creating a new Cfg (which sets CurrentCfg to
-  // the new value), then deleting the old Cfg (which would then reset
-  // CurrentCfg to nullptr).
-}
+Cfg::~Cfg() { CurrentCfg = nullptr; }

[JF, 2015/01/22 20:50:56]

Comment that this is TLS.

[Jim Stichnoth, 2015/01/23 07:55:54]

Done.

 
 void Cfg::setError(const IceString &Message) {
   HasError = true;
   ErrorMessage = Message;
-  OstreamLocker L(Ctx);
-  Ctx->getStrDump() << "ICE translation error: " << ErrorMessage << "\n";
 }
 
 CfgNode *Cfg::makeNode() {
   SizeT LabelIndex = Nodes.size();
   CfgNode *Node = CfgNode::create(this, LabelIndex);
   Nodes.push_back(Node);
   return Node;
 }
 
 void Cfg::addArg(Variable *Arg) {
@@ skipping 400 matching lines @@
     OstreamLocker L(Ctx);
     emitTextHeader(MangledName);
     getAssembler<Assembler>()->emitIASBytes(Ctx);
   }
 }
 
 // Dumps the IR with an optional introductory message.
 void Cfg::dump(const IceString &Message) {
   if (!ALLOW_DUMP)
     return;
-  if (!Ctx->isVerbose())
+  if (!isVerbose())
     return;
   OstreamLocker L(Ctx);
   Ostream &Str = Ctx->getStrDump();
   if (!Message.empty())
     Str << "================ " << Message << " ================\n";
   setCurrentNode(getEntryNode());
   // Print function name+args
-  if (getContext()->isVerbose(IceV_Instructions)) {
+  if (isVerbose(IceV_Instructions)) {
     Str << "define ";
     if (getInternal() && !Ctx->getFlags().DisableInternal)
       Str << "internal ";
     Str << ReturnType << " @" << Ctx->mangleName(getFunctionName()) << "(";
     for (SizeT i = 0; i < Args.size(); ++i) {
       if (i > 0)
         Str << ", ";
       Str << Args[i]->getType() << " ";
       Args[i]->dump(this);
     }
     Str << ") {\n";
   }
   resetCurrentNode();
-  if (getContext()->isVerbose(IceV_Liveness)) {
+  if (isVerbose(IceV_Liveness)) {
     // Print summary info about variables
     for (Variable *Var : Variables) {
       Str << "// multiblock=";
       if (getVMetadata()->isTracked(Var))
         Str << getVMetadata()->isMultiBlock(Var);
       else
         Str << "?";
       Str << " weight=" << Var->getWeight() << " ";
       Var->dump(this);
       Str << " LIVE=" << Var->getLiveRange() << "\n";
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
-  if (getContext()->isVerbose(IceV_Instructions))
+  if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice