Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge)

pydir/run-llvm2ice.py

 #!/usr/bin/env python2
 
 import argparse
 import itertools
 import os
 import re
 import subprocess
 import sys
+import tempfile
 
 from utils import shellcmd
 
 def main():
     """Run the llvm2ice compiler on an llvm file.
 
     Takes an llvm input file, freezes it into a pexe file, converts
     it to a Subzero program, and finally compiles it.
     """
     argparser = argparse.ArgumentParser(
@@ skipping 17 matching lines @@
                            help='Parse source directly into llvm IR ' +
                            '(without generating a pexe), then ' +
                            'convert to Subzero')
     argparser.add_argument(
         '--llvm2ice', required=False, default='./llvm2ice', metavar='LLVM2ICE',
         help="Subzero translator 'llvm2ice'")
     argparser.add_argument('--llvm-bin-path', required=False,
                            default=None, metavar='LLVM_BIN_PATH',
                            help='Path to LLVM executables ' +
                                 '(for building PEXE files)')
+    argparser.add_argument('--binutils-bin-path', required=False,
+                           default=None, metavar='BINUTILS_BIN_PATH',
+                           help='Path to Binutils executables')
+    argparser.add_argument('--assemble', required=False,
+                           action='store_true',
+                           help='Assemble the output')
+    argparser.add_argument('--disassemble', required=False,
+                           action='store_true',
+                           help='Disassemble the assembled output')
+    argparser.add_argument('--dis-flags', required=False,
+                           action='append', default=[],
+                           help='Add a disassembler flag')
     argparser.add_argument('--echo-cmd', required=False,
                            action='store_true',
                            help='Trace command that generates ICE instructions')
     argparser.add_argument('--args', '-a', nargs=argparse.REMAINDER,
                            default=[],
                            help='Remaining arguments are passed to llvm2ice')
 
     args = argparser.parse_args()
     llvm_bin_path = args.llvm_bin_path
+    binutils_bin_path = args.binutils_bin_path
     llfile = args.input
 
     if args.llvm and args.llvm_source:
       raise RuntimeError("Can't specify both '--llvm' and '--llvm-source'")
 
     if args.llvm_source and args.no_local_syms:
       raise RuntimeError("Can't specify both '--llvm-source' and " +
                          "'--no-local-syms'")
 
     cmd = []
@@ skipping 13 matching lines @@
       cmd += ['--bitcode-format=pnacl']
       if not args.no_local_syms:
         cmd += ['--allow-local-symbol-tables']
     if args.llvm or args.llvm_source:
       cmd += ['--build-on-read=0']
     else:
       cmd += ['--build-on-read=1']
     cmd += args.args
     if args.llvm_source:
       cmd += [llfile]
+    asm_temp = None
+    if args.assemble or args.disassemble:
+      # On windows we may need to close the file first before it can be
+      # re-opened by the other tools, so don't do delete-on-close,
+      # and instead manually delete.
+      asm_temp = tempfile.NamedTemporaryFile(delete=False)
+      asm_temp.close()
+    if args.assemble:
+      cmd += ['|', os.path.join(llvm_bin_path, 'llvm-mc'),
+              '-triple=i686-none-nacl',
+              '-filetype=obj', '-o', asm_temp.name]
+    if args.disassemble:
+      # Show wide instruction encodings, diassemble, and show relocs.
+      cmd += (['&&', os.path.join(binutils_bin_path, 'objdump')] +
+              args.dis_flags +
+              ['-w', '-d', '-r', '-Mintel', asm_temp.name])
 
     stdout_result = shellcmd(cmd, echo=args.echo_cmd)
     if not args.echo_cmd:
       sys.stdout.write(stdout_result)
+    if asm_temp:
+      os.remove(asm_temp.name)
 
 if __name__ == '__main__':
     main()