Start adding an integrated assembler.

src/llvm2ice.cpp

 //===- subzero/src/llvm2ice.cpp - Driver for testing ----------------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a driver that uses LLVM capabilities to parse a
@@ skipping 90 matching lines @@
     "bitcode-format", cl::desc("Define format of input file:"),
     cl::values(clEnumValN(LLVMFormat, "llvm", "LLVM file (default)"),
                clEnumValN(PNaClFormat, "pnacl", "PNaCl bitcode file"),
                clEnumValEnd),
     cl::init(LLVMFormat));
 
 static cl::opt<bool>
 BuildOnRead("build-on-read",
             cl::desc("Build ICE instructions when reading bitcode"),
             cl::init(false));
+static cl::opt<bool>
+    DisableIntegratedAssembler("no-integrated-as",

[Jim Stichnoth, 2014/09/04 20:57:48]

Can the sense of this be reversed for better clarity?  E.g.

static cl::opt<bool> UseIntegratedAssembler("integrated-as", cl::init(true));
...
Flags.UseIntegratedAssembler = UseIntegratedAssembler;

[jvoung (off chromium), 2014/09/08 21:39:00]

Done.

I started with UseIntegratedAssembler cl::init(false), but that made testing
more difficult, since I needed to remember exactly which tests get affected and
add the flag to test.

+                               cl::desc("Do not use integrated assembler"));
 
 int main(int argc, char **argv) {
 
   cl::ParseCommandLineOptions(argc, argv);
 
   Ice::VerboseMask VMask = Ice::IceV_None;
   for (unsigned i = 0; i != VerboseList.size(); ++i)
     VMask |= VerboseList[i];
 
   std::ofstream Ofs;
@@ skipping 10 matching lines @@
   raw_os_ostream *Ls = new raw_os_ostream(LogFilename == "-" ? std::cout : Lfs);
   Ls->SetUnbuffered();
 
   Ice::ClFlags Flags;
   Flags.DisableInternal = DisableInternal;
   Flags.SubzeroTimingEnabled = SubzeroTimingEnabled;
   Flags.DisableTranslation = DisableTranslation;
   Flags.DisableGlobals = DisableGlobals;
   Flags.FunctionSections = FunctionSections;
   Flags.UseSandboxing = UseSandboxing;
+  Flags.UseIntegratedAssembler = !DisableIntegratedAssembler;
 
   Ice::GlobalContext Ctx(Ls, Os, VMask, TargetArch, OptLevel, TestPrefix,
                          Flags);
 
   if (BuildOnRead) {
     Ice::PNaClTranslator Translator(&Ctx, Flags);
     Translator.translate(IRFilename);
     return Translator.getErrorStatus();
   } else {
     // Parse the input LLVM IR file into a module.
@@ skipping 10 matching lines @@
     if (!Mod) {
       Err.print(argv[0], errs());
       return 1;
     }
 
     Ice::Converter Converter(Mod, &Ctx, Flags);
     Converter.convertToIce();
     return Converter.getErrorStatus();
   }
 }