Subzero: Improve debugging controls, plus minor refactoring.

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 47 matching lines @@
   ImplicitArgs.push_back(Arg);
 }
 
 // Returns whether the stack frame layout has been computed yet.  This
 // is used for dumping the stack frame location of Variables.
 bool Cfg::hasComputedFrame() const { return getTarget()->hasComputedFrame(); }
 
 void Cfg::translate() {
   if (hasError())
     return;
-  VerboseMask OldVerboseMask = getContext()->getVerbose();
   const IceString &TimingFocusOn = getContext()->getFlags().TimingFocusOn;
   if (TimingFocusOn == "*" || TimingFocusOn == getFunctionName()) {
     setFocusedTiming();
     getContext()->resetTimer(GlobalContext::TSK_Default);
     getContext()->setTimerName(GlobalContext::TSK_Default, getFunctionName());
   }
-  bool VerboseFocus =
-      (getContext()->getFlags().VerboseFocusOn == getFunctionName());
-  if (VerboseFocus)
-    getContext()->setVerbose(IceV_All);
   TimerMarker T(TimerStack::TT_translate, this);
 
   dump("Initial CFG");
 
   // The set of translation passes and their order are determined by
   // the target.
   getTarget()->translate();
 
   dump("Final output");
   if (getFocusedTiming())
     getContext()->dumpTimers();
-  if (VerboseFocus)
-    getContext()->setVerbose(OldVerboseMask);
 }
 
 void Cfg::computePredecessors() {
   for (CfgNode *Node : Nodes)
     Node->computePredecessors();
 }
 
 void Cfg::renumberInstructions() {
   TimerMarker T(TimerStack::TT_renumberInstructions, this);
   NextInstNumber = 1;
@@ skipping 41 matching lines @@
 void Cfg::genCode() {
   TimerMarker T(TimerStack::TT_genCode, this);
   for (CfgNode *Node : Nodes)
     Node->genCode();
 }
 
 // Compute the stack frame layout.
 void Cfg::genFrame() {
   TimerMarker T(TimerStack::TT_genFrame, this);
   getTarget()->addProlog(Entry);
-  // TODO: Consider folding epilog generation into the final
-  // emission/assembly pass to avoid an extra iteration over the node
-  // list.  Or keep a separate list of exit nodes.
   for (CfgNode *Node : Nodes)
     if (Node->getHasReturn())
       getTarget()->addEpilog(Node);
 }
 
 // This is a lightweight version of live-range-end calculation.  Marks
 // the last use of only those variables whose definition and uses are
 // completely with a single block.  It is a quick single pass and
 // doesn't need to iterate until convergence.
 void Cfg::livenessLightweight() {
@@ skipping 150 matching lines @@
         << " -arch=x86"
         << " -x86-asm-syntax=intel"
         << " -filetype=obj"
         << " -o=MyObj.o"
         << "\n\n";
   }
   Str << "\t.text\n";
   IceString MangledName = getContext()->mangleName(getFunctionName());
   if (Ctx->getFlags().FunctionSections)
     Str << "\t.section\t.text." << MangledName << ",\"ax\",@progbits\n";
-  if (!getInternal()) {
+  if (!getInternal() || Ctx->getFlags().DisableInternal) {
     Str << "\t.globl\t" << MangledName << "\n";
     Str << "\t.type\t" << MangledName << ",@function\n";
   }
   Str << "\t.p2align " << getTarget()->getBundleAlignLog2Bytes() << ",0x";
   for (AsmCodeByte I : getTarget()->getNonExecBundlePadding())
     Str.write_hex(I);
   Str << "\n";
   for (CfgNode *Node : Nodes)
     Node->emit(this);
   Str << "\n";
 }
 
 // Dumps the IR with an optional introductory message.
 void Cfg::dump(const IceString &Message) {
   if (!Ctx->isVerbose())
     return;
   Ostream &Str = Ctx->getStrDump();
   if (!Message.empty())
     Str << "================ " << Message << " ================\n";
   setCurrentNode(getEntryNode());
   // Print function name+args
   if (getContext()->isVerbose(IceV_Instructions)) {
     Str << "define ";
-    if (getInternal())
+    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";
   }
@@ skipping 12 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (getContext()->isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice