From a35ac42fac88e82748a7e035821a1c6226be9ac0 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 4 Jun 2024 09:26:45 +0200 Subject: [PATCH] [compiler-rt] Revise IDE folder structure (#89753) 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 PROPERTY FOLDER "")`) 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. --- compiler-rt/CMakeLists.txt | 3 ++- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 19 ++++++++++--------- .../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++-- .../cmake/Modules/CompilerRTUtils.cmake | 4 ++-- compiler-rt/cmake/base-config-ix.cmake | 4 ++-- compiler-rt/include/CMakeLists.txt | 2 +- compiler-rt/lib/asan/tests/CMakeLists.txt | 8 ++++---- compiler-rt/lib/builtins/CMakeLists.txt | 2 +- compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++--- compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++-- .../lib/interception/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++--- .../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/stats/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/dd/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +- compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++-- compiler-rt/test/CMakeLists.txt | 1 + compiler-rt/test/asan/CMakeLists.txt | 3 --- compiler-rt/test/asan_abi/CMakeLists.txt | 1 - compiler-rt/test/builtins/CMakeLists.txt | 1 - compiler-rt/test/cfi/CMakeLists.txt | 3 --- compiler-rt/test/dfsan/CMakeLists.txt | 1 - compiler-rt/test/fuzzer/CMakeLists.txt | 1 - compiler-rt/test/gwp_asan/CMakeLists.txt | 1 - compiler-rt/test/hwasan/CMakeLists.txt | 2 -- compiler-rt/test/interception/CMakeLists.txt | 1 - compiler-rt/test/lsan/CMakeLists.txt | 1 - compiler-rt/test/memprof/CMakeLists.txt | 3 --- compiler-rt/test/metadata/CMakeLists.txt | 1 - compiler-rt/test/msan/CMakeLists.txt | 1 - compiler-rt/test/orc/CMakeLists.txt | 1 - compiler-rt/test/profile/CMakeLists.txt | 1 - compiler-rt/test/safestack/CMakeLists.txt | 1 - .../test/sanitizer_common/CMakeLists.txt | 2 -- .../test/shadowcallstack/CMakeLists.txt | 1 - compiler-rt/test/tsan/CMakeLists.txt | 1 - compiler-rt/test/ubsan/CMakeLists.txt | 2 -- compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 - compiler-rt/test/xray/CMakeLists.txt | 1 - 42 files changed, 45 insertions(+), 73 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 6ce451e3cac2..65063e0057bb 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -4,6 +4,7 @@ # based on the ability of the host toolchain to target various platforms. cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Compiler-RT") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD) if (TARGET intrinsics_gen) # Loading the llvm config causes this target to be imported so place it # 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() find_package(Python3 COMPONENTS Interpreter) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 9ec2eecf801b..298093462f80 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -91,7 +91,7 @@ function(add_compiler_rt_object_libraries name) ${extra_cflags_${libname}} ${target_flags}) set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS ${LIB_DEFS}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries") if(APPLE) set_target_properties(${libname} PROPERTIES OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}") @@ -110,7 +110,7 @@ endmacro() function(add_compiler_rt_component 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) runtime_register_component(${name}) endif() @@ -293,7 +293,7 @@ function(add_compiler_rt_runtime name type) if(NOT TARGET ${LIB_PARENT_TARGET}) add_custom_target(${LIB_PARENT_TARGET}) set_target_properties(${LIB_PARENT_TARGET} PROPERTIES - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Runtimes") endif() endif() @@ -348,6 +348,7 @@ function(add_compiler_rt_runtime name type) DEPENDS ${sources_${libname}} COMMENT "Building C object ${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}} DESTINATION ${install_dir_${libname}} ${COMPONENT_OPTION}) @@ -370,8 +371,8 @@ function(add_compiler_rt_runtime name type) add_dependencies(${libname} ${LIB_DEPS}) endif() set_target_properties(${libname} PROPERTIES - OUTPUT_NAME ${output_name_${libname}}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") + OUTPUT_NAME ${output_name_${libname}} + FOLDER "Compiler-RT/Runtimes") if(LIB_LINK_LIBS) target_link_libraries(${libname} PRIVATE ${LIB_LINK_LIBS}) endif() @@ -538,7 +539,7 @@ function(add_compiler_rt_test test_suite test_name arch) DEPENDS ${TEST_DEPS} ) 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. add_dependencies(${test_suite} T${test_name}) @@ -558,7 +559,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) COMPONENT ${component}) 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() macro(add_compiler_rt_script name) @@ -607,7 +608,7 @@ macro(add_custom_libcxx name prefix) COMMENT "Clobbering ${name} build directories" 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( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp @@ -619,7 +620,7 @@ macro(add_custom_libcxx name prefix) add_custom_target(${name}-clobber 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 ANDROID diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 1882893ad42c..6b4289baaf84 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -336,7 +336,7 @@ macro(darwin_add_builtin_library name suffix) list(APPEND ${LIB_OS}_${suffix}_libs ${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() function(darwin_lipo_libs name) @@ -355,7 +355,7 @@ function(darwin_lipo_libs name) ) add_custom_target(${name} 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}) if(CMAKE_CONFIGURATION_TYPES) diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index 8e331634b76b..9c7fe64d0bd3 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -546,9 +546,9 @@ function(add_compiler_rt_install_targets name) -DCMAKE_INSTALL_DO_STRIP=1 -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") 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 - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Installation") add_dependencies(install-compiler-rt install-${ARG_PARENT_TARGET}) add_dependencies(install-compiler-rt-stripped install-${ARG_PARENT_TARGET}-stripped) endif() diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake index 1e3317de80ac..87137b3d111b 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake @@ -23,13 +23,13 @@ endif() add_custom_target(compiler-rt ALL) add_custom_target(install-compiler-rt) add_custom_target(install-compiler-rt-stripped) +set_property(TARGET compiler-rt PROPERTY FOLDER "Compiler-RT/Metatargets") set_property( TARGET - compiler-rt install-compiler-rt install-compiler-rt-stripped PROPERTY - FOLDER "Compiler-RT Misc" + FOLDER "Compiler-RT/Installation" ) # Setting these variables from an LLVM build is sufficient that compiler-rt can diff --git a/compiler-rt/include/CMakeLists.txt b/compiler-rt/include/CMakeLists.txt index f10188a5f77b..d598a94ee2e2 100644 --- a/compiler-rt/include/CMakeLists.txt +++ b/compiler-rt/include/CMakeLists.txt @@ -79,7 +79,7 @@ endforeach( f ) add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files}) 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(FILES ${SANITIZER_HEADERS} diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index bda47bd7fd6a..7abd4c89ac6b 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -118,15 +118,15 @@ append_list_if(COMPILER_RT_HAS_LIBLOG log ASAN_UNITTEST_NOINST_LIBS) # Main AddressSanitizer unit tests. 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 # not the default). 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). 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 ${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}) set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES 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 "-calls" diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index f9611574a562..c72eb337109c 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -750,7 +750,7 @@ set(ve_SOURCES ${GENERIC_SOURCES}) 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 "Enable the int128 builtin routines for all targets." diff --git a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt index 8f5707c687ac..5086c0334b22 100644 --- a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt @@ -12,10 +12,10 @@ if (APPLE) endif() 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) -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}) 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}) set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND COMPILER_RT_LIBCXX_PATH AND diff --git a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt index 2ec332ea74c1..ca43ec2a94ac 100644 --- a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt @@ -35,7 +35,7 @@ set(GWP_ASAN_UNIT_TEST_HEADERS harness.h) 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 ${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 ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") set(GwpAsanTestObjects) generate_compiler_rt_tests(GwpAsanTestObjects diff --git a/compiler-rt/lib/interception/tests/CMakeLists.txt b/compiler-rt/lib/interception/tests/CMakeLists.txt index 0a235c662af3..f348c35cbe22 100644 --- a/compiler-rt/lib/interception/tests/CMakeLists.txt +++ b/compiler-rt/lib/interception/tests/CMakeLists.txt @@ -81,7 +81,7 @@ macro(add_interceptor_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endmacro() function(get_interception_lib_for_arch arch lib) @@ -96,7 +96,7 @@ endfunction() # Interception unit tests testsuite. add_custom_target(InterceptionUnitTests) set_target_properties(InterceptionUnitTests PROPERTIES - FOLDER "Compiler-RT Tests") + FOLDER "Compiler-RT/Tests") # Adds interception tests for architecture. macro(add_interception_tests_for_arch arch) diff --git a/compiler-rt/lib/memprof/tests/CMakeLists.txt b/compiler-rt/lib/memprof/tests/CMakeLists.txt index dc19ac5cd49a..0b5c302a4ce5 100644 --- a/compiler-rt/lib/memprof/tests/CMakeLists.txt +++ b/compiler-rt/lib/memprof/tests/CMakeLists.txt @@ -64,7 +64,7 @@ macro(add_memprof_tests_for_arch arch) add_library(${MEMPROF_TEST_RUNTIME} STATIC ${MEMPROF_TEST_RUNTIME_OBJECTS}) set_target_properties(${MEMPROF_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") set(MEMPROF_TEST_OBJECTS) generate_compiler_rt_tests(MEMPROF_TEST_OBJECTS MemProfUnitTests "MemProf-${arch}-UnitTest" ${arch} @@ -78,7 +78,7 @@ endmacro() # MemProf unit tests testsuite. 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) # MemProf unit tests are only run on the host machine. foreach(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH}) diff --git a/compiler-rt/lib/orc/tests/CMakeLists.txt b/compiler-rt/lib/orc/tests/CMakeLists.txt index e8f4c95b8a65..7039a32e6bc8 100644 --- a/compiler-rt/lib/orc/tests/CMakeLists.txt +++ b/compiler-rt/lib/orc/tests/CMakeLists.txt @@ -4,11 +4,11 @@ include_directories(..) # Unit tests target. add_custom_target(OrcRTUnitTests) -set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "OrcRT unittests") +set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # Testing tools target. 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 # FIXME: This should be set for all unit tests. @@ -22,7 +22,7 @@ function(add_orc_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endfunction() function(get_orc_lib_for_arch arch lib) diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt index a3efe6871508..2b4c15125263 100644 --- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt @@ -143,7 +143,7 @@ macro(add_sanitizer_common_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endmacro() function(get_sanitizer_common_lib_for_arch arch lib) @@ -157,7 +157,7 @@ endfunction() # Sanitizer_common unit tests testsuite. 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. macro(add_sanitizer_tests_for_arch arch) diff --git a/compiler-rt/lib/stats/CMakeLists.txt b/compiler-rt/lib/stats/CMakeLists.txt index 60c02556f80d..6df221a9a771 100644 --- a/compiler-rt/lib/stats/CMakeLists.txt +++ b/compiler-rt/lib/stats/CMakeLists.txt @@ -4,7 +4,7 @@ set(STATS_HEADERS include_directories(..) add_custom_target(stats) -set_target_properties(stats PROPERTIES FOLDER "Compiler-RT Misc") +set_target_properties(stats PROPERTIES FOLDER "Compiler-RT/Metatargets") if(APPLE) set(STATS_LIB_FLAVOR SHARED) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index c5ec6b0ddfd2..e192506f0c93 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -35,7 +35,7 @@ if(COMPILER_RT_LIBCXX_PATH AND endforeach() 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() if(COMPILER_RT_INCLUDE_TESTS) diff --git a/compiler-rt/lib/tsan/dd/CMakeLists.txt b/compiler-rt/lib/tsan/dd/CMakeLists.txt index a7359c573f14..1864d7a49fa6 100644 --- a/compiler-rt/lib/tsan/dd/CMakeLists.txt +++ b/compiler-rt/lib/tsan/dd/CMakeLists.txt @@ -20,7 +20,7 @@ append_list_if(COMPILER_RT_HAS_LIBRT rt DD_LINKLIBS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS) 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. if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID) diff --git a/compiler-rt/lib/tsan/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/rtl/CMakeLists.txt index 791c0596f65a..f40e72dbde1f 100644 --- a/compiler-rt/lib/tsan/rtl/CMakeLists.txt +++ b/compiler-rt/lib/tsan/rtl/CMakeLists.txt @@ -167,7 +167,7 @@ if(APPLE) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go COMMENT "Checking TSan Go runtime..." VERBATIM) - set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT/Misc") else() foreach(arch ${TSAN_SUPPORTED_ARCH}) if(arch STREQUAL "x86_64") diff --git a/compiler-rt/lib/xray/tests/CMakeLists.txt b/compiler-rt/lib/xray/tests/CMakeLists.txt index 4c7e92b6ecc3..6b9d9ced9a1d 100644 --- a/compiler-rt/lib/xray/tests/CMakeLists.txt +++ b/compiler-rt/lib/xray/tests/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(..) 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 list(LENGTH XRAY_ALL_SOURCE_FILES_ABS_PATHS XASFAP_LENGTH) @@ -34,7 +34,7 @@ function(add_xray_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endfunction() function(get_xray_lib_for_arch arch lib) diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 8805cc8f798f..5982260c2d85 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -113,6 +113,7 @@ endif() # introduce a rule to run to run all of them. get_property(LLVM_COMPILER_RT_LIT_DEPENDS GLOBAL PROPERTY LLVM_COMPILER_RT_LIT_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) add_dependencies(compiler-rt-test-depends ${LLVM_COMPILER_RT_LIT_DEPENDS}) endif() diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index d8c779c4ad6c..2d683e61d695 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -174,7 +174,6 @@ add_lit_testsuite(check-asan "Running the AddressSanitizer tests" ${ASAN_TESTSUITES} ${exclude_from_check_all} DEPENDS ${ASAN_TEST_DEPS}) -set_target_properties(check-asan PROPERTIES FOLDER "Compiler-RT Misc") if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) add_lit_testsuite(check-asan-dynamic @@ -182,6 +181,4 @@ if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) ${ASAN_DYNAMIC_TESTSUITES} ${exclude_from_check_all.g} DEPENDS ${ASAN_DYNAMIC_TEST_DEPS}) - set_target_properties(check-asan-dynamic - PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/asan_abi/CMakeLists.txt b/compiler-rt/test/asan_abi/CMakeLists.txt index 1114ed1b8279..51c798045911 100644 --- a/compiler-rt/test/asan_abi/CMakeLists.txt +++ b/compiler-rt/test/asan_abi/CMakeLists.txt @@ -78,4 +78,3 @@ add_lit_testsuite(check-asan-abi "Running the AddressSanitizerABI tests" ${ASAN_ABI_TESTSUITES} ${exclude_from_check_all} DEPENDS ${ASAN_ABI_TEST_DEPS}) -set_target_properties(check-asan-abi PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt index 7c0469a41efd..8fdcec6029a2 100644 --- a/compiler-rt/test/builtins/CMakeLists.txt +++ b/compiler-rt/test/builtins/CMakeLists.txt @@ -113,4 +113,3 @@ endforeach() add_lit_testsuite(check-builtins "Running the Builtins tests" ${BUILTINS_TESTSUITES} DEPENDS ${BUILTINS_TEST_DEPS}) -set_target_properties(check-builtins PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/cfi/CMakeLists.txt b/compiler-rt/test/cfi/CMakeLists.txt index e095e5f23efc..88def444d7dd 100644 --- a/compiler-rt/test/cfi/CMakeLists.txt +++ b/compiler-rt/test/cfi/CMakeLists.txt @@ -95,6 +95,3 @@ add_lit_target(check-cfi-and-supported "Running the cfi regression tests" ${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") diff --git a/compiler-rt/test/dfsan/CMakeLists.txt b/compiler-rt/test/dfsan/CMakeLists.txt index 14e431a0375b..98fe5665c3ce 100644 --- a/compiler-rt/test/dfsan/CMakeLists.txt +++ b/compiler-rt/test/dfsan/CMakeLists.txt @@ -26,4 +26,3 @@ list(APPEND DFSAN_TEST_DEPS dfsan) add_lit_testsuite(check-dfsan "Running the DataFlowSanitizer tests" ${DFSAN_TESTSUITES} DEPENDS ${DFSAN_TEST_DEPS}) -set_target_properties(check-dfsan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/fuzzer/CMakeLists.txt b/compiler-rt/test/fuzzer/CMakeLists.txt index 5bcb44757bae..8d29a4bea5f3 100644 --- a/compiler-rt/test/fuzzer/CMakeLists.txt +++ b/compiler-rt/test/fuzzer/CMakeLists.txt @@ -89,7 +89,6 @@ if(LIBFUZZER_TESTSUITES) add_lit_testsuite(check-fuzzer "Running libFuzzer tests" ${LIBFUZZER_TESTSUITES} DEPENDS ${LIBFUZZER_TEST_DEPS}) - set_target_properties(check-fuzzer PROPERTIES FOLDER "Compiler-RT Tests") endif() if (APPLE) diff --git a/compiler-rt/test/gwp_asan/CMakeLists.txt b/compiler-rt/test/gwp_asan/CMakeLists.txt index eda23cd93d6c..2a043cbae1c6 100644 --- a/compiler-rt/test/gwp_asan/CMakeLists.txt +++ b/compiler-rt/test/gwp_asan/CMakeLists.txt @@ -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" ${GWP_ASAN_TESTSUITES} DEPENDS ${GWP_ASAN_TEST_DEPS}) - set_target_properties(check-gwp_asan PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/hwasan/CMakeLists.txt b/compiler-rt/test/hwasan/CMakeLists.txt index 927d0d74bd6e..d086db1e386f 100644 --- a/compiler-rt/test/hwasan/CMakeLists.txt +++ b/compiler-rt/test/hwasan/CMakeLists.txt @@ -33,7 +33,6 @@ add_lit_testsuite(check-hwasan "Running the HWAddressSanitizer tests" DEPENDS ${HWASAN_TEST_DEPS} PARAMS "HWASAN_ENABLE_ALIASES=1" ) -set_target_properties(check-hwasan PROPERTIES FOLDER "Compiler-RT Misc") add_lit_testsuite(check-hwasan-lam "Running the HWAddressSanitizer tests with Intel LAM" @@ -42,4 +41,3 @@ add_lit_testsuite(check-hwasan-lam PARAMS "HWASAN_ENABLE_ALIASES=0" EXCLUDE_FROM_CHECK_ALL ) -set_target_properties(check-hwasan-lam PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/interception/CMakeLists.txt b/compiler-rt/test/interception/CMakeLists.txt index b8e2faa59fad..df69453c4fb4 100644 --- a/compiler-rt/test/interception/CMakeLists.txt +++ b/compiler-rt/test/interception/CMakeLists.txt @@ -14,4 +14,3 @@ endif() add_lit_testsuite(check-interception "Running the Interception tests" ${INTERCEPTION_TESTSUITES} DEPENDS ${INTERCEPTION_TEST_DEPS}) -set_target_properties(check-interception PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/lsan/CMakeLists.txt b/compiler-rt/test/lsan/CMakeLists.txt index e487f1a862c8..1c545a97d3ac 100644 --- a/compiler-rt/test/lsan/CMakeLists.txt +++ b/compiler-rt/test/lsan/CMakeLists.txt @@ -48,4 +48,3 @@ append_list_if(COMPILER_RT_HAS_HWASAN hwasan LSAN_TEST_DEPS) add_lit_testsuite(check-lsan "Running the LeakSanitizer tests" ${LSAN_TESTSUITES} DEPENDS ${LSAN_TEST_DEPS}) -set_target_properties(check-lsan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/memprof/CMakeLists.txt b/compiler-rt/test/memprof/CMakeLists.txt index fa6a4cd5f0b7..001245215201 100644 --- a/compiler-rt/test/memprof/CMakeLists.txt +++ b/compiler-rt/test/memprof/CMakeLists.txt @@ -59,12 +59,9 @@ endif() add_lit_testsuite(check-memprof "Running the MemProfiler tests" ${MEMPROF_TESTSUITES} DEPENDS ${MEMPROF_TEST_DEPS}) -set_target_properties(check-memprof PROPERTIES FOLDER "Compiler-RT Misc") add_lit_testsuite(check-memprof-dynamic "Running the MemProfiler tests with dynamic runtime" ${MEMPROF_DYNAMIC_TESTSUITES} ${exclude_from_check_all.g} DEPENDS ${MEMPROF_DYNAMIC_TEST_DEPS}) -set_target_properties(check-memprof-dynamic - PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/metadata/CMakeLists.txt b/compiler-rt/test/metadata/CMakeLists.txt index 4245937f3ce5..0a1c6a4ae9ee 100644 --- a/compiler-rt/test/metadata/CMakeLists.txt +++ b/compiler-rt/test/metadata/CMakeLists.txt @@ -16,5 +16,4 @@ if(CAN_TARGET_x86_64) add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${METADATA_TEST_DEPS}) - set_target_properties(check-sanmd PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/msan/CMakeLists.txt b/compiler-rt/test/msan/CMakeLists.txt index 9f784507c4ee..ff19c11971b2 100644 --- a/compiler-rt/test/msan/CMakeLists.txt +++ b/compiler-rt/test/msan/CMakeLists.txt @@ -55,4 +55,3 @@ add_lit_testsuite(check-msan "Running the MemorySanitizer tests" ${MSAN_TESTSUITES} DEPENDS ${MSAN_TEST_DEPS} ) -set_target_properties(check-msan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/orc/CMakeLists.txt b/compiler-rt/test/orc/CMakeLists.txt index 746b1e93b8d5..944753bf5c33 100644 --- a/compiler-rt/test/orc/CMakeLists.txt +++ b/compiler-rt/test/orc/CMakeLists.txt @@ -32,4 +32,3 @@ endif() add_lit_testsuite(check-orc-rt "Running the ORC runtime tests" ${ORC_TESTSUITES} DEPENDS ${ORC_TEST_DEPS}) -set_target_properties(check-orc-rt PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/profile/CMakeLists.txt b/compiler-rt/test/profile/CMakeLists.txt index 3170d65aaf91..a6d8a9684508 100644 --- a/compiler-rt/test/profile/CMakeLists.txt +++ b/compiler-rt/test/profile/CMakeLists.txt @@ -33,4 +33,3 @@ endforeach() add_lit_testsuite(check-profile "Running the profile tests" ${PROFILE_TESTSUITES} DEPENDS ${PROFILE_TEST_DEPS}) -set_target_properties(check-profile PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/safestack/CMakeLists.txt b/compiler-rt/test/safestack/CMakeLists.txt index 2746102bd89b..89ba6e74884b 100644 --- a/compiler-rt/test/safestack/CMakeLists.txt +++ b/compiler-rt/test/safestack/CMakeLists.txt @@ -27,4 +27,3 @@ configure_lit_site_cfg( add_lit_testsuite(check-safestack "Running the SafeStack tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${SAFESTACK_TEST_DEPS}) -set_target_properties(check-safestack PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index f2df8cec3549..edecc04d48c7 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -114,6 +114,4 @@ if(SANITIZER_COMMON_TESTSUITES) add_lit_testsuite(check-sanitizer "Running sanitizer_common tests" ${SANITIZER_COMMON_TESTSUITES} DEPENDS ${SANITIZER_COMMON_TEST_DEPS}) - set_target_properties(check-sanitizer PROPERTIES FOLDER - "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/shadowcallstack/CMakeLists.txt b/compiler-rt/test/shadowcallstack/CMakeLists.txt index 0333eb6fd6b7..0b9a658dd36e 100644 --- a/compiler-rt/test/shadowcallstack/CMakeLists.txt +++ b/compiler-rt/test/shadowcallstack/CMakeLists.txt @@ -18,4 +18,3 @@ endforeach() add_lit_testsuite(check-shadowcallstack "Running the ShadowCallStack tests" ${SHADOWCALLSTACK_TESTSUITES} DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS}) -set_target_properties(check-shadowcallstack PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index ebd8ddf639df..31cda53efd47 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -137,5 +137,4 @@ if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) ${TSAN_DYNAMIC_TESTSUITES} EXCLUDE_FROM_CHECK_ALL DEPENDS ${TSAN_DYNAMIC_TEST_DEPS}) - set_target_properties(check-tsan-dynamic PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 52052c80960c..d95f9ad649eb 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -133,5 +133,3 @@ endif() add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests" ${UBSAN_TESTSUITES} DEPENDS ${UBSAN_TEST_DEPS}) -set_target_properties(check-ubsan PROPERTIES FOLDER "Compiler-RT Misc") - diff --git a/compiler-rt/test/ubsan_minimal/CMakeLists.txt b/compiler-rt/test/ubsan_minimal/CMakeLists.txt index c2debeae07e8..e214397b492d 100644 --- a/compiler-rt/test/ubsan_minimal/CMakeLists.txt +++ b/compiler-rt/test/ubsan_minimal/CMakeLists.txt @@ -21,4 +21,3 @@ endforeach() add_lit_testsuite(check-ubsan-minimal "Running UndefinedBehaviorSanitizerMinimal tests" ${UBSAN_TESTSUITES} DEPENDS ${UBSAN_TEST_DEPS}) -set_target_properties(check-ubsan-minimal PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/xray/CMakeLists.txt b/compiler-rt/test/xray/CMakeLists.txt index 0c008b6ea557..fd2a2f43e195 100644 --- a/compiler-rt/test/xray/CMakeLists.txt +++ b/compiler-rt/test/xray/CMakeLists.txt @@ -29,4 +29,3 @@ endif() add_lit_testsuite(check-xray "Running the XRay tests" ${XRAY_TESTSUITES} DEPENDS ${XRAY_TEST_DEPS}) -set_target_properties(check-xray PROPERTIES FOLDER "Compiler-RT Misc")