Subzero: Basic Block Profiler.

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 67 matching lines @@
     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('--filetype', default='iasm', dest='filetype',
                            choices=['obj', 'asm', 'iasm'],
                            help='Output file type.  Default %(default)s.')
     argparser.add_argument('--sandbox', dest='sandbox', action='store_true',
                            help='Enabled sandboxing in the translator')
+    argparser.add_argument('--enable-block-profile', dest='enable_block_profile',

[Jim Stichnoth, 2015/06/08 23:45:31]

80-col

[John, 2015/06/09 15:36:17]

Done.

+                           action='store_true',
+                           help='Enabled Basic Block profiling.')

[Jim Stichnoth, 2015/06/08 23:45:30]

Enabled ==> Enable
and lowercase "basic block"

Also, can you fix "Enabled sandboxing" similarly? :)

[John, 2015/06/09 15:36:17]

Done.

     argparser.add_argument('--verbose', '-v', dest='verbose',
                            action='store_true',
                            help='Display some extra debugging 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.
@@ skipping 112 matching lines @@
         # Run pnacl-sz regardless of hybrid mode.
         shellcmd([pnacl_sz,
                   '-O' + opt_level,
                   '-bitcode-format=pnacl',
                   '-filetype=' + args.filetype,
                   '-o', obj_sz if args.filetype == 'obj' else asm_sz] +
                  (['-externalize',
                    '-ffunction-sections',
                    '-fdata-sections'] if hybrid else []) +
                  (['-sandbox'] if args.sandbox else []) +
+                 (['-enable-block-profile'] if args.enable_block_profile and not args.sandbox else []) +

[Jim Stichnoth, 2015/06/08 23:45:30]

80-col

[John, 2015/06/09 15:36:17]

Done.

                  args.sz_args +
                  [pexe],
                  echo=args.verbose)
         if args.filetype != 'obj':
             shellcmd((
                 'llvm-mc -triple={triple} -filetype=obj -o {obj} {asm}'
                 ).format(asm=asm_sz, obj=obj_sz,
                          triple='i686-nacl' if args.sandbox else 'i686'),
                      echo=args.verbose)
         if not args.sandbox:
@@ skipping 70 matching lines @@
             '--defsym=__Sz_AbsoluteZero=0 ' +
             '-o {exe}'
             ).format(gold=gold, linklib=linklib, partial=obj_partial, exe=exe,
                      root=nacl_root),
                  echo=args.verbose)
     else:
         shellcmd((
             '{ld} -m32 {partial} -o {exe} ' +
             # Keep the rest of this command line (except szrt_native_x8632.o) in
             # sync with RunHostLD() in pnacl-translate.py.
-            '{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
-            'x86-32-linux/lib/' +
-            '{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
+            '{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/' +

[Jim Stichnoth, 2015/06/08 23:45:31]

Please keep pnacl_newlib_raw instead of pnacl_newlib

[John, 2015/06/09 15:36:17]

Done.

+            'lib/{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_native_x8632.o -lpthread -lrt ' +
             '-Wl,--defsym=__Sz_AbsoluteZero=0'
             ).format(ld=linker, partial=obj_partial, exe=exe, root=nacl_root),
                  echo=args.verbose)
 
     # Put the extra verbose printing at the end.
     if args.verbose:
         print 'PATH: {path}'.format(path=path_addition)
         if hybrid:
             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()