Add testing of generated (ARM) baseline decoders using hand-written decoders.

src/trusted/validator_arm/build.scons

 # -*- 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 os
 Import('env')
 
 # Android compiler cannot compile NDK C++ headers with these.
 if env.Bit('linux') and not env.Bit('android'):
@@ skipping 68 matching lines @@
               "simd_dp_2scalar",
               "simd_dp_2shift",
               "simd_dp_2misc",
               "simd_dp_1imm",
               "advanced_simd_element_or_structure_load_store_instructions",
               ]
 
 # The list of tables in armv7.table that should use the automatically generated,
 # actual decoders. This list is used to allow us to incrementally change over
 # tables, as they pass the appropriate tests.
-AUTO_GEN_TABLES = ["ARMv7",
-                   "data_processing_and_miscellaneous_instructions",
-                   "data_processing_register",
-                   "data_processing_register_shifted_register",
-                   "data_processing_immediate",
-                   "multiply_and_multiply_accumulate",
-                   "saturating_addition_and_subtraction",
-                   "halfword_multiply_and_multiply_accumulate",
-                   ]
+ACTUAL_GEN_TABLES = ["ARMv7",
+                     "data_processing_and_miscellaneous_instructions",
+                     "data_processing_register",
+                     "data_processing_register_shifted_register",
+                     "data_processing_immediate",
+                     "multiply_and_multiply_accumulate",
+                     "saturating_addition_and_subtraction",
+                     "halfword_multiply_and_multiply_accumulate",
+                     ]
+
+# The list of tables in armv7.table that should test the automatically
+# generated baseline decoders. This list is used to allow us to incrementally
+# switch tables over to using automatically generated baselines, as they
+# pass the appropriate tests.
+BASELINE_TEST_TABLES = ["data_processing_register"]
 
 # The separators to use for splitting up automatically generated actual
 # classes.
 AUTO_ACTUAL_SEPARATORS = ['VABD']
 AUTO_ACTUAL_H_FORMAT = 'arm32_decode_actuals_%s.h'
 AUTO_ACTUAL_CC_FORMAT = 'arm32_decode_actuals_%s.cc'
 
 # The separators to use for splitting up automatically generated baseline
 # classes.
 AUTO_BASELINE_SEPARATORS = ['SMM', 'VLD']
@@ skipping 62 matching lines @@
 if generate:
   gen_env.AlwaysBuild(gen_env.Alias('valgen', GEN_LIST))
   gen_env.AlwaysBuild(
     gen_env.Alias('valclean', action=[Delete(x) for x in GEN_LIST]))
 
 def _generate_source(filename, table=None):
   if not generate: return  # i.e. don't add source dependency.
   cl_args = GEN_CL_ARGS
   if table:
     cl_args += ' --table=' + table
-  for tbl in AUTO_GEN_TABLES:
+  for tbl in ACTUAL_GEN_TABLES:
     cl_args += ' --auto-actual=' + tbl
+  for tbl in BASELINE_TEST_TABLES:
+    cl_args += ' --test-base=' + tbl
   for sep in AUTO_ACTUAL_SEPARATORS:
     cl_args += ' --auto-actual-sep=' + sep
   for sep in AUTO_BASELINE_SEPARATORS:
     cl_args += ' --auto-baseline-sep=' + sep
   env.Command(target=_gen_file(filename),
               source=['armv7.table',
                       'generate_decoder.py',
                       'dgen_core.py',
                       'dgen_input.py',
                       'dgen_opt.py',
@@ skipping 97 matching lines @@
         stderr_golden = untrusted_env.File('testdata/empty_file'))
     untrusted_env.AddNodeToTestSuite(node, ['small_tests', 'validator_tests'],
                                      "run_arm_" + test,
                                      # TODO(jfb) Remove this, see issue #3217.
                                      is_broken=untrusted_env.Bit('windows'))
 
 gtest_env.ComponentLibrary('decoder_test_tools',
                            ['decoder_tester.cc',
                             'inst_classes_testers.cc',
                             'actual_vs_baseline.cc',
+                            'baseline_vs_baseline.cc',
                             'named_class_decoder.cc',
                             _gen_dir('arm32_decode_named.cc')] +
                            _gen_dirs(GenerateBaselineFiles(
                                AUTO_BASELINE_CC_FORMAT)))
 
 
 gtest_env.ComponentLibrary('arm_validator_tester',
                            ['validator_tests.cc'])
 
 # Do NOT name this program 'validator_tests' because this is the same name as
@@ skipping 47 matching lines @@
       EXTRA_LIBS=['decoder_test_tools', 'arm_validator_core'])
 
   decoder_test_node = gtest_env.CommandTest(
       'arm32_decode_' + tbl + 'tests.out',
       command=[decoder_tests_exe],
       scale_timeout=1000)
 
   gtest_env.AddNodeToTestSuite(decoder_test_node,
                                ['huge_tests', 'arm_decoder_tests'],
                                 'run_arm32_decode_' + tbl + '_tests')