ABI verifier: Add standalone tool pnacl-abicheck

tools/llc/llc.cpp

 //===-- llc.cpp - Implement the LLVM Native Code Generator ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This is the llc code generator driver. It provides a convenient
 // command-line interface for generating native assembly-language code
 // or C code, given LLVM bitcode.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/ADT/Triple.h"
+#include "llvm/Analysis/NaCl.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/Support/DataStream.h"  // @LOCALMOD
 #include "llvm/CodeGen/CommandFlags.h"
 #include "llvm/CodeGen/IntrinsicLowering.h" // @LOCALMOD
 #include "llvm/CodeGen/LinkAllAsmWriterComponents.h"
 #include "llvm/CodeGen/LinkAllCodegenComponents.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Module.h"
 #include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Pass.h"
@@ skipping 72 matching lines @@
 
 // The option below overlaps very much with bitcode streaming.
 // We keep it separate because it is still experimental and we want
 // to use it without changing the outside behavior which is especially
 // relevant for the sandboxed case.
 static cl::opt<bool>
 ReduceMemoryFootprint("reduce-memory-footprint",
   cl::desc("Aggressively reduce memory used by llc"),
   cl::init(false));
 
+static cl::opt<bool>
+ABIVerify("pnaclabi-verify",

[jvoung (off chromium), 2013/03/12 22:16:21]

Maybe have the PNaCl prefix in the variable name to match the commandline flag.

[Derek Schuff, 2013/03/13 21:51:01]

Done.

+  cl::desc("Verify PNaCl bitcode ABI before translating"),
+  cl::init(false));
 // @LOCALMOD-END
 
 // Determine optimization level.
 static cl::opt<char>
 OptLevel("O",
          cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
                   "(default = '-O2')"),
          cl::Prefix,
          cl::ZeroOrMore,
          cl::init(' '));
@@ skipping 219 matching lines @@
 #endif
     // @LOCALMOD-END
 
     mod = M.get();
     if (mod == 0) {
       Err.print(argv[0], errs());
       return 1;
     }
 
     // @LOCALMOD-BEGIN
+    if (ABIVerify) {
+      // Verify the module (but not the functions yet)
+      ModulePass* VerifyPass = createPNaClABIVerifyModulePass(true);

[jvoung (off chromium), 2013/03/12 22:16:21]

The Function pass is only added when __native_client__ isn't defined.  Perhaps
make the two consistent?

[Mark Seaborn, 2013/03/12 22:25:56]

Spacing should be " *"

[Derek Schuff, 2013/03/13 21:51:01]

Done.

[Derek Schuff, 2013/03/13 21:51:01]

Done.

+      VerifyPass->runOnModule(*mod);
+    }
 #if defined(__native_client__) && defined(NACL_SRPC)
     RecordMetadataForSrpc(*mod);
 
     // To determine if we should compile PIC or not, we needed to load at
     // least the metadata. Since we've already constructed the commandline,
     // we have to hack this in after commandline processing.
     if (mod->getOutputFormat() == Module::SharedOutputFormat) {
       RelocModel = Reloc::PIC_;
     }
     // Also set PIC_ for dynamic executables:
@@ skipping 188 matching lines @@
     }
     if (!StopAfter.empty()) {
       const PassInfo *PI = PR->getPassInfo(StopAfter);
       if (!PI) {
         errs() << argv[0] << ": stop-after pass is not registered.\n";
         return 1;
       }
       StopAfterID = PI->getTypeInfo();
     }
 
+    // Add the ABI verifier pass before the code emission passes.
+    if (ABIVerify)
+      PM->add(createPNaClABIVerifyFunctionsPass(true));
+
     // Ask the target to add backend passes as necessary.
     if (Target.addPassesToEmitFile(*PM, FOS, FileType, NoVerify,
                                    StartAfterID, StopAfterID)) {
       errs() << argv[0] << ": target does not support generation of this"
              << " file type!\n";
       return 1;
     }
 
     // Before executing passes, print the final values of the LLVM options.
     cl::PrintOptionValues();
@@ skipping 38 matching lines @@
 }
 
 #if !defined(NACL_SRPC)
 int
 main (int argc, char **argv) {
   return llc_main(argc, argv);
 }
 #else
 // main() is in nacl_file.cpp.
 #endif