mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-16 16:26:36 +00:00
Code Issues Projects Releases Wiki Activity

[compiler-rt] Revise IDE folder structure (#89753)

Browse Source 
Update the folder titles for targets in the monorepository that have not
seen taken care of for some time. These are the folders that targets are
organized in Visual Studio and XCode
(`set_property(TARGET <target> PROPERTY FOLDER "<title>")`)
when using the respective CMake's IDE generator.

 * Ensure that every target is in a folder
 * Use a folder hierarchy with each LLVM subproject as a top-level folder
 * Use consistent folder names between subprojects
 * When using target-creating functions from AddLLVM.cmake, automatically
deduce the folder. This reduces the number of
`set_property`/`set_target_property`, but are still necessary when
`add_custom_target`, `add_executable`, `add_library`, etc. are used. A
LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's
root CMakeLists.txt.
This commit is contained in:
Michael Kruse 2024-06-04 09:26:45 +02:00 committed by GitHub
parent 83fbe56f28
commit a35ac42fac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 45 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/CMakeLists.txt
View File

@ -4,6 +4,7 @@
# based on the ability of the host toolchain to target various platforms. # based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.20.0) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
if (TARGET intrinsics_gen) if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it # Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE. # under the appropriate folder in an IDE.
set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
endif() endif()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)

19
compiler-rt/cmake/Modules/AddCompilerRT.cmake
View File

