Skip ABI verification for tests of __builtin_{frame,return}_address.

tests/toolchain/nacl.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('env')
 
 # force inclusion of entire library, so that we can validate it
 # NOTE: This approach does not work for -lc because of tons of
 #       undefined symbols which would have to be stubbed out
@@ skipping 23 matching lines @@
                             EXTRA_LINKFLAGS=DEP_LINKFLAGS,
                             LIBS=DEP_LIBS,
                             _LIBFLAGS='')
 node = env.CommandValidatorTestNacl('whole_archive_test.out',
                                     image=nexe)
 env.AddNodeToTestSuite(node,
                        ['toolchain_tests', 'small_tests'],
                        'run_whole_archive_test')
 
 
+# Test various intrinsics.
+
+# Some of the intrinsic tests cover intrinsics that we do not want to
+# support. For example, llvm.frameaddress. If that is the case, we will set
+# the 'stable_bitcode' field to False in the TESTS_TO_RUN list.
+if env.Bit('bitcode'):
+  nonstable_env = env.Clone()
+  nonstable_env.Append(LINKFLAGS=['--pnacl-disable-abi-check'])
+else:
+  nonstable_env = env
+
 TESTS_TO_RUN = [
-     # (src, exit_status, golden_file, cond),
+     # (src, exit_status, golden_file, stable_bitcode, cond),

[Mark Seaborn, 2013/05/09 21:26:37]

This is getting hard to read -- too many fields.

Maybe replace with function calls for readability?

def AddIntrinsicTest(src, exit_status, golden_file, stable_bitcode, cond=True):
  ...

AddIntrinsicTest('setlongjmp.c', '55', None, stable_bitcode=True)
...

[jvoung (off chromium), 2013/05/09 23:31:43]

Good idea!  Done.

      # The valus None for golden_file means no golden file, c.f.
      #  SConstruct::CommandTest()
-     ('setlongjmp.c', '55', None, True),
-     ('intrinsics.cc', '55', None, True),
-     ('float2.c', '0', True, True),
-     ('frame_addresses.c', '0', None, True),
-     # NOTE: this test uses bitcode asm's
-     ('llvm_math_intrinsics.c', '0', True, env.Bit('bitcode')),
-     # NOTE: this test uses bitcode asm's
-     ('llvm_bitmanip_intrinsics.c', '0', True, env.Bit('bitcode')),
-     ('llvm_atomic_intrinsics.c', '55', None, True),
+     ('setlongjmp.c', '55', None, True, True),
+     ('intrinsics.cc', '55', None, True, True),
+     ('float2.c', '0', True, True, True),
+     # Consider llvm.frameaddress and llvm.returnaddress non-stable,
+     # since we may want to hide return and stack addresses in the future.
+     ('frame_addresses.c', '0', None, False, True),
+     ('return_address.c', '55', None, False, True),
+     # Revisit stability of llvm math intrinsics.
+     ('llvm_math_intrinsics.c', '0', True, False, env.Bit('bitcode')),
+     # Revisit stability of llvm bitmanip intrinsics.
+     ('llvm_bitmanip_intrinsics.c', '0', True, False, env.Bit('bitcode')),
+     # Revisit stability of llvm atomic intrinsics.
+     ('llvm_atomic_intrinsics.c', '55', None, False, True),
 ]
 
-for src, exit_status, golden_file, cond in TESTS_TO_RUN:
+for src, exit_status, golden_file, stable_bitcode, cond in TESTS_TO_RUN:
   if not cond: continue
   name = src.split('.')[0]
   if golden_file == True:
     golden_file = env.File(name + '.stdout')
 
-  nexe = env.ComponentProgram(name, src, EXTRA_LIBS=['${NONIRT_LIBS}'])
+  if stable_bitcode:

[Mark Seaborn, 2013/05/09 21:26:37]

How about this to reduce duplication:
if stable_bitcode:
  test_env = env
else:
  test_env = nonstable_env
nexe = env.ComponentProgram(...)

or
test_env = {True: env, False: nonstable_env}[stable_bitcode]

if you prefer :-)

[jvoung (off chromium), 2013/05/09 23:31:43]

Reduced duplication.

+    nexe = env.ComponentProgram(name, src, EXTRA_LIBS=['${NONIRT_LIBS}'])
+  else:
+    nexe = nonstable_env.ComponentProgram(name,
+                                          src, EXTRA_LIBS=['${NONIRT_LIBS}'])
   node = env.CommandSelLdrTestNacl(name + '.out',
                                    nexe,
                                    exit_status=exit_status,
                                    stdout_golden=golden_file)
   env.AddNodeToTestSuite(node,
                          ['toolchain_tests','small_tests'],
                          'run_' + name + '_test')
 
 
 # initfini test
@@ skipping 57 matching lines @@
 bias_env.AddNodeToTestSuite(node, ['toolchain_tests', 'small_tests'],
                             'run_pthread_cleanup_test')
 
 
 # NOTE: the tests below break easily under valgrid and since
 #       they do not exercise malloc/free we exclude
 if env.IsRunningUnderValgrind():
   Return()
 
 
-nexe = env.ComponentProgram('return_address', 'return_address.c',
-                            EXTRA_LIBS=['${NONIRT_LIBS}'])
-node = env.CommandSelLdrTestNacl('return_address.out',
-                                 nexe,
-                                 exit_status='55')
-env.AddNodeToTestSuite(node,
-                       ['toolchain_tests', 'small_tests'],
-                       'run_return_address_test')
-
 # NOTE: we assume that the incoming env contains '-O2', '-fomit-frame-pointer'
 def MakeEnv(use_opts, use_frames):
   new_env = env.Clone()
   # AddBiasForPNaCl() is only needed for stack_frame.cc and eh_return.c.
   if new_env.Bit('bitcode'):
     new_env.AddBiasForPNaCl()
   new_env.FilterOut(CFLAGS=['-pedantic'])
   new_env.FilterOut(CCFLAGS=['-pedantic'])
   if use_frames:
     new_env.FilterOut(CFLAGS=['-fomit-frame-pointer'])
@@ skipping 193 matching lines @@
     env.AddNodeToTestSuite(node,
                            ['toolchain_tests', 'small_tests'],
                            'run_' + name + '_test')
   AddAlignedCodeTest('aligned_code',
                      env.ComponentProgram('aligned_code', ['aligned_code.c'],
                                           EXTRA_LIBS=['${NONIRT_LIBS}']))
   if not env.Bit('nacl_disable_shared'):
     AddAlignedCodeTest('aligned_code_lib',
                        env.NaClSharedLibrary('aligned_code_lib',
                                              ['aligned_code_lib.c']))