Subzero, MIPS32: Cross-testing enabled for MIPS32

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from szbuild import LinkNonsfi
 from utils import FindBaseNaCl, GetObjcopyCmd, get_sfi_string, shellcmd
 
 def main():
     """Builds a cross-test binary for comparing Subzero and llc translation.
 
     Each --test argument is compiled once by llc and once by Subzero.  C/C++
     tests are first compiled down to PNaCl bitcode using pnacl-clang and
     pnacl-opt.  The --prefix argument ensures that symbol names are different
     between the two object files, to avoid linking errors.
 
     There is also a --driver argument that specifies the C/C++ file that calls
     the test functions with a variety of interesting inputs and compares their
     results.
 
     """
     # arch_map maps a Subzero target string to TargetInfo (e.g., triple).
     arch_map = { 'x8632': targets.X8632Target,
                  'x8664': targets.X8664Target,
-                 'arm32': targets.ARM32Target }
+                 'arm32': targets.ARM32Target,
+                 'mips32': targets.MIPS32Target}
     arch_sz_flags = { 'x8632': [],
                       'x8664': [],
                       # For ARM, test a large stack offset as well. +/- 4095 is
                       # the limit, so test somewhere near that boundary.
-                      'arm32': ['--test-stack-extra', '4084']
+                      'arm32': ['--test-stack-extra', '4084'],
+                      'mips32': ['--test-stack-extra', '4084']
     }
     arch_llc_flags_extra = {
         # Use sse2 instructions regardless of input -mattr
         # argument to avoid differences in (undefined) behavior of
         # converting NaN to int.
         'x8632': ['-mattr=sse2'],
         'x8664': ['-mattr=sse2'],
         'arm32': [],
+        'mips32':[],
     }
     desc = 'Build a cross-test that compares Subzero and llc translation.'
     argparser = argparse.ArgumentParser(description=desc)
     argparser.add_argument('--test', required=True, action='append',
                            metavar='TESTFILE_LIST',
                            help='List of C/C++/.ll files with test functions')
     argparser.add_argument('--driver', required=True,
                            metavar='DRIVER',
                            help='Driver program')
     argparser.add_argument('--target', required=False, default='x8632',
                            choices=arch_map.keys(),
                            metavar='TARGET',
                            help='Translation target architecture.' +
                                 ' Default %(default)s.')
     argparser.add_argument('-O', required=False, default='2', dest='optlevel',
                            choices=['m1', '-1', '0', '1', '2'],
                            metavar='OPTLEVEL',
                            help='Optimization level for llc and Subzero ' +
                                 '(m1 and -1 are equivalent).' +
                                 ' Default %(default)s.')
     argparser.add_argument('--clang-opt', required=False, default=True,
                            dest='clang_opt')
     argparser.add_argument('--mattr',  required=False, default='sse2',
                            dest='attr', choices=['sse2', 'sse4.1',
-                                                 'neon', 'hwdiv-arm'],
+                                                 'neon', 'hwdiv-arm',
+                                                 'base'],
                            metavar='ATTRIBUTE',
                            help='Target attribute. Default %(default)s.')
     argparser.add_argument('--sandbox', required=False, default=0, type=int,
                            dest='sandbox',
                            help='Use sandboxing. Default "%(default)s".')
     argparser.add_argument('--nonsfi', required=False, default=0, type=int,
                            dest='nonsfi',
                            help='Use Non-SFI mode. Default "%(default)s".')
     argparser.add_argument('--prefix', required=True,
                            metavar='SZ_PREFIX',
@@ skipping 82 matching lines @@
 
         # Each separately translated Subzero object file contains its own
         # definition of the __Sz_block_profile_info profiling symbol.  Avoid
         # linker errors (multiply defined symbol) by making all copies weak.
         # (This could also be done by Subzero if it supported weak symbol
         # definitions.)  This approach should be OK because cross tests are
         # currently the only situation where multiple translated files are
         # linked into the executable, but when PNaCl supports shared nexe
         # libraries, this would need to change.  (Note: the same issue applies
         # to the __Sz_revision symbol.)
-        shellcmd(['{bin}/{objcopy}'.format(bin=bindir, objcopy=GetObjcopyCmd()),
+        shellcmd(['{bin}/{objcopy}'.format(bin=bindir,
+                  objcopy=GetObjcopyCmd(args.target)),
                   '--weaken-symbol=__Sz_block_profile_info',
                   '--weaken-symbol=__Sz_revision',
                   '--strip-symbol=nacl_tp_tdb_offset',
                   '--strip-symbol=nacl_tp_tls_offset',
                   obj_sz])
         objs.append(obj_sz)
         shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
-                  '-arm-enable-dwarf-eh=1',
                   '-mtriple=' + triple,
                   '-externalize',
                   '-filetype=obj',
                   '-bitcode-format=llvm',
                   '-o=' + obj_llc,
                   bitcode] + llc_flags)
-        shellcmd(['{bin}/{objcopy}'.format(bin=bindir, objcopy=GetObjcopyCmd()),
-                  '--strip-symbol=nacl_tp_tdb_offset',
-                  '--strip-symbol=nacl_tp_tls_offset',
-                  obj_llc])
+        strip_syms = []

[Jim Stichnoth, 2016/09/23 05:29:11]

strip_syms = [] if args.target == 'mips32' else [ ... ]

[obucinac, 2016/09/23 13:22:03]

Done.

+        if args.target != 'mips32':
+          strip_syms += ['nacl_tp_tdb_offset', 'nacl_tp_tls_offset']
+        shellcmd(['{bin}/{objcopy}'.format(bin=bindir,
+                  objcopy=GetObjcopyCmd(args.target)),
+                  obj_llc] +
+                 [('--strip-symbol=' + sym) for sym in strip_syms])
         objs.append(obj_llc)
 
     # Add szrt_sb_${target}.o or szrt_native_${target}.o.
     if not args.nonsfi:
         objs.append((
                 '{root}/toolchain_build/src/subzero/build/runtime/' +
                 'szrt_{sb}_' + args.target + '.o'
                 ).format(root=nacl_root,
                          sb=get_sfi_string(args, 'sb', 'nonsfi', 'native')))
 
@@ skipping 38 matching lines @@
     shellcmd(['{bin}/pnacl-opt'.format(bin=bindir),
               '-pnacl-abi-simplify-preopt',
               '-pnacl-abi-simplify-postopt',
               '-pnaclabi-allow-debug-metadata',
               '-strip-metadata',
               '-strip-module-flags',
               '-strip-debug',
               '-disable-opt',
               bitcode_nonfinal, '-S', '-o', bitcode])
     shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
-              '-arm-enable-dwarf-eh=1',
               '-mtriple=' + triple,
               '-externalize',
               '-filetype=obj',
               '-O2',
               '-bitcode-format=llvm',
               '-o', obj_llc,
               bitcode] + llc_flags)
     if not args.sandbox and not args.nonsfi:
-        shellcmd(['{bin}/{objcopy}'.format(bin=bindir, objcopy=GetObjcopyCmd()),
+        shellcmd(['{bin}/{objcopy}'.format(bin=bindir,
+                  objcopy=GetObjcopyCmd(args.target)),
                   '--redefine-sym', '_start=_user_start',
                   obj_llc
                  ])
     objs.append(obj_llc)
     if args.nonsfi:
         LinkNonsfi(objs, os.path.join(args.dir, args.output), args.target)
     elif args.sandbox:
         LinkSandbox(objs, os.path.join(args.dir, args.output), args.target)
     else:
         LinkNative(objs, os.path.join(args.dir, args.output), args.target)
 
 if __name__ == '__main__':
     main()