@ -91,7 +91,7 @@ function(add_compiler_rt_object_libraries name)
${extra_cflags_${libname}} ${target_flags}) ${extra_cflags_${libname}} ${target_flags})
set_property(TARGET ${libname} APPEND PROPERTY set_property(TARGET ${libname} APPEND PROPERTY
COMPILE_DEFINITIONS ${LIB_DEFS}) COMPILE_DEFINITIONS ${LIB_DEFS})
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
if(APPLE) if(APPLE)
set_target_properties(${libname} PROPERTIES set_target_properties(${libname} PROPERTIES
OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}") OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}")
@ -110,7 +110,7 @@ endmacro()
function(add_compiler_rt_component name) function(add_compiler_rt_component name)
add_custom_target(${name}) add_custom_target(${name})
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Components")
if(COMMAND runtime_register_component) if(COMMAND runtime_register_component)
runtime_register_component(${name}) runtime_register_component(${name})
endif() endif()
@ -293,7 +293,7 @@ function(add_compiler_rt_runtime name type)
if(NOT TARGET ${LIB_PARENT_TARGET}) if(NOT TARGET ${LIB_PARENT_TARGET})
add_custom_target(${LIB_PARENT_TARGET}) add_custom_target(${LIB_PARENT_TARGET})
set_target_properties(${LIB_PARENT_TARGET} PROPERTIES set_target_properties(${LIB_PARENT_TARGET} PROPERTIES
FOLDER "Compiler-RT Misc") FOLDER "Compiler-RT/Runtimes")
endif() endif()
endif() endif()
@ -348,6 +348,7 @@ function(add_compiler_rt_runtime name type)
DEPENDS ${sources_${libname}} DEPENDS ${sources_${libname}}
COMMENT "Building C object ${output_file_${libname}}") COMMENT "Building C object ${output_file_${libname}}")
add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}}) add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Codegenning")
install(FILES ${output_dir_${libname}}/${output_file_${libname}} install(FILES ${output_dir_${libname}}/${output_file_${libname}}
DESTINATION ${install_dir_${libname}} DESTINATION ${install_dir_${libname}}
${COMPONENT_OPTION}) ${COMPONENT_OPTION})
@ -370,8 +371,8 @@ function(add_compiler_rt_runtime name type)
add_dependencies(${libname} ${LIB_DEPS}) add_dependencies(${libname} ${LIB_DEPS})
endif() endif()
set_target_properties(${libname} PROPERTIES set_target_properties(${libname} PROPERTIES
OUTPUT_NAME ${output_name_${libname}}) OUTPUT_NAME ${output_name_${libname}}
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") FOLDER "Compiler-RT/Runtimes")
if(LIB_LINK_LIBS) if(LIB_LINK_LIBS)
target_link_libraries(${libname} PRIVATE ${LIB_LINK_LIBS}) target_link_libraries(${libname} PRIVATE ${LIB_LINK_LIBS})
endif() endif()
@ -538,7 +539,7 @@ function(add_compiler_rt_test test_suite test_name arch)
DEPENDS ${TEST_DEPS} DEPENDS ${TEST_DEPS}
) )
add_custom_target(T${test_name} DEPENDS "${output_bin}") add_custom_target(T${test_name} DEPENDS "${output_bin}")
set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT/Tests")
# Make the test suite depend on the binary. # Make the test suite depend on the binary.
add_dependencies(${test_suite} T${test_name}) add_dependencies(${test_suite} T${test_name})
@ -558,7 +559,7 @@ macro(add_compiler_rt_resource_file target_name file_name component)
COMPONENT ${component}) COMPONENT ${component})
add_dependencies(${component} ${target_name}) add_dependencies(${component} ${target_name})
set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT/Resources")
endmacro() endmacro()
macro(add_compiler_rt_script name) macro(add_compiler_rt_script name)
@ -607,7 +608,7 @@ macro(add_custom_libcxx name prefix)
COMMENT "Clobbering ${name} build directories" COMMENT "Clobbering ${name} build directories"
USES_TERMINAL USES_TERMINAL
) )
set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT/Metatargets")
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp
@ -619,7 +620,7 @@ macro(add_custom_libcxx name prefix)
add_custom_target(${name}-clobber add_custom_target(${name}-clobber
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp)
set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT/Metatargets")
set(PASSTHROUGH_VARIABLES set(PASSTHROUGH_VARIABLES
ANDROID ANDROID

4
compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
View File

@ -336,7 +336,7 @@ macro(darwin_add_builtin_library name suffix)
list(APPEND ${LIB_OS}_${suffix}_libs ${libname}) list(APPEND ${LIB_OS}_${suffix}_libs ${libname})
list(APPEND ${LIB_OS}_${suffix}_lipo_flags -arch ${arch} $<TARGET_FILE:${libname}>) list(APPEND ${LIB_OS}_${suffix}_lipo_flags -arch ${arch} $<TARGET_FILE:${libname}>)
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
endmacro() endmacro()
function(darwin_lipo_libs name) function(darwin_lipo_libs name)
@ -355,7 +355,7 @@ function(darwin_lipo_libs name)
) )
add_custom_target(${name} add_custom_target(${name}
DEPENDS ${LIB_OUTPUT_DIR}/lib${name}.a) DEPENDS ${LIB_OUTPUT_DIR}/lib${name}.a)
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Misc")
add_dependencies(${LIB_PARENT_TARGET} ${name}) add_dependencies(${LIB_PARENT_TARGET} ${name})
if(CMAKE_CONFIGURATION_TYPES) if(CMAKE_CONFIGURATION_TYPES)

4
compiler-rt/cmake/Modules/CompilerRTUtils.cmake
View File

@ -546,9 +546,9 @@ function(add_compiler_rt_install_targets name)
-DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_DO_STRIP=1
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake") -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
set_target_properties(install-${ARG_PARENT_TARGET} PROPERTIES set_target_properties(install-${ARG_PARENT_TARGET} PROPERTIES
FOLDER "Compiler-RT Misc") FOLDER "Compiler-RT/Installation")
set_target_properties(install-${ARG_PARENT_TARGET}-stripped PROPERTIES set_target_properties(install-${ARG_PARENT_TARGET}-stripped PROPERTIES
FOLDER "Compiler-RT Misc") FOLDER "Compiler-RT/Installation")
add_dependencies(install-compiler-rt install-${ARG_PARENT_TARGET}) add_dependencies(install-compiler-rt install-${ARG_PARENT_TARGET})
add_dependencies(install-compiler-rt-stripped install-${ARG_PARENT_TARGET}-stripped) add_dependencies(install-compiler-rt-stripped install-${ARG_PARENT_TARGET}-stripped)
endif() endif()

4
compiler-rt/cmake/base-config-ix.cmake
View File

@ -23,13 +23,13 @@ endif()
add_custom_target(compiler-rt ALL) add_custom_target(compiler-rt ALL)
add_custom_target(install-compiler-rt) add_custom_target(install-compiler-rt)
add_custom_target(install-compiler-rt-stripped) add_custom_target(install-compiler-rt-stripped)
set_property(TARGET compiler-rt PROPERTY FOLDER "Compiler-RT/Metatargets")
set_property( set_property(
TARGET TARGET
compiler-rt
install-compiler-rt install-compiler-rt
install-compiler-rt-stripped install-compiler-rt-stripped
PROPERTY PROPERTY
FOLDER "Compiler-RT Misc" FOLDER "Compiler-RT/Installation"
) )
# Setting these variables from an LLVM build is sufficient that compiler-rt can # Setting these variables from an LLVM build is sufficient that compiler-rt can

2
compiler-rt/include/CMakeLists.txt
View File

@ -79,7 +79,7 @@ endforeach( f )
add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files}) add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files})
add_dependencies(compiler-rt compiler-rt-headers) add_dependencies(compiler-rt compiler-rt-headers)
set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT/Resources")
# Install sanitizer headers. # Install sanitizer headers.
install(FILES ${SANITIZER_HEADERS} install(FILES ${SANITIZER_HEADERS}

8
compiler-rt/lib/asan/tests/CMakeLists.txt
View File

@ -118,15 +118,15 @@ append_list_if(COMPILER_RT_HAS_LIBLOG log ASAN_UNITTEST_NOINST_LIBS)
# Main AddressSanitizer unit tests. # Main AddressSanitizer unit tests.
add_custom_target(AsanUnitTests) add_custom_target(AsanUnitTests)
set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
# AddressSanitizer unit tests with dynamic runtime (on platforms where it's # AddressSanitizer unit tests with dynamic runtime (on platforms where it's
# not the default). # not the default).
add_custom_target(AsanDynamicUnitTests) add_custom_target(AsanDynamicUnitTests)
set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
# ASan benchmarks (not actively used now). # ASan benchmarks (not actively used now).
add_custom_target(AsanBenchmarks) add_custom_target(AsanBenchmarks)
set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT/Tests")
set(ASAN_NOINST_TEST_SOURCES set(ASAN_NOINST_TEST_SOURCES
${COMPILER_RT_GTEST_SOURCE} ${COMPILER_RT_GTEST_SOURCE}
@ -278,7 +278,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
add_library(${ASAN_TEST_RUNTIME} STATIC ${ASAN_TEST_RUNTIME_OBJECTS}) add_library(${ASAN_TEST_RUNTIME} STATIC ${ASAN_TEST_RUNTIME_OBJECTS})
set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-inline") add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-inline")
add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-calls" add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-calls"

2
compiler-rt/lib/builtins/CMakeLists.txt
View File

@ -750,7 +750,7 @@ set(ve_SOURCES
${GENERIC_SOURCES}) ${GENERIC_SOURCES})
add_custom_target(builtins) add_custom_target(builtins)
set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT/Metatargets")
option(COMPILER_RT_ENABLE_SOFTWARE_INT128 option(COMPILER_RT_ENABLE_SOFTWARE_INT128
"Enable the int128 builtin routines for all targets." "Enable the int128 builtin routines for all targets."

6
compiler-rt/lib/fuzzer/tests/CMakeLists.txt
View File

@ -12,10 +12,10 @@ if (APPLE)
endif() endif()
add_custom_target(FuzzerUnitTests) add_custom_target(FuzzerUnitTests)
set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
add_custom_target(FuzzedDataProviderUnitTests) add_custom_target(FuzzedDataProviderUnitTests)
set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS}) set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++) list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++)
@ -58,7 +58,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
${LIBFUZZER_TEST_RUNTIME_OBJECTS}) ${LIBFUZZER_TEST_RUNTIME_OBJECTS})
set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_LIBCXX_PATH AND

