[CMake] runtimes test targets need to depend on LLVM tools

[george.karpenkov]

Summary

Many of the test cases in the runtimes require LLVM's testing tools, to facilitate this working as expected we need to have all the test targets in the runtimes depend on the LLVM testing tools used in the runtimes.

The list of tools I've added here may not be the full or minimally correct list of tools, but this patch is a step in the right direction.

[george.karpenkov]

The updated list should not be overridden.

[beanz]

LGTM.

[phosek]

@george.karpenkov I was just rebasing D32816 on top of your change and while running tests, I saw errors in CMake. So I tried building building ToT and I'm still seeing the same error:

CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "check-runtimes" does not exist.


CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "check-unwind" does not exist.


CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "check-cxxabi" does not exist.


CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "check-cxx" does not exist.


CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "check-compiler-rt" does not exist.


CMake Error at runtimes/CMakeLists.txt:311 (add_dependencies):
  The dependency target "asan" of target "runtimes-test-depends" does not
  exist.

Looking at the error and your change, I'm not sure if asan should be in the RUNTIME_TEST_DEPENDS list, since asan target is only built as part of the runtimes build and as such isn't available as a dependency until after you've done a runtimes build.

[george.karpenkov]

@phosek probably you are right, sorry.

Do you mean it brakes if you put compiler-rt into runtimes out of projects?

Somehow though it works for me, but I'm not entirely sure what sequence of invocations is causing the build of the contents of projects directory.
I've added that as I was trying to move libfuzzer to runtimes, and its tests require asan to be present.

In any case, removing the line.

[phosek]

asan target is going to be defined in SUB_COMPONENTS list in Components.cmake file which is generated by the runtimes build, but runtimes are only built after everything else (that's why Component.cmake is marked as CMAKE_CONFIGURE_DEPENDS to tell CMake that this file is modified during the build). So this is going work if you're doing incremental build (when Components.cmake has already been generated), but it'll break in the clean build. It's pretty convoluted and non-obvious and I wish there was a better solution for this, but I haven't came up with anything better yet.

[george.karpenkov]

@phosek somehow, ninja still worked for me on a clean checkout (with projects/compiler-rt added).
But I agree with you it can be a problem, maybe with your invocation.
The question how to run tests in runtimes which depend on sanitizers remain.

[beanz]

llvm/trunk/runtimes/CMakeLists.txt

256

This blob here actually ends up duplicating the targets. During configuration of the runtime targets we generate a file "Components.cmake" that lists the build and check targets for each runtime library, and that gets imported back into the top-level build via the SUB_COMPONENT_CHECK_TARGETS variable.

This is what causes the CMake configuration errors on builds, and we need to remove this.

[beanz]

llvm/trunk/runtimes/CMakeLists.txt

256

Nvm. Please disregard this. I mixed up this patch with a different one.

llvm/trunk/runtimes/CMakeLists.txt

foreach(entry ${runtimes})
     list(APPEND runtime_names ${projName})
   endforeach()
 
   if(runtimes)
 
     foreach(runtime_name ${runtime_names})
       list(APPEND extra_targets
         ${runtime_name}
-        install-${runtime_name}
-        check-${runtime_name})
+        install-${runtime_name})
+      if(LLVM_INCLUDE_TESTS)
+        list(APPEND test_targets check-${runtime_name})
+      endif()
     endforeach()
 
     if(LLVM_INCLUDE_TESTS)
-      set(test_targets runtimes-test-depends check-runtimes)
+      list(APPEND test_targets runtimes-test-depends check-runtimes)
       foreach(component ${SUB_COMPONENTS})
         list(APPEND SUB_COMPONENT_CHECK_TARGETS check-${component})
       endforeach()
     endif()
 
     # Create a runtimes target that uses this file as its top-level CMake file.
     # The runtimes target is a configuration of all the runtime libraries
     # together in a single CMake invocaiton.
if(runtimes)
     # that executes at LLVM configuration time to handle this case.
     if(NOT LLVM_BUILD_INSTRUMENTED AND CLANG_ENABLE_BOOTSTRAP)
       add_dependencies(clang-bootstrap-deps runtimes-configure)
     endif()
 
     if(LLVM_INCLUDE_TESTS)
       set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_DEPENDS runtimes-test-depends)
       set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_TARGETS check-runtimes)
+
+      set(RUNTIMES_TEST_DEPENDS
+          FileCheck
+          count
+          llvm-nm
+          llvm-objdump
+          llvm-xray
+          not
+          obj2yaml
+          sancov
+          sanstats
+          asan
+        )
+      foreach(target ${test_targets} ${SUB_COMPONENT_CHECK_TARGETS})
+        add_dependencies(${target} ${RUNTIMES_TEST_DEPENDS})
+      endforeach()
     endif()
   endif()
 endif()