Modify pnacl subzero to be able to read pnacl bitcode files.

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 576 matching lines @@
            cl::init(""), cl::value_desc("prefix"));
 static cl::opt<bool>
 DisableInternal("external",
                 cl::desc("Disable 'internal' linkage type for testing"));
 static cl::opt<bool>
 DisableTranslation("notranslate", cl::desc("Disable Subzero translation"));
 
 static cl::opt<bool> SubzeroTimingEnabled(
     "timing", cl::desc("Enable breakdown timing of Subzero translation"));
 
+cl::opt<NaClFileFormat>

[Jim Stichnoth, 2014/05/09 23:02:42]

Make this static for consistency with other cl::opt definitions.  (Though
actually, all the statics should probably be moved into an anonymous namespace.)

[Karl, 2014/05/14 19:31:27]

Done.

+InputFileFormat(
+    "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));
+
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv);
 
   // Parse the input LLVM IR file into a module.
   SMDiagnostic Err;
   Module *Mod;
 
   {
     Ice::Timer T;
-    Mod = ParseIRFile(IRFilename, Err, getGlobalContext());
+    Mod = NaClParseIRFile(IRFilename, InputFileFormat, Err, getGlobalContext());

[Jim Stichnoth, 2014/05/09 23:02:42]

Would it be possible to add a -bitcode-format=pnacl lit test?

[Karl, 2014/05/14 19:31:27]

Done.

 
     if (SubzeroTimingEnabled) {
       std::cerr << "[Subzero timing] IR Parsing: " << T.getElapsedSec()
                 << " sec\n";
     }
   }
 
   if (!Mod) {
     Err.print(argv[0], errs());
     return 1;
@@ skipping 29 matching lines @@
                 << " sec\n";
     }
 
     if (DisableTranslation) {
       Func->dump();
     }
   }
 
   return 0;
 }