https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89753
>From 19ef183fcfb44fa8b9bae34bdc8eafb8d2425722 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 23 Apr 2024 13:15:38 +0200 Subject: [PATCH 1/5] [compiler-rt] Revise IDE folder structure --- compiler-rt/CMakeLists.txt | 3 ++- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 21 ++++++++++--------- .../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, 46 insertions(+), 74 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 6ce451e3cac2e..65063e0057bbc 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 6e0d9dbff65a9..61c727b36bff3 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -89,7 +89,7 @@ function(add_compiler_rt_object_libraries name) "${libname}" MATCHES ".*\.osx.*") foreach(arch ${LIB_ARCHS_${libname}}) list(APPEND target_flags - "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") + "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") endforeach() endif() @@ -97,7 +97,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}}") @@ -116,7 +116,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/Misc") if(COMMAND runtime_register_component) runtime_register_component(${name}) endif() @@ -299,7 +299,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/Misc") endif() endif() @@ -354,6 +354,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/Runtimes") install(FILES ${output_dir_${libname}}/${output_file_${libname}} DESTINATION ${install_dir_${libname}} ${COMPONENT_OPTION}) @@ -376,8 +377,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() @@ -544,7 +545,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}) @@ -564,7 +565,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) @@ -613,7 +614,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/Misc") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp @@ -625,7 +626,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/Misc") set(PASSTHROUGH_VARIABLES ANDROID diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 1882893ad42c0..6b4289baaf847 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 a6c6ef93500d5..a6a8023a24f82 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -542,9 +542,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/Install") set_target_properties(install-${ARG_PARENT_TARGET}-stripped PROPERTIES - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Install") 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 1e3317de80ac3..93acec5c58331 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") set_property( TARGET - compiler-rt install-compiler-rt install-compiler-rt-stripped PROPERTY - FOLDER "Compiler-RT Misc" + FOLDER "Compiler-RT/Install" ) # 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 f10188a5f77b8..d598a94ee2e23 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 bda47bd7fd6a2..7abd4c89ac6bc 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 f9611574a562b..6a7bf6d93accc 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/Misc") 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 8f5707c687ac5..5086c0334b22b 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 2ec332ea74c13..ca43ec2a94ac4 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 0a235c662af3b..f348c35cbe22f 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 dc19ac5cd49a9..0b5c302a4ce5d 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 e8f4c95b8a657..7039a32e6bc8b 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 a3efe68715082..2b4c15125263a 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 60c02556f80d6..41026c4bac38d 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/Misc") if(APPLE) set(STATS_LIB_FLAVOR SHARED) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index c5ec6b0ddfd22..1ff3292446dcd 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/Misc") 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 a7359c573f142..b5bf5a88651a0 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/Misc") # 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 791c0596f65ab..f40e72dbde1f9 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 0a428b9a30b18..a6e0e9a6f00c8 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 edc007aaf477a..db415b2d3ad19 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -110,6 +110,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 d8c779c4ad6c5..2d683e61d6954 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 1114ed1b82793..51c7980459113 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 7c0469a41efd9..8fdcec6029a2a 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 e095e5f23efc4..88def444d7dda 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 14e431a0375b9..98fe5665c3ce5 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 5bcb44757bae4..8d29a4bea5f34 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 eda23cd93d6c3..2a043cbae1c64 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 927d0d74bd6ec..d086db1e386fc 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 b8e2faa59fad7..df69453c4fb4e 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 e487f1a862c81..1c545a97d3acc 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 3f0ba3812485d..65a78b489eb3c 100644 --- a/compiler-rt/test/memprof/CMakeLists.txt +++ b/compiler-rt/test/memprof/CMakeLists.txt @@ -46,12 +46,9 @@ endforeach() 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 4245937f3ce56..0a1c6a4ae9eef 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 9f784507c4ee1..ff19c11971b2d 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 746b1e93b8d5d..944753bf5c33c 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 3170d65aaf918..a6d8a9684508d 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 2746102bd89b3..89ba6e74884b1 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 f2df8cec3549b..edecc04d48c75 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 0333eb6fd6b76..0b9a658dd36ec 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 ebd8ddf639df9..31cda53efd47f 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 52052c80960c2..d95f9ad649ebf 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 c2debeae07e82..e214397b492dc 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 0c008b6ea5577..fd2a2f43e195d 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") >From c3edd260d7a917e120d02253083eb472e0985844 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 23 Apr 2024 13:27:20 +0200 Subject: [PATCH 2/5] [openmp] Revise IDE folder structure --- offload/unittests/CMakeLists.txt | 2 +- openmp/CMakeLists.txt | 1 + openmp/docs/CMakeLists.txt | 1 + openmp/runtime/cmake/LibompMicroTests.cmake | 5 +++++ openmp/runtime/src/CMakeLists.txt | 7 +++++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/offload/unittests/CMakeLists.txt b/offload/unittests/CMakeLists.txt index 73c87b708d25f..c818a3d985ba3 100644 --- a/offload/unittests/CMakeLists.txt +++ b/offload/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(LibomptUnitTests) -set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests/UnitTests") +set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests") function(add_libompt_unittest test_dirname) add_unittest(LibomptUnitTests ${test_dirname} ${ARGN}) diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index 95f2425db3ee6..daef2b77fd4dd 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "OpenMP") set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/openmp/docs/CMakeLists.txt b/openmp/docs/CMakeLists.txt index 1e4be31a6f609..4cb9fb486ff34 100644 --- a/openmp/docs/CMakeLists.txt +++ b/openmp/docs/CMakeLists.txt @@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating openmp doxygen documentation." VERBATIM) + set_target_properties(doxygen-openmp PROPERTIES FOLDER "OpenMP/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-openmp) diff --git a/openmp/runtime/cmake/LibompMicroTests.cmake b/openmp/runtime/cmake/LibompMicroTests.cmake index e8cc218af0c29..6fcde37259931 100644 --- a/openmp/runtime/cmake/LibompMicroTests.cmake +++ b/openmp/runtime/cmake/LibompMicroTests.cmake @@ -126,6 +126,7 @@ macro(libomp_test_touch_recipe test_touch_dir) endmacro() libomp_append(libomp_test_touch_env "KMP_VERSION=1") add_custom_target(libomp-test-touch DEPENDS ${libomp_test_touch_targets}) +set_target_properties(libomp-test-touch PROPERTIES FOLDER "OpenMP/Tests") if(WIN32) libomp_test_touch_recipe(test-touch-mt) libomp_test_touch_recipe(test-touch-md) @@ -135,6 +136,7 @@ endif() # test-relo add_custom_target(libomp-test-relo DEPENDS test-relo/.success) +set_target_properties(libomp-test-relo PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-relo/.success test-relo/readelf.log COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-relo @@ -146,6 +148,7 @@ add_custom_command( # test-execstack add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success) +set_target_properties(libomp-test-execstack PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-execstack/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-execstack @@ -157,6 +160,7 @@ add_custom_command( # test-instr add_custom_target(libomp-test-instr DEPENDS test-instr/.success) +set_target_properties(libomp-test-instr PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-instr/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-instr @@ -168,6 +172,7 @@ add_custom_command( # test-deps add_custom_target(libomp-test-deps DEPENDS test-deps/.success) +set_target_properties(libomp-test-deps PROPERTIES FOLDER "OpenMP/Tests") set(libomp_expected_library_deps) if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index a2468d04e60af..963f14bb7ffc2 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -171,6 +171,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS) # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled. if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING)) add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) + set_property(TARGET omp PROPERTY FOLDER "OpenMP/Libraries") # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS}) else() @@ -252,6 +253,7 @@ set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING # Create *.inc before compiling any sources # objects depend on : .inc files add_custom_target(libomp-needed-headers DEPENDS kmp_i18n_id.inc kmp_i18n_default.inc) +set_target_properties(libomp-needed-headers PROPERTIES FOLDER "OpenMP/Tablegenning") add_dependencies(omp libomp-needed-headers) # Windows specific build rules @@ -293,6 +295,7 @@ if(WIN32) set(LIBOMP_IMP_LIB_TARGET omp) set(LIBOMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.def) add_custom_target(libomp-needed-def-file DEPENDS ${LIBOMP_GENERATED_DEF_FILE}) + set_target_properties(libomp-needed-def-file PROPERTIES FOLDER "OpenMP/Tablegenning") add_dependencies(omp libomp-needed-def-file) # Create the main def file with ordinals to use for building the runtime dll to maintain backwards compatible exports order @@ -311,6 +314,7 @@ if(WIN32) # Create the auxiliary def file without ordinals to use for building the import library to import by name set(LIBOMPIMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.imp.def) add_custom_target(libompimp-needed-def-file DEPENDS ${LIBOMPIMP_GENERATED_DEF_FILE}) + set_target_properties(libompimp-needed-def-file PROPERTIES FOLDER "OpenMP/Resources") add_custom_command( OUTPUT ${LIBOMPIMP_GENERATED_DEF_FILE} COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/generate-def.pl ${LIBOMP_GDFLAGS} -D NAME=${LIBOMP_LIB_FILE} -D NOORDINALS @@ -320,6 +324,7 @@ if(WIN32) # while this merely generates an import library off a def file, CMAKE still requires it to have a "source" so feed it a dummy one, # making it a .txt which CMAKE will filter out from the librarian (a .cpp will make lib.exe punt trying to resolve the .def symbols) add_library(${LIBOMP_IMP_LIB_TARGET} STATIC kmp_dummy.txt) + set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES FOLDER "OpenMP/Resources") set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} STATIC_LIBRARY_OPTIONS "${CMAKE_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_BINARY_DIR}/${LIBOMPIMP_GENERATED_DEF_FILE}") @@ -355,6 +360,7 @@ elseif(${LIBOMP_FORTRAN_MODULES}) set(ADDITIONAL_Fortran_FLAGS "-fno-range-check") endif() add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod) + set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Misc") libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS) if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90) @@ -380,6 +386,7 @@ endif() # Micro test rules for after library has been built (cmake/LibompMicroTests.cmake) include(LibompMicroTests) add_custom_target(libomp-micro-tests) +set_target_properties(libomp-micro-tests PROPERTIES FOLDER "OpenMP/Tests") if(NOT ${MIC} AND NOT CMAKE_CROSSCOMPILING) add_dependencies(libomp-micro-tests libomp-test-touch) endif() >From 89854a94ddb1daf1228a8448624c0c9157685092 Mon Sep 17 00:00:00 2001 From: Michael Kruse <git...@meinersbur.de> Date: Tue, 30 Apr 2024 16:56:00 +0200 Subject: [PATCH 3/5] Undo spurious change Thanks @dtellenbach --- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 61c727b36bff3..902e26dcbb882 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -89,7 +89,7 @@ function(add_compiler_rt_object_libraries name) "${libname}" MATCHES ".*\.osx.*") foreach(arch ${LIB_ARCHS_${libname}}) list(APPEND target_flags - "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") + "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") endforeach() endif() >From 36b99eaf08631b034ca93736eefef414989a3b91 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 21 May 2024 22:15:22 +0200 Subject: [PATCH 4/5] Finetune openmp folders --- openmp/runtime/src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index dce3ec296408b..0cbd2a6dc9554 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -252,7 +252,7 @@ set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING # Create *.inc before compiling any sources # objects depend on : .inc files add_custom_target(libomp-needed-headers DEPENDS kmp_i18n_id.inc kmp_i18n_default.inc) -set_target_properties(libomp-needed-headers PROPERTIES FOLDER "OpenMP/Tablegenning") +set_target_properties(libomp-needed-headers PROPERTIES FOLDER "OpenMP/Codegenning") add_dependencies(omp libomp-needed-headers) # Windows specific build rules @@ -294,7 +294,7 @@ if(WIN32) set(LIBOMP_IMP_LIB_TARGET omp) set(LIBOMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.def) add_custom_target(libomp-needed-def-file DEPENDS ${LIBOMP_GENERATED_DEF_FILE}) - set_target_properties(libomp-needed-def-file PROPERTIES FOLDER "OpenMP/Tablegenning") + set_target_properties(libomp-needed-def-file PROPERTIES FOLDER "OpenMP/Codegenning") add_dependencies(omp libomp-needed-def-file) # Create the main def file with ordinals to use for building the runtime dll to maintain backwards compatible exports order @@ -323,7 +323,7 @@ if(WIN32) # while this merely generates an import library off a def file, CMAKE still requires it to have a "source" so feed it a dummy one, # making it a .txt which CMAKE will filter out from the librarian (a .cpp will make lib.exe punt trying to resolve the .def symbols) add_library(${LIBOMP_IMP_LIB_TARGET} STATIC kmp_dummy.txt) - set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES FOLDER "OpenMP/Resources") + set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES FOLDER "OpenMP/Libraries") set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} STATIC_LIBRARY_OPTIONS "${CMAKE_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_BINARY_DIR}/${LIBOMPIMP_GENERATED_DEF_FILE}") >From 6514e47a4336b47e310b75c4e7c171e2be07d986 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 21 May 2024 22:26:56 +0200 Subject: [PATCH 5/5] Undo unrelated changes --- offload/unittests/CMakeLists.txt | 2 +- openmp/CMakeLists.txt | 1 - openmp/docs/CMakeLists.txt | 1 - openmp/runtime/cmake/LibompMicroTests.cmake | 5 ----- openmp/runtime/src/CMakeLists.txt | 7 ------- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/offload/unittests/CMakeLists.txt b/offload/unittests/CMakeLists.txt index c818a3d985ba3..73c87b708d25f 100644 --- a/offload/unittests/CMakeLists.txt +++ b/offload/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(LibomptUnitTests) -set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests") +set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests/UnitTests") function(add_libompt_unittest test_dirname) add_unittest(LibomptUnitTests ${test_dirname} ${ARGN}) diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index c228a392e4c7a..9097ca5623000 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.20.0) -set(LLVM_SUBPROJECT_TITLE "OpenMP") set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/openmp/docs/CMakeLists.txt b/openmp/docs/CMakeLists.txt index 4cb9fb486ff34..1e4be31a6f609 100644 --- a/openmp/docs/CMakeLists.txt +++ b/openmp/docs/CMakeLists.txt @@ -78,7 +78,6 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating openmp doxygen documentation." VERBATIM) - set_target_properties(doxygen-openmp PROPERTIES FOLDER "OpenMP/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-openmp) diff --git a/openmp/runtime/cmake/LibompMicroTests.cmake b/openmp/runtime/cmake/LibompMicroTests.cmake index 6fcde37259931..e8cc218af0c29 100644 --- a/openmp/runtime/cmake/LibompMicroTests.cmake +++ b/openmp/runtime/cmake/LibompMicroTests.cmake @@ -126,7 +126,6 @@ macro(libomp_test_touch_recipe test_touch_dir) endmacro() libomp_append(libomp_test_touch_env "KMP_VERSION=1") add_custom_target(libomp-test-touch DEPENDS ${libomp_test_touch_targets}) -set_target_properties(libomp-test-touch PROPERTIES FOLDER "OpenMP/Tests") if(WIN32) libomp_test_touch_recipe(test-touch-mt) libomp_test_touch_recipe(test-touch-md) @@ -136,7 +135,6 @@ endif() # test-relo add_custom_target(libomp-test-relo DEPENDS test-relo/.success) -set_target_properties(libomp-test-relo PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-relo/.success test-relo/readelf.log COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-relo @@ -148,7 +146,6 @@ add_custom_command( # test-execstack add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success) -set_target_properties(libomp-test-execstack PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-execstack/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-execstack @@ -160,7 +157,6 @@ add_custom_command( # test-instr add_custom_target(libomp-test-instr DEPENDS test-instr/.success) -set_target_properties(libomp-test-instr PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-instr/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-instr @@ -172,7 +168,6 @@ add_custom_command( # test-deps add_custom_target(libomp-test-deps DEPENDS test-deps/.success) -set_target_properties(libomp-test-deps PROPERTIES FOLDER "OpenMP/Tests") set(libomp_expected_library_deps) if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index 0cbd2a6dc9554..94eeea63b8043 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -170,7 +170,6 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS) # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled. if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING)) add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) - set_property(TARGET omp PROPERTY FOLDER "OpenMP/Libraries") # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS}) else() @@ -252,7 +251,6 @@ set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING # Create *.inc before compiling any sources # objects depend on : .inc files add_custom_target(libomp-needed-headers DEPENDS kmp_i18n_id.inc kmp_i18n_default.inc) -set_target_properties(libomp-needed-headers PROPERTIES FOLDER "OpenMP/Codegenning") add_dependencies(omp libomp-needed-headers) # Windows specific build rules @@ -294,7 +292,6 @@ if(WIN32) set(LIBOMP_IMP_LIB_TARGET omp) set(LIBOMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.def) add_custom_target(libomp-needed-def-file DEPENDS ${LIBOMP_GENERATED_DEF_FILE}) - set_target_properties(libomp-needed-def-file PROPERTIES FOLDER "OpenMP/Codegenning") add_dependencies(omp libomp-needed-def-file) # Create the main def file with ordinals to use for building the runtime dll to maintain backwards compatible exports order @@ -313,7 +310,6 @@ if(WIN32) # Create the auxiliary def file without ordinals to use for building the import library to import by name set(LIBOMPIMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.imp.def) add_custom_target(libompimp-needed-def-file DEPENDS ${LIBOMPIMP_GENERATED_DEF_FILE}) - set_target_properties(libompimp-needed-def-file PROPERTIES FOLDER "OpenMP/Resources") add_custom_command( OUTPUT ${LIBOMPIMP_GENERATED_DEF_FILE} COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/generate-def.pl ${LIBOMP_GDFLAGS} -D NAME=${LIBOMP_LIB_FILE} -D NOORDINALS @@ -323,7 +319,6 @@ if(WIN32) # while this merely generates an import library off a def file, CMAKE still requires it to have a "source" so feed it a dummy one, # making it a .txt which CMAKE will filter out from the librarian (a .cpp will make lib.exe punt trying to resolve the .def symbols) add_library(${LIBOMP_IMP_LIB_TARGET} STATIC kmp_dummy.txt) - set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES FOLDER "OpenMP/Libraries") set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} STATIC_LIBRARY_OPTIONS "${CMAKE_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_BINARY_DIR}/${LIBOMPIMP_GENERATED_DEF_FILE}") @@ -359,7 +354,6 @@ elseif(${LIBOMP_FORTRAN_MODULES}) set(ADDITIONAL_Fortran_FLAGS "-fno-range-check") endif() add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod) - set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Misc") libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS) if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90) @@ -385,7 +379,6 @@ endif() # Micro test rules for after library has been built (cmake/LibompMicroTests.cmake) include(LibompMicroTests) add_custom_target(libomp-micro-tests) -set_target_properties(libomp-micro-tests PROPERTIES FOLDER "OpenMP/Tests") if(NOT ${MIC} AND NOT CMAKE_CROSSCOMPILING) add_dependencies(libomp-micro-tests libomp-test-touch) endif() _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits