Subzero: Allow extra args to be passed to llc and Subzero.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 65 matching lines @@
                            action='store',
                            help='Output executable. Default %(default)s.')
     argparser.add_argument('-O', default='2', dest='optlevel',
                            choices=['m1', '-1', '0', '1', '2'],
                            help='Optimization level ' +
                                 '(m1 and -1 are equivalent).' +
                                 ' Default %(default)s.')
     argparser.add_argument('--verbose', '-v', dest='verbose',
                            action='store_true',
                            help='Display some extra debugging output')
-    argparser.add_argument('--stats', dest='stats', action='store_true',
-                           help='Enable Subzero stats output')
+    argparser.add_argument('--sz', dest='sz_args', action='append', default=[],
+                           help='Extra arguments for Subzero')
+    argparser.add_argument('--llc', dest='llc_args', action='append',
+                           default=[], help='Extra arguments for llc')
 
 def main():
     """Create a hybrid translation from Subzero and llc.
 
     Takes a finalized pexe and builds a native executable as a
     hybrid of Subzero and llc translated bitcode.  Linker tricks are
     used to determine whether Subzero or llc generated symbols are
     used, on a per-symbol basis.
 
     By default, for every symbol, its llc version is used.  Subzero
@@ skipping 67 matching lines @@
         '{root}/toolchain_build/src/subzero/llvm2ice'
         ).format(root=nacl_root)
     llcbin = (
         '{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin/llc'
         ).format(root=nacl_root)
     opt_level = args.optlevel
 
     if args.force or NewerThanOrNotThere(pexe, obj_llc) or \
             NewerThanOrNotThere(llcbin, obj_llc):
         opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
-        shellcmd((
-            'pnacl-translate -ffunction-sections -c -arch x86-32-linux ' +
-            '-O{level} --pnacl-driver-append-LLC_FLAGS_EXTRA=-externalize ' +
-            '-o {obj} {pexe}'
-            ).format(level=opt_level_map[opt_level], obj=obj_llc, pexe=pexe),
+        shellcmd(['pnacl-translate',
+                  '-ffunction-sections',
+                  '-c',
+                  '-arch', 'x86-32-linux',
+                  '-O' + opt_level_map[opt_level],
+                  '--pnacl-driver-append-LLC_FLAGS_EXTRA=-externalize',
+                  '-o', obj_llc] +
+                 args.llc_args +
+                 [pexe],
                  echo=args.verbose)
         shellcmd((
             'objcopy --redefine-sym _start=_user_start {obj}'
             ).format(obj=obj_llc), echo=args.verbose)
         shellcmd((
             'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
             ).format(obj=obj_llc, sym=sym_llc), echo=args.verbose)
     if args.force or NewerThanOrNotThere(pexe, obj_sz) or \
             NewerThanOrNotThere(llvm2ice, obj_sz):
-        shellcmd((
-            '{l2i} -O{level} -bitcode-format=pnacl -disable-globals ' +
-            '-externalize -ffunction-sections {pexe} -o {asm}' +
-            (' --stats' if args.stats else '')
-            ).format(l2i=llvm2ice, level=opt_level, pexe=pexe, asm=asm_sz),
+        shellcmd([llvm2ice,
+                  '-O' + opt_level,
+                  '-bitcode-format=pnacl',
+                  '-disable-globals',
+                  '-externalize',
+                  '-ffunction-sections',
+                  '-o', asm_sz] +
+                 args.sz_args +
+                 [pexe],
                  echo=args.verbose)
         shellcmd((
             'llvm-mc -arch=x86 -x86-asm-syntax=intel -filetype=obj -o {obj} ' +
             '{asm}'
             ).format(asm=asm_sz, obj=obj_sz), echo=args.verbose)
         shellcmd((
             'objcopy --redefine-sym _start=_user_start {obj}'
             ).format(obj=obj_sz), echo=args.verbose)
         shellcmd((
             'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
@@ skipping 52 matching lines @@
     # Put the extra verbose printing at the end.
     if args.verbose:
         print 'PATH={path}'.format(path=os.environ['PATH'])
         print 'include={regex}'.format(regex=re_include_str)
         print 'exclude={regex}'.format(regex=re_exclude_str)
         print 'default_match={dm}'.format(dm=default_match)
         print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
 
 if __name__ == '__main__':
     main()