4
compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(GWP_ASAN_UNIT_TEST_HEADERS
harness.h) harness.h)
add_custom_target(GwpAsanUnitTests) add_custom_target(GwpAsanUnitTests)
set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
set(GWP_ASAN_UNITTEST_LINK_FLAGS set(GWP_ASAN_UNITTEST_LINK_FLAGS
${COMPILER_RT_UNITTEST_LINK_FLAGS} -ldl ${COMPILER_RT_UNITTEST_LINK_FLAGS} -ldl
@ -67,7 +67,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH)
set_target_properties(${GWP_ASAN_TEST_RUNTIME} PROPERTIES set_target_properties(${GWP_ASAN_TEST_RUNTIME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
set(GwpAsanTestObjects) set(GwpAsanTestObjects)
generate_compiler_rt_tests(GwpAsanTestObjects generate_compiler_rt_tests(GwpAsanTestObjects

4
compiler-rt/lib/interception/tests/CMakeLists.txt
View File

@ -81,7 +81,7 @@ macro(add_interceptor_lib library)
add_library(${library} STATIC ${ARGN}) add_library(${library} STATIC ${ARGN})
set_target_properties(${library} PROPERTIES set_target_properties(${library} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
endmacro() endmacro()
function(get_interception_lib_for_arch arch lib) function(get_interception_lib_for_arch arch lib)
@ -96,7 +96,7 @@ endfunction()
# Interception unit tests testsuite. # Interception unit tests testsuite.
add_custom_target(InterceptionUnitTests) add_custom_target(InterceptionUnitTests)
set_target_properties(InterceptionUnitTests PROPERTIES set_target_properties(InterceptionUnitTests PROPERTIES
FOLDER "Compiler-RT Tests") FOLDER "Compiler-RT/Tests")
# Adds interception tests for architecture. # Adds interception tests for architecture.
macro(add_interception_tests_for_arch arch) macro(add_interception_tests_for_arch arch)

4
compiler-rt/lib/memprof/tests/CMakeLists.txt
View File

@ -64,7 +64,7 @@ macro(add_memprof_tests_for_arch arch)
add_library(${MEMPROF_TEST_RUNTIME} STATIC ${MEMPROF_TEST_RUNTIME_OBJECTS}) add_library(${MEMPROF_TEST_RUNTIME} STATIC ${MEMPROF_TEST_RUNTIME_OBJECTS})
set_target_properties(${MEMPROF_TEST_RUNTIME} PROPERTIES set_target_properties(${MEMPROF_TEST_RUNTIME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
set(MEMPROF_TEST_OBJECTS) set(MEMPROF_TEST_OBJECTS)
generate_compiler_rt_tests(MEMPROF_TEST_OBJECTS generate_compiler_rt_tests(MEMPROF_TEST_OBJECTS
MemProfUnitTests "MemProf-${arch}-UnitTest" ${arch} MemProfUnitTests "MemProf-${arch}-UnitTest" ${arch}
@ -78,7 +78,7 @@ endmacro()
# MemProf unit tests testsuite. # MemProf unit tests testsuite.
add_custom_target(MemProfUnitTests) add_custom_target(MemProfUnitTests)
set_target_properties(MemProfUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(MemProfUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST MEMPROF_SUPPORTED_ARCH) if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST MEMPROF_SUPPORTED_ARCH)
# MemProf unit tests are only run on the host machine. # MemProf unit tests are only run on the host machine.
foreach(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH}) foreach(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH})

6
compiler-rt/lib/orc/tests/CMakeLists.txt
View File

@ -4,11 +4,11 @@ include_directories(..)
# Unit tests target. # Unit tests target.
add_custom_target(OrcRTUnitTests) add_custom_target(OrcRTUnitTests)
set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "OrcRT unittests") set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
# Testing tools target. # Testing tools target.
add_custom_target(OrcRTTools) add_custom_target(OrcRTTools)
set_target_properties(OrcRTTools PROPERTIES FOLDER "OrcRT tools") set_target_properties(OrcRTTools PROPERTIES FOLDER "Compiler-RT/Tools")
set(ORC_UNITTEST_CFLAGS set(ORC_UNITTEST_CFLAGS
# FIXME: This should be set for all unit tests. # FIXME: This should be set for all unit tests.
@ -22,7 +22,7 @@ function(add_orc_lib library)
add_library(${library} STATIC ${ARGN}) add_library(${library} STATIC ${ARGN})
set_target_properties(${library} PROPERTIES set_target_properties(${library} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
endfunction() endfunction()
function(get_orc_lib_for_arch arch lib) function(get_orc_lib_for_arch arch lib)

4
compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
View File

@ -143,7 +143,7 @@ macro(add_sanitizer_common_lib library)
add_library(${library} STATIC ${ARGN}) add_library(${library} STATIC ${ARGN})
set_target_properties(${library} PROPERTIES set_target_properties(${library} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
endmacro() endmacro()
function(get_sanitizer_common_lib_for_arch arch lib) function(get_sanitizer_common_lib_for_arch arch lib)
@ -157,7 +157,7 @@ endfunction()
# Sanitizer_common unit tests testsuite. # Sanitizer_common unit tests testsuite.
add_custom_target(SanitizerUnitTests) add_custom_target(SanitizerUnitTests)
set_target_properties(SanitizerUnitTests PROPERTIES FOLDER "Compiler-RT Tests") set_target_properties(SanitizerUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
# Adds sanitizer tests for architecture. # Adds sanitizer tests for architecture.
macro(add_sanitizer_tests_for_arch arch) macro(add_sanitizer_tests_for_arch arch)

2
compiler-rt/lib/stats/CMakeLists.txt
View File

@ -4,7 +4,7 @@ set(STATS_HEADERS
include_directories(..) include_directories(..)
add_custom_target(stats) add_custom_target(stats)
set_target_properties(stats PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(stats PROPERTIES FOLDER "Compiler-RT/Metatargets")
if(APPLE) if(APPLE)
set(STATS_LIB_FLAVOR SHARED) set(STATS_LIB_FLAVOR SHARED)

2
compiler-rt/lib/tsan/CMakeLists.txt
View File

@ -35,7 +35,7 @@ if(COMPILER_RT_LIBCXX_PATH AND
endforeach() endforeach()
add_custom_target(libcxx_tsan DEPENDS ${libcxx_tsan_deps}) add_custom_target(libcxx_tsan DEPENDS ${libcxx_tsan_deps})
set_target_properties(libcxx_tsan PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(libcxx_tsan PROPERTIES FOLDER "Compiler-RT/Metatargets")
endif() endif()
if(COMPILER_RT_INCLUDE_TESTS) if(COMPILER_RT_INCLUDE_TESTS)

2
compiler-rt/lib/tsan/dd/CMakeLists.txt
View File

@ -20,7 +20,7 @@ append_list_if(COMPILER_RT_HAS_LIBRT rt DD_LINKLIBS)
append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS)
add_custom_target(dd) add_custom_target(dd)
set_target_properties(dd PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(dd PROPERTIES FOLDER "Compiler-RT/Metatargets")
# Deadlock detector is currently supported on 64-bit Linux only. # Deadlock detector is currently supported on 64-bit Linux only.
if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID) if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID)

2
compiler-rt/lib/tsan/rtl/CMakeLists.txt
View File

@ -167,7 +167,7 @@ if(APPLE)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go
COMMENT "Checking TSan Go runtime..." COMMENT "Checking TSan Go runtime..."
VERBATIM) VERBATIM)
set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT/Misc")
else() else()
foreach(arch ${TSAN_SUPPORTED_ARCH}) foreach(arch ${TSAN_SUPPORTED_ARCH})
if(arch STREQUAL "x86_64") if(arch STREQUAL "x86_64")

4
compiler-rt/lib/xray/tests/CMakeLists.txt
View File

@ -1,7 +1,7 @@
include_directories(..) include_directories(..)
add_custom_target(XRayUnitTests) add_custom_target(XRayUnitTests)
set_target_properties(XRayUnitTests PROPERTIES FOLDER "XRay unittests") set_target_properties(XRayUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
# Sanity check XRAY_ALL_SOURCE_FILES_ABS_PATHS # Sanity check XRAY_ALL_SOURCE_FILES_ABS_PATHS
list(LENGTH XRAY_ALL_SOURCE_FILES_ABS_PATHS XASFAP_LENGTH) list(LENGTH XRAY_ALL_SOURCE_FILES_ABS_PATHS XASFAP_LENGTH)
@ -34,7 +34,7 @@ function(add_xray_lib library)
add_library(${library} STATIC ${ARGN}) add_library(${library} STATIC ${ARGN})
set_target_properties(${library} PROPERTIES set_target_properties(${library} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
FOLDER "Compiler-RT Runtime tests") FOLDER "Compiler-RT/Tests/Runtime")
endfunction() endfunction()
function(get_xray_lib_for_arch arch lib) function(get_xray_lib_for_arch arch lib)

1
compiler-rt/test/CMakeLists.txt
View File

@ -113,6 +113,7 @@ endif()
# introduce a rule to run to run all of them. # introduce a rule to run to run all of them.
get_property(LLVM_COMPILER_RT_LIT_DEPENDS GLOBAL PROPERTY LLVM_COMPILER_RT_LIT_DEPENDS) get_property(LLVM_COMPILER_RT_LIT_DEPENDS GLOBAL PROPERTY LLVM_COMPILER_RT_LIT_DEPENDS)
add_custom_target(compiler-rt-test-depends) add_custom_target(compiler-rt-test-depends)
set_target_properties(compiler-rt-test-depends PROPERTIES FOLDER "Compiler-RT/Tests")
if(LLVM_COMPILER_RT_LIT_DEPENDS) if(LLVM_COMPILER_RT_LIT_DEPENDS)
add_dependencies(compiler-rt-test-depends ${LLVM_COMPILER_RT_LIT_DEPENDS}) add_dependencies(compiler-rt-test-depends ${LLVM_COMPILER_RT_LIT_DEPENDS})
endif() endif()

3
compiler-rt/test/asan/CMakeLists.txt
View File

@ -174,7 +174,6 @@ add_lit_testsuite(check-asan "Running the AddressSanitizer tests"
${ASAN_TESTSUITES} ${ASAN_TESTSUITES}
${exclude_from_check_all} ${exclude_from_check_all}
DEPENDS ${ASAN_TEST_DEPS}) DEPENDS ${ASAN_TEST_DEPS})
set_target_properties(check-asan PROPERTIES FOLDER "Compiler-RT Misc")
if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME)
add_lit_testsuite(check-asan-dynamic add_lit_testsuite(check-asan-dynamic
@ -182,6 +181,4 @@ if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME)
${ASAN_DYNAMIC_TESTSUITES} ${ASAN_DYNAMIC_TESTSUITES}
${exclude_from_check_all.g} ${exclude_from_check_all.g}
DEPENDS ${ASAN_DYNAMIC_TEST_DEPS}) DEPENDS ${ASAN_DYNAMIC_TEST_DEPS})
set_target_properties(check-asan-dynamic
PROPERTIES FOLDER "Compiler-RT Misc")
endif() endif()

1
compiler-rt/test/asan_abi/CMakeLists.txt
View File

@ -78,4 +78,3 @@ add_lit_testsuite(check-asan-abi "Running the AddressSanitizerABI tests"
${ASAN_ABI_TESTSUITES} ${ASAN_ABI_TESTSUITES}
${exclude_from_check_all} ${exclude_from_check_all}
DEPENDS ${ASAN_ABI_TEST_DEPS}) DEPENDS ${ASAN_ABI_TEST_DEPS})
set_target_properties(check-asan-abi PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/builtins/CMakeLists.txt
View File

@ -113,4 +113,3 @@ endforeach()
add_lit_testsuite(check-builtins "Running the Builtins tests" add_lit_testsuite(check-builtins "Running the Builtins tests"
${BUILTINS_TESTSUITES} ${BUILTINS_TESTSUITES}
DEPENDS ${BUILTINS_TEST_DEPS}) DEPENDS ${BUILTINS_TEST_DEPS})
set_target_properties(check-builtins PROPERTIES FOLDER "Compiler-RT Misc")

3
compiler-rt/test/cfi/CMakeLists.txt
View File

@ -95,6 +95,3 @@ add_lit_target(check-cfi-and-supported "Running the cfi regression tests"
${CFI_TESTSUITES} ${CFI_TESTSUITES}
PARAMS check_supported=1 PARAMS check_supported=1
DEPENDS ${CFI_TEST_DEPS}) 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")

1
compiler-rt/test/dfsan/CMakeLists.txt
View File

@ -26,4 +26,3 @@ list(APPEND DFSAN_TEST_DEPS dfsan)
add_lit_testsuite(check-dfsan "Running the DataFlowSanitizer tests" add_lit_testsuite(check-dfsan "Running the DataFlowSanitizer tests"
${DFSAN_TESTSUITES} ${DFSAN_TESTSUITES}
DEPENDS ${DFSAN_TEST_DEPS}) DEPENDS ${DFSAN_TEST_DEPS})
set_target_properties(check-dfsan PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/fuzzer/CMakeLists.txt
View File

@ -89,7 +89,6 @@ if(LIBFUZZER_TESTSUITES)
add_lit_testsuite(check-fuzzer "Running libFuzzer tests" add_lit_testsuite(check-fuzzer "Running libFuzzer tests"
${LIBFUZZER_TESTSUITES} ${LIBFUZZER_TESTSUITES}
DEPENDS ${LIBFUZZER_TEST_DEPS}) DEPENDS ${LIBFUZZER_TEST_DEPS})
set_target_properties(check-fuzzer PROPERTIES FOLDER "Compiler-RT Tests")
endif() endif()
if (APPLE) if (APPLE)

1
compiler-rt/test/gwp_asan/CMakeLists.txt
View File

@ -39,5 +39,4 @@ if (COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_SCUDO_STANDALONE AND COMPILER_
add_lit_testsuite(check-gwp_asan "Running the GWP-ASan tests" add_lit_testsuite(check-gwp_asan "Running the GWP-ASan tests"
${GWP_ASAN_TESTSUITES} ${GWP_ASAN_TESTSUITES}
DEPENDS ${GWP_ASAN_TEST_DEPS}) DEPENDS ${GWP_ASAN_TEST_DEPS})
set_target_properties(check-gwp_asan PROPERTIES FOLDER "Compiler-RT Misc")
endif() endif()

2
compiler-rt/test/hwasan/CMakeLists.txt
View File

@ -33,7 +33,6 @@ add_lit_testsuite(check-hwasan "Running the HWAddressSanitizer tests"
DEPENDS ${HWASAN_TEST_DEPS} DEPENDS ${HWASAN_TEST_DEPS}
PARAMS "HWASAN_ENABLE_ALIASES=1" PARAMS "HWASAN_ENABLE_ALIASES=1"
) )
set_target_properties(check-hwasan PROPERTIES FOLDER "Compiler-RT Misc")
add_lit_testsuite(check-hwasan-lam add_lit_testsuite(check-hwasan-lam
"Running the HWAddressSanitizer tests with Intel LAM" "Running the HWAddressSanitizer tests with Intel LAM"
@ -42,4 +41,3 @@ add_lit_testsuite(check-hwasan-lam
PARAMS "HWASAN_ENABLE_ALIASES=0" PARAMS "HWASAN_ENABLE_ALIASES=0"
EXCLUDE_FROM_CHECK_ALL EXCLUDE_FROM_CHECK_ALL
) )
set_target_properties(check-hwasan-lam PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/interception/CMakeLists.txt
View File

@ -14,4 +14,3 @@ endif()
add_lit_testsuite(check-interception "Running the Interception tests" add_lit_testsuite(check-interception "Running the Interception tests"
${INTERCEPTION_TESTSUITES} ${INTERCEPTION_TESTSUITES}
DEPENDS ${INTERCEPTION_TEST_DEPS}) DEPENDS ${INTERCEPTION_TEST_DEPS})
set_target_properties(check-interception PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/lsan/CMakeLists.txt
View File

@ -48,4 +48,3 @@ append_list_if(COMPILER_RT_HAS_HWASAN hwasan LSAN_TEST_DEPS)
add_lit_testsuite(check-lsan "Running the LeakSanitizer tests" add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
${LSAN_TESTSUITES} ${LSAN_TESTSUITES}
DEPENDS ${LSAN_TEST_DEPS}) DEPENDS ${LSAN_TEST_DEPS})
set_target_properties(check-lsan PROPERTIES FOLDER "Compiler-RT Misc")

3
compiler-rt/test/memprof/CMakeLists.txt
View File

@ -59,12 +59,9 @@ endif()
add_lit_testsuite(check-memprof "Running the MemProfiler tests" add_lit_testsuite(check-memprof "Running the MemProfiler tests"
${MEMPROF_TESTSUITES} ${MEMPROF_TESTSUITES}
DEPENDS ${MEMPROF_TEST_DEPS}) DEPENDS ${MEMPROF_TEST_DEPS})
set_target_properties(check-memprof PROPERTIES FOLDER "Compiler-RT Misc")
add_lit_testsuite(check-memprof-dynamic add_lit_testsuite(check-memprof-dynamic
"Running the MemProfiler tests with dynamic runtime" "Running the MemProfiler tests with dynamic runtime"
${MEMPROF_DYNAMIC_TESTSUITES} ${MEMPROF_DYNAMIC_TESTSUITES}
${exclude_from_check_all.g} ${exclude_from_check_all.g}
DEPENDS ${MEMPROF_DYNAMIC_TEST_DEPS}) DEPENDS ${MEMPROF_DYNAMIC_TEST_DEPS})
set_target_properties(check-memprof-dynamic
PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/metadata/CMakeLists.txt
View File

@ -16,5 +16,4 @@ if(CAN_TARGET_x86_64)
add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests" add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests"
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${METADATA_TEST_DEPS}) DEPENDS ${METADATA_TEST_DEPS})
set_target_properties(check-sanmd PROPERTIES FOLDER "Compiler-RT Misc")
endif() endif()

1
compiler-rt/test/msan/CMakeLists.txt
View File

@ -55,4 +55,3 @@ add_lit_testsuite(check-msan "Running the MemorySanitizer tests"
${MSAN_TESTSUITES} ${MSAN_TESTSUITES}
DEPENDS ${MSAN_TEST_DEPS} DEPENDS ${MSAN_TEST_DEPS}
) )
set_target_properties(check-msan PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/orc/CMakeLists.txt
View File

@ -32,4 +32,3 @@ endif()
add_lit_testsuite(check-orc-rt "Running the ORC runtime tests" add_lit_testsuite(check-orc-rt "Running the ORC runtime tests"
${ORC_TESTSUITES} ${ORC_TESTSUITES}
DEPENDS ${ORC_TEST_DEPS}) DEPENDS ${ORC_TEST_DEPS})
set_target_properties(check-orc-rt PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/profile/CMakeLists.txt
View File

@ -33,4 +33,3 @@ endforeach()
add_lit_testsuite(check-profile "Running the profile tests" add_lit_testsuite(check-profile "Running the profile tests"
${PROFILE_TESTSUITES} ${PROFILE_TESTSUITES}
DEPENDS ${PROFILE_TEST_DEPS}) DEPENDS ${PROFILE_TEST_DEPS})
set_target_properties(check-profile PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/safestack/CMakeLists.txt
View File

@ -27,4 +27,3 @@ configure_lit_site_cfg(
add_lit_testsuite(check-safestack "Running the SafeStack tests" add_lit_testsuite(check-safestack "Running the SafeStack tests"
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${SAFESTACK_TEST_DEPS}) DEPENDS ${SAFESTACK_TEST_DEPS})
set_target_properties(check-safestack PROPERTIES FOLDER "Compiler-RT Misc")

2
compiler-rt/test/sanitizer_common/CMakeLists.txt
View File

@ -114,6 +114,4 @@ if(SANITIZER_COMMON_TESTSUITES)
add_lit_testsuite(check-sanitizer "Running sanitizer_common tests" add_lit_testsuite(check-sanitizer "Running sanitizer_common tests"
${SANITIZER_COMMON_TESTSUITES} ${SANITIZER_COMMON_TESTSUITES}
DEPENDS ${SANITIZER_COMMON_TEST_DEPS}) DEPENDS ${SANITIZER_COMMON_TEST_DEPS})
set_target_properties(check-sanitizer PROPERTIES FOLDER
"Compiler-RT Misc")
endif() endif()

1
compiler-rt/test/shadowcallstack/CMakeLists.txt
View File

@ -18,4 +18,3 @@ endforeach()
add_lit_testsuite(check-shadowcallstack "Running the ShadowCallStack tests" add_lit_testsuite(check-shadowcallstack "Running the ShadowCallStack tests"
${SHADOWCALLSTACK_TESTSUITES} ${SHADOWCALLSTACK_TESTSUITES}
DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS}) DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS})
set_target_properties(check-shadowcallstack PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/tsan/CMakeLists.txt
View File

@ -137,5 +137,4 @@ if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME)
${TSAN_DYNAMIC_TESTSUITES} ${TSAN_DYNAMIC_TESTSUITES}
EXCLUDE_FROM_CHECK_ALL EXCLUDE_FROM_CHECK_ALL
DEPENDS ${TSAN_DYNAMIC_TEST_DEPS}) DEPENDS ${TSAN_DYNAMIC_TEST_DEPS})
set_target_properties(check-tsan-dynamic PROPERTIES FOLDER "Compiler-RT Misc")
endif() endif()

2
compiler-rt/test/ubsan/CMakeLists.txt
View File

@ -133,5 +133,3 @@ endif()
add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests" add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests"
${UBSAN_TESTSUITES} ${UBSAN_TESTSUITES}
DEPENDS ${UBSAN_TEST_DEPS}) DEPENDS ${UBSAN_TEST_DEPS})
set_target_properties(check-ubsan PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/ubsan_minimal/CMakeLists.txt
View File

@ -21,4 +21,3 @@ endforeach()
add_lit_testsuite(check-ubsan-minimal "Running UndefinedBehaviorSanitizerMinimal tests" add_lit_testsuite(check-ubsan-minimal "Running UndefinedBehaviorSanitizerMinimal tests"
${UBSAN_TESTSUITES} ${UBSAN_TESTSUITES}
DEPENDS ${UBSAN_TEST_DEPS}) DEPENDS ${UBSAN_TEST_DEPS})
set_target_properties(check-ubsan-minimal PROPERTIES FOLDER "Compiler-RT Misc")

1
compiler-rt/test/xray/CMakeLists.txt
View File

@ -29,4 +29,3 @@ endif()
add_lit_testsuite(check-xray "Running the XRay tests" add_lit_testsuite(check-xray "Running the XRay tests"
${XRAY_TESTSUITES} ${XRAY_TESTSUITES}
DEPENDS ${XRAY_TEST_DEPS}) DEPENDS ${XRAY_TEST_DEPS})
set_target_properties(check-xray PROPERTIES FOLDER "Compiler-RT Misc")