Add Subzero to test scripts.

SConstruct

 #! -*- python -*-
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import atexit
 import json
 import os
 import platform
 import re
@@ skipping 251 matching lines @@
 def SetUpArgumentBits(env):
   BitFromArgument(env, 'bitcode', default=False,
     desc='We are building bitcode')
 
   BitFromArgument(env, 'nacl_clang', default=False,
     desc='Use the native nacl-clang newlib compiler instead of nacl-gcc')
 
   BitFromArgument(env, 'translate_fast', default=False,
     desc='When using pnacl TC (bitcode=1) use accelerated translation step')
 
+  BitFromArgument(env, 'use_sz', default=False,
+    desc='When using pnacl TC (bitcode=1) use Subzero for fast translation')
+
   BitFromArgument(env, 'built_elsewhere', default=False,
     desc='The programs have already been built by another system')
 
   BitFromArgument(env, 'skip_trusted_tests', default=False,
     desc='Only run untrusted tests - useful for translator testing'
       ' (also skips tests of the IRT itself')
 
   BitFromArgument(env, 'nacl_pic', default=False,
     desc='generate position indepent code for (P)NaCl modules')
 
@@ skipping 115 matching lines @@
     desc='EXPERIMENTAL: Compile validator code for testing within enuminsts')
 
   # PNaCl sanity checks
   if not env.Bit('bitcode'):
     pnacl_only_flags = ('minsfi',
                         'nonsfi_nacl',
                         'pnacl_generate_pexe',
                         'pnacl_unsandboxed',
                         'skip_nonstable_bitcode',
                         'translate_fast',
+                        'use_sz',
                         'use_sandboxed_translator')
 
     for flag_name in pnacl_only_flags:
       if env.Bit(flag_name):
         raise UserError('The option %r only makes sense when using the '
                         'PNaCl toolchain (i.e. with bitcode=1)'
                         % flag_name)
   else:
     pnacl_incompatible_flags = ('nacl_clang',
                                 'nacl_glibc')
@@ skipping 1403 matching lines @@
     # whether or not the IRT is used, etc.
     description_list = ['trusted',
                         env['TARGET_PLATFORM'].lower(),
                         env['TARGET_FULLARCH']]
     return ARGUMENTS.get('perf_prefix', '') + '_'.join(description_list)
   description_list = [env['TARGET_FULLARCH']]
   # Using a list to keep the order consistent.
   bit_to_description = [ ('tests_use_irt', ('with_irt', '')),
                          ('bitcode', ('pnacl', 'nnacl')),
                          ('translate_fast', ('fast', '')),
+                         ('use_sz', ('sz', '')),
                          ('nacl_glibc', ('glibc', 'newlib')),
                          ('nacl_static_link', ('static', 'dynamic')),
                          ]
   for (bit, (descr_yes, descr_no)) in bit_to_description:
     if env.Bit(bit):
       additional = descr_yes
     else:
       additional = descr_no
     if additional:
       description_list.append(additional)
@@ skipping 1288 matching lines @@
 if nacl_env.Bit('bitcode'):
   # passing -O when linking requests LTO, which does additional global
   # optimizations at link time
   nacl_env.Append(LINKFLAGS=['-O3'])
   if not nacl_env.Bit('nacl_glibc'):
     nacl_env.Append(LINKFLAGS=['-static'])
 
   if nacl_env.Bit('translate_fast'):
     nacl_env.Append(LINKFLAGS=['-Xlinker', '-translate-fast'])
     nacl_env.Append(TRANSLATEFLAGS=['-translate-fast'])
+  if nacl_env.Bit('use_sz'):
+    nacl_env.Append(TRANSLATEFLAGS=['--use-sz'])
 
   # With pnacl's clang base/ code uses the "override" keyword.
   nacl_env.Append(CXXFLAGS=['-Wno-c++11-extensions'])
   # Allow extraneous semicolons.  (Until these are removed.)
   # http://code.google.com/p/nativeclient/issues/detail?id=2861
   nacl_env.Append(CCFLAGS=['-Wno-extra-semi'])
   # Allow unused private fields.  (Until these are removed.)
   # http://code.google.com/p/nativeclient/issues/detail?id=2861
   nacl_env.Append(CCFLAGS=['-Wno-unused-private-field'])
   # native_client/src/nonsfi/linux/linux_syscall_structs.h uses designated
@@ skipping 22 matching lines @@
 
 # Since we don't build src/untrusted/pthread/nacl.scons in
 # nacl_irt_env, we must tell the IRT how to find the pthread.h header.
 nacl_irt_env.Append(CPPPATH='${MAIN_DIR}/src/untrusted/pthread')
 
 # Map certain flag bits to suffices on the build output.  This needs to
 # happen pretty early, because it affects any concretized directory names.
 target_variant_map = [
     ('bitcode', 'pnacl'),
     ('translate_fast', 'fast'),
+    ('use_sz', 'sz'),

[jvoung (off chromium), 2015/03/25 18:41:38]

maybe expand the directory name suffix to "subzero" =/

[Jim Stichnoth, 2015/03/25 20:13:17]

Done.

     ('nacl_pic', 'pic'),
     ('use_sandboxed_translator', 'sbtc'),
     ('nacl_glibc', 'glibc'),
     ('pnacl_generate_pexe', 'pexe'),
     ('nonsfi_nacl', 'nonsfi'),
     ('nacl_clang', 'clang'),
     ]
 for variant_bit, variant_suffix in target_variant_map:
   if nacl_env.Bit(variant_bit):
     nacl_env['TARGET_VARIANT'] += '-' + variant_suffix
@@ skipping 829 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')