[cfi] Run tests with and without lld and thinlto.

[eugenis]

Summary

Run tests in all configurations:
(standalone, with devirtualization) * (gold, lld) * (lto, thinlto)

[pcc]

test/cfi/CMakeLists.txt

0–2

This part could be factored into a function at this point.

6

I think this will cause us to run the tests twice with lld on Windows.

[pcc]

test/cfi/cross-dso/lit.local.cfg

12

I thought you mentioned that cross-DSO already works for the most part under ThinLTO. If not, you can revert your change to stats.cpp.

test/cfi/lit.cfg

4

Why is this change necessary now?

test/lit.common.cfg

132

Are you using this feature name?

[eugenis]

test/cfi/cross-dso/lit.local.cfg

12

Good catch. That was meant to go in cross-dso/icall/lit.local.cfg.

test/cfi/lit.cfg

4

I can do it in a separate change if you want. Now we have a lot more different configs, so this is becoming important.

Failing Tests (20):

cfi :: cross-dso/icall/dlopen.cpp
cfi :: cross-dso/icall/dlopen.cpp
cfi :: cross-dso/icall/dlopen.cpp
cfi :: cross-dso/icall/dlopen.cpp
cfi :: cross-dso/icall/icall-from-dso.cpp
cfi :: cross-dso/icall/icall-from-dso.cpp
cfi :: cross-dso/icall/icall-from-dso.cpp
cfi :: cross-dso/icall/icall-from-dso.cpp
cfi :: cross-dso/icall/icall.cpp
cfi :: cross-dso/icall/icall.cpp
cfi :: cross-dso/icall/icall.cpp
cfi :: cross-dso/icall/icall.cpp
cfi :: cross-dso/stats.cpp
cfi :: cross-dso/stats.cpp
cfi :: cross-dso/stats.cpp
cfi :: cross-dso/stats.cpp
cfi :: icall/external-call.c
cfi :: icall/external-call.c
cfi :: icall/external-call.c
cfi :: icall/external-call.c

(^ without the change)

test/lit.common.cfg

132

Yes! Renamed to "lld-available".

[pcc]

LGTM

test/cfi/lit.cfg

4

I see, this is fine either as part of this change or as a separate change.

[eugenis]

r301016

test/asan/TestCases/Windows/fuse-lld.cc

 // If we have LLD, see that things more or less work.
 //
-// REQUIRES: lld
+// REQUIRES: lld-available
 //
 // FIXME: Use -fuse-ld=lld after the old COFF linker is removed.
 // FIXME: Test will fail until we add flags for requesting dwarf or cv.
 // RUNX: %clangxx_asan -O2 %s -o %t.exe -fuse-ld=lld -Wl,-debug
 // RUN: %clangxx_asan -c -O2 %s -o %t.o -g -gdwarf
 // RUN: lld-link %t.o -out:%t.exe -debug -nopdb -defaultlib:libcmt %asan_lib %asan_cxx_lib
 // RUN: not %run %t.exe 2>&1 | FileCheck %s
 

test/cfi/CMakeLists.txt

+set(CFI_TESTSUITES)
+
+macro (add_cfi_test_suites lld thinlto)
+  set(suffix)
+  if (${lld})
+    set(suffix ${suffix}-lld)
+  endif()
+  if (${thinlto})
+    set(suffix ${suffix}-thinlto)
+  endif()
+
+  set(CFI_TEST_USE_LLD ${lld})
+  set(CFI_TEST_USE_THINLTO ${thinlto})
+
   set(CFI_LIT_TEST_MODE Standalone)
+  set(CFI_TEST_CONFIG_SUFFIX -standalone${suffix})
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Standalone/lit.site.cfg
+    ${CMAKE_CURRENT_BINARY_DIR}/Standalone${suffix}/lit.site.cfg
     )
+  list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Standalone${suffix})
 
   set(CFI_LIT_TEST_MODE Devirt)
+  set(CFI_TEST_CONFIG_SUFFIX -devirt${suffix})
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Devirt/lit.site.cfg
+    ${CMAKE_CURRENT_BINARY_DIR}/Devirt${suffix}/lit.site.cfg
     )
