Subzero. ARM32. Enable hwdiv-arm crosstests.

pydir/crosstest_generator.py

 #!/usr/bin/env python2
 
 import argparse
+import collections
 import ConfigParser
 import os
 import shutil
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
 
 def Match(desc, includes, excludes, default_match):
   """Determines whether desc is a match against includes and excludes.
 
   'desc' is a set of attributes, and 'includes' and 'excludes' are lists of sets
   of attributes.
 
   If 'desc' matches any element from 'excludes', the result is False.
   Otherwise, if 'desc' matches any element from 'includes', the result is True.
   Otherwise, the 'default_match' value is returned.
   """
   for exclude in excludes:
     if exclude <= desc:
       return False
   for include in includes:
     if include <= desc:
       return True
   return default_match
 
 
-def RunNativePrefix(toolchain_root, target, run_cmd):
+def RunNativePrefix(toolchain_root, target, attr, run_cmd):
   """Returns a prefix for running an executable for the target.
 
   For example, we may be running an ARM or MIPS target executable on an
   x86 machine and need to use an emulator.
   """
   arch_map = { 'x8632' : '',
                'x8664' : '',
                'arm32' : os.path.join(toolchain_root, 'arm_trusted',
                                       'run_under_qemu_arm'),
              }
-  prefix = arch_map[target]
+  attr_map = collections.defaultdict(str, {
+      'arm32-neon': ' -cpu cortex-a9',
+      'arm32-hwdiv-arm': ' -cpu cortex-a15' })
+  prefix = arch_map[target] + attr_map[target + '-' + attr]
   return (prefix + ' ' + run_cmd) if prefix else run_cmd
 
 def NonsfiLoaderArch(target):
   """Returns the arch for the nonsfi_loader"""
   arch_map = { 'arm32' : 'arm',
                'x8632' : 'x86-32',
              }
   return arch_map[target]
 
 
@@ skipping 127 matching lines @@
               run_cmd_base = os.path.join(args.dir, exe)
               # Generate the run command.
               run_cmd = run_cmd_base
               if sb == 'sandbox':
                 run_cmd = '{root}/run.py -q '.format(root=root) + run_cmd
               elif sb == 'nonsfi':
                 run_cmd = (
                     '{root}/scons-out/opt-linux-{arch}/obj/src/nonsfi/' +
                     'loader/nonsfi_loader ').format(
                         root=root, arch=NonsfiLoaderArch(target)) + run_cmd
-                run_cmd = RunNativePrefix(args.toolchain_root, target, run_cmd)
+                run_cmd = RunNativePrefix(args.toolchain_root, target, attr,
+                                          run_cmd)
               else:
-                run_cmd = RunNativePrefix(args.toolchain_root, target, run_cmd)
+                run_cmd = RunNativePrefix(args.toolchain_root, target, attr,
+                                          run_cmd)
               if args.lit:
                 # Create a file to drive the lit test.
                 with open(run_cmd_base + '.xtest', 'w') as f:
                   f.write('# RUN: sh %s | FileCheck %s\n')
                   f.write('cd ' + crosstest_dir + ' && \\\n')
                   f.write(' '.join(cmp_cmd) + ' && \\\n')
                   f.write(run_cmd + '\n')
                   f.write('echo Recreate a failure using ' + __file__ +
                           ' --toolchain-root=' + args.toolchain_root +
                           ' --include=' + ','.join(desc) + '\n')
                   f.write('# CHECK: Failures=0\n')
               else:
                 if not args.no_compile:
                   shellcmd(cmp_cmd,
                            echo=args.verbose)
                 if (args.defer):
                   deferred_cmds.append(run_cmd)
                 else:
                   shellcmd(run_cmd, echo=True)
   for run_cmd in deferred_cmds:
     shellcmd(run_cmd, echo=True)
 
 if __name__ == '__main__':
   main()