[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

4–10

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

18

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

[pcc]

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

12 ↗

(On Diff #96022)

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 ↗

(On Diff #96022)

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 ↗

(On Diff #96022)

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

test/cfi/lit.cfg

4 ↗

(On Diff #96022)

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 ↗

(On Diff #96022)

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

[eugenis]

r301016

test/cfi/CMakeLists.txt

+set(CFI_TESTSUITES)
+
+set(CFI_LIT_TEST_USE_LLD 0)
 set(CFI_LIT_TEST_MODE Standalone)
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/Standalone/lit.site.cfg
-  )
+list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Standalone)
 
 set(CFI_LIT_TEST_MODE Devirt)
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/Devirt/lit.site.cfg
-  )
+list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Devirt)
+
+if(NOT APPLE AND COMPILER_RT_HAS_LLD)
+  set(CFI_LIT_TEST_USE_LLD 1)
+  set(CFI_LIT_TEST_MODE Standalone)
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Standalone-lld/lit.site.cfg
+  )
+  list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Standalone-lld)
+
+  set(CFI_LIT_TEST_MODE Devirt)
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Devirt-lld/lit.site.cfg
+  )
+  list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Devirt-lld)
+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/lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
 config.cfi_lit_test_mode = "@CFI_LIT_TEST_MODE@"
+config.lit_test_use_lld = @CFI_LIT_TEST_USE_LLD@
 
 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('lld')
 
 if config.can_symbolize:
   config.available_features.add('can-symbolize')
 
 lit.util.usePlatformSdkOnDarwin(config, lit_config)
 
 if config.host_os == 'Darwin':
   osx_version = (10, 0, 0)

 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.lit_test_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.lit_test_use_lld:
+    config.lto_flags = ["-fuse-ld=lld", "-Wl,-rpath,%T"]
+  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