Subzero: Add a convenience script for Spec2K. Add the --stats argument.

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 43 matching lines @@
     returned if neither the include nor the exclude regex matches.
     """
     if re_exclude.match(sym):
         # Always honor an explicit exclude before considering
         # includes.
         return False
     if re_include.match(sym):
         return True
     return default_match
 
+def AddOptionalArgs(argparser):
+    argparser.add_argument('--force', dest='force', action='store_true',
+                           help='Force all re-translations of the pexe')
+    argparser.add_argument('--include', '-i', default=[], dest='include',
+                           action='append',
+                           help='Subzero symbols to include ' +
+                                '(regex or line range)')
+    argparser.add_argument('--exclude', '-e', default=[], dest='exclude',
+                           action='append',
+                           help='Subzero symbols to exclude ' +
+                                '(regex or line range)')
+    argparser.add_argument('--output', '-o', default='a.out', dest='output',
+                           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')
+
 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
     symbols can be enabled by regular expressions on the symbol name,
@@ skipping 23 matching lines @@
     This script augments PATH so that various PNaCl and LLVM tools can
     be run.  These extra paths are within the native_client tree.
     When changes are made to these tools, copy them this way:
       cd native_client
       toolchain_build/toolchain_build_pnacl.py llvm_i686_linux \\
       --install=toolchain/linux_x86/pnacl_newlib
     """
     argparser = argparse.ArgumentParser(
         description='    ' + main.__doc__,
         formatter_class=argparse.RawTextHelpFormatter)
+    AddOptionalArgs(argparser)
     argparser.add_argument('pexe', help='Finalized pexe to translate')
-    argparser.add_argument('--force', dest='force', action='store_true',
-                           help='Force all re-translations of the pexe')
-    argparser.add_argument('--include', '-i', default=[], dest='include',
-                           action='append',
-                           help='Subzero symbols to include ' +
-                                '(regex or line range)')
-    argparser.add_argument('--exclude', '-e', default=[], dest='exclude',
-                           action='append',
-                           help='Subzero symbols to exclude ' +
-                                '(regex or line range)')
-    argparser.add_argument('--output', '-o', default='a.out', dest='output',
-                           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')
     args = argparser.parse_args()
+    pexe = args.pexe
+    exe = args.output
+    ProcessPexe(args, pexe, exe)
 
-    pexe = args.pexe
+def ProcessPexe(args, pexe, exe):
     [pexe_base, ext] = os.path.splitext(pexe)
     if ext != '.pexe':
         pexe_base = pexe
     pexe_base_unescaped = pexe_base
     pexe_base = pipes.quote(pexe_base)
     pexe = pipes.quote(pexe)
-    exe = args.output
 
     nacl_root = FindBaseNaCl()
     os.environ['PATH'] = (
         '{root}/toolchain/linux_x86/pnacl_newlib/bin{sep}' +
         '{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin{sep}' +
         '{path}'
         ).format(root=nacl_root, sep=os.pathsep, path=os.environ['PATH'])
     obj_llc = pexe_base + '.llc.o'
     obj_sz = pexe_base + '.sz.o'
     asm_sz = pexe_base + '.sz.s'
@@ skipping 25 matching lines @@
         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}'
+            '-externalize -ffunction-sections {pexe} -o {asm}' +
+            (' --stats' if args.stats else '')
             ).format(l2i=llvm2ice, level=opt_level, pexe=pexe, asm=asm_sz),
                  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((
@@ skipping 53 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()