+  list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Devirt${suffix})
+endmacro()
+
+if (APPLE)
+  add_cfi_test_suites(False False)
+  add_cfi_test_suites(False True)
+elif (WINDOWS)
+  add_cfi_test_suites(True False)
+  add_cfi_test_suites(True True)
+else()
+  add_cfi_test_suites(False False)
+  add_cfi_test_suites(False True)
+  if (COMPILER_RT_HAS_LLD)
+    add_cfi_test_suites(True False)
+    add_cfi_test_suites(True True)
+  endif()
+endif()
 
 set(CFI_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 list(APPEND CFI_TEST_DEPS
   ubsan
   stats
 )
 if(COMPILER_RT_HAS_CFI)
   list(APPEND CFI_TEST_DEPS cfi)
list(APPEND CFI_TEST_DEPS
       LLVMgold
     )
   endif()
   if(APPLE)
     list(APPEND CFI_TEST_DEPS
       LTO
     )
   endif()
-  if(WIN32 AND COMPILER_RT_HAS_LLD)
+  if(NOT APPLE AND COMPILER_RT_HAS_LLD)
     list(APPEND CFI_TEST_DEPS
       lld
     )
   endif()
 endif()
 
 add_lit_testsuite(check-cfi "Running the cfi regression tests"
-  ${CMAKE_CURRENT_BINARY_DIR}/Standalone
-  ${CMAKE_CURRENT_BINARY_DIR}/Devirt
+  ${CFI_TESTSUITES}
   DEPENDS ${CFI_TEST_DEPS})
 
 add_lit_target(check-cfi-and-supported "Running the cfi regression tests"
-  ${CMAKE_CURRENT_BINARY_DIR}/Standalone
-  ${CMAKE_CURRENT_BINARY_DIR}/Devirt
+  ${CFI_TESTSUITES}
   PARAMS check_supported=1
   DEPENDS ${CFI_TEST_DEPS})
 
 set_target_properties(check-cfi PROPERTIES FOLDER "Compiler-RT Misc")
 set_target_properties(check-cfi-and-supported PROPERTIES FOLDER "Compiler-RT Misc")

test/cfi/cross-dso/lit.local.cfg

 def getRoot(config):
   if not config.parent:
     return config
   return getRoot(config.parent)
 
 root = getRoot(config)
 
 if root.host_os not in ['Linux']:
   config.unsupported = True
+
+if root.use_thinlto:
+  config.unsupported = True

test/cfi/cross-dso/stats.cpp

 // RUN: %clangxx_cfi_dso -DSHARED_LIB -fPIC -g -fsanitize-stats -shared -o %t.so %s
 // RUN: %clangxx_cfi_dso -g -fsanitize-stats -o %t %s %t.so
 // RUN: env SANITIZER_STATS_PATH=%t.stats %t
 // RUN: sanstats %t.stats | FileCheck %s
 
+// CFI-icall is not implemented in thinlto mode => ".cfi" suffixes are missing
+// in sanstats output.
+// XFAIL: thinlto
+
 struct ABase {};
 
 struct A : ABase {
   virtual void vf() {}
   void nvf() {}
 };
 
 extern "C" void vcall(A *a);

test/cfi/icall/lit.local.cfg

 # The cfi-icall checker is only supported on x86 and x86_64 for now.
 if config.root.host_arch not in ['x86', 'x86_64']:
   config.unsupported = True
+
+if config.use_thinlto:
+  config.unsupported = True

test/cfi/lit.cfg

 import lit.formats
 import os
 
-config.name = 'cfi'
+config.name = 'cfi' + config.name_suffix
 config.suffixes = ['.c', '.cpp', '.test']
 config.test_source_root = os.path.dirname(__file__)
 
 clangxx = ' '.join([config.clang] + config.cxx_mode_flags)
 
 config.substitutions.append((r"%clang ", ' '.join([config.clang]) + ' '))
 config.substitutions.append((r"%clangxx ", clangxx + ' '))
 if config.lto_supported:
-  clang_cfi = ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-flto -fsanitize=cfi '])
+  clang_cfi = ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-fsanitize=cfi '])
 
   if config.cfi_lit_test_mode == "Devirt":
     config.available_features.add('devirt')
     clang_cfi += '-fwhole-program-vtables '
     config.substitutions.append((r"%expect_crash_unless_devirt ", ""))
   else:
     config.substitutions.append((r"%expect_crash_unless_devirt ", config.expect_crash))
 

test/cfi/lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
+config.name_suffix = "@CFI_TEST_CONFIG_SUFFIX@"
 config.cfi_lit_test_mode = "@CFI_LIT_TEST_MODE@"
+config.use_lld = @CFI_TEST_USE_LLD@
+config.use_thinlto = @CFI_TEST_USE_THINLTO@
 
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")

test/lit.common.cfg

 if not compiler_rt_debug:
   config.available_features.add('compiler-rt-optimized')
 
 sanitizer_can_use_cxxabi = getattr(config, 'sanitizer_can_use_cxxabi', True)
 if sanitizer_can_use_cxxabi:
   config.available_features.add('cxxabi')
 
 if config.has_lld:
+  config.available_features.add('have-lld')
+
+if config.use_lld:
   config.available_features.add('lld')
 
 if config.can_symbolize:
   config.available_features.add('can-symbolize')
 
 lit.util.usePlatformSdkOnDarwin(config, lit_config)
 
 if config.host_os == 'Darwin':

 if os.path.exists(sancovcc_path):
   config.available_features.add("has_sancovcc")
   config.substitutions.append( ("%sancovcc ", sancovcc_path) )
 
 def is_darwin_lto_supported():
   return os.path.exists(os.path.join(config.llvm_shlib_dir, 'libLTO.dylib'))
 
 def is_linux_lto_supported():
+  if config.use_lld:
+    return True
+
   if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
     return False
 
   ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'})
   ld_out = ld_cmd.stdout.read().decode()
   ld_cmd.wait()
 
   if not '-plugin' in ld_out:
     return False
 
   return True
 
 def is_windows_lto_supported():
   return os.path.exists(os.path.join(config.llvm_tools_dir, 'lld-link.exe'))
 
 if config.host_os == 'Darwin' and is_darwin_lto_supported():
   config.lto_supported = True
   config.lto_launch = ["env", "DYLD_LIBRARY_PATH=" + config.llvm_shlib_dir]
   config.lto_flags = []
 elif config.host_os == 'Linux' and is_linux_lto_supported():
   config.lto_supported = True
   config.lto_launch = []
+  if config.use_lld:
+    config.lto_flags = ["-fuse-ld=lld"]
+  else:
     config.lto_flags = ["-fuse-ld=gold"]
 elif config.host_os == 'Windows' and is_windows_lto_supported():
   config.lto_supported = True
   config.lto_launch = []
   # FIXME: Remove -nopdb when PDB writing is ready.
   config.lto_flags = ["-fuse-ld=lld -Wl,-nopdb"]
 else:
   config.lto_supported = False
 
 if config.lto_supported:
   config.available_features.add('lto')
+  if config.use_thinlto:
+    config.available_features.add('thinlto')
+    config.lto_flags += ["-flto=thin"]
+  else:
+    config.lto_flags += ["-flto"]
 
 # Ask llvm-config about assertion mode.
 try:
   llvm_config_cmd = subprocess.Popen(
       [os.path.join(config.llvm_tools_dir, 'llvm-config'), '--assertion-mode'],
       stdout = subprocess.PIPE,
       env=config.environment)
 except OSError:

test/lit.common.configured.in

 set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@")
 set_default("python_executable", "@PYTHON_EXECUTABLE@")
 set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@)
 set_default("compiler_rt_libdir", "@COMPILER_RT_LIBRARY_OUTPUT_DIR@")
 set_default("emulator", "@COMPILER_RT_EMULATOR@")
 set_default("sanitizer_can_use_cxxabi", @SANITIZER_CAN_USE_CXXABI_PYBOOL@)
 set_default("has_lld", @COMPILER_RT_HAS_LLD_PYBOOL@)
 set_default("can_symbolize", @CAN_SYMBOLIZE@)
+set_default("use_lld", False)
+set_default("use_thinlto", False)
 config.available_features.add('target-is-%s' % config.target_arch)
 
 # LLVM tools dir can be passed in lit parameters, so try to
 # apply substitution.
 try:
   config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
 except KeyError as e:
   key, = e.args
   lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Setup attributes common for all compiler-rt projects.
 lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg")

test/safestack/lit.cfg

 # Test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm', '.ll', '.test']
 
 # Add clang substitutions.
 config.substitutions.append( ("%clang_nosafestack ", config.clang + " -O0 -fno-sanitize=safe-stack ") )
 config.substitutions.append( ("%clang_safestack ", config.clang + " -O0 -fsanitize=safe-stack ") )
 
 if config.lto_supported:
-  config.substitutions.append((r"%clang_lto_safestack ", ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-flto -fsanitize=safe-stack '])))
+  config.substitutions.append((r"%clang_lto_safestack ", ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-fsanitize=safe-stack '])))
 
 # SafeStack tests are currently supported on Linux, FreeBSD and Darwin only.
 if config.host_os not in ['Linux', 'FreeBSD', 'Darwin']:
    config.unsupported = True
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
 # because the test fail due some runtime issue.
 if config.target_arch != 'aarch64':
   config.available_features.add('stable-runtime')