[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
wangpc-pp wrote: These branches are created by `spr`, which is out of my control, and we can merge it into `main` branch via `spr land`. These branches are just magics behind `spr`, please don't obsess over this. `spr` is a tool that the community suggests, I have used it for a long time and I haven't met any issue. https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
https://github.com/wangpc-pp updated https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
https://github.com/wangpc-pp updated https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
dc03-work wrote: > > > > Submit your PRs to `main` branch > > > > > > > > > I used [spr](https://getcord.github.io/spr/) to create this PR, so I > > > think it's OK. > > > > > > No, your target branch is wrong. Either you should want to merge into > > `main` or into a branch for another PR created by `spr`. However, in this > > case it appears you are targeting the same branch as your source. > > These are two different branches: wangpc-pp wants to merge 1 commit into > users/wangpc-pp/spr/main.aarch64-remove-usage-of-postrascheduler from > users/wangpc-pp/spr/aarch64-remove-usage-of-postrascheduler Okay, but looking at the commits of the target: https://github.com/llvm/llvm-project/commits/users/wangpc-pp/spr/main.aarch64-remove-usage-of-postrascheduler/, it appears that spr has squashed all main commits into one commit. Anyways, this isn't the main branch. Change your PR to target the `main` branch. https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
wangpc-pp wrote: > > > Submit your PRs to `main` branch > > > > > > I used [spr](https://getcord.github.io/spr/) to create this PR, so I think > > it's OK. > > No, your target branch is wrong. Either you should want to merge into `main` > or into a branch for another PR created by `spr`. However, in this case it > appears you are targeting the same branch as your source. These are two different branches: wangpc-pp wants to merge 1 commit into users/wangpc-pp/spr/main.aarch64-remove-usage-of-postrascheduler from users/wangpc-pp/spr/aarch64-remove-usage-of-postrascheduler https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
dc03-work wrote: > > Submit your PRs to `main` branch > > I used [spr](https://getcord.github.io/spr/) to create this PR, so I think > it's OK. No, your target branch is wrong. Either you should want to merge into `main` or into a branch for another PR created by `spr`. However, in this case it appears you are targeting the same branch as your source. https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Implement CWG2398 provisional TTP matching to class templates (PR #92855)
https://github.com/mizvekov updated https://github.com/llvm/llvm-project/pull/92855 >From 73d456c632a1419c39316d38dcdc358b8e4f9636 Mon Sep 17 00:00:00 2001 From: Matheus Izvekov Date: Mon, 20 May 2024 01:15:03 -0300 Subject: [PATCH] [clang] Implement CWG2398 provisional TTP matching to class templates This solves some ambuguity introduced in P0522 regarding how template template parameters are partially ordered, and should reduce the negative impact of enabling `-frelaxed-template-template-args` by default. When performing template argument deduction, we extend the provisional wording introduced in https://github.com/llvm/llvm-project/pull/89807 so it also covers deduction of class templates. Given the following example: ```C++ template struct A; template struct B; template class TT1, class T5> struct B>; // #1 template struct B>; // #2 template struct B>; ``` Prior to P0522, `#2` was picked. Afterwards, this became ambiguous. This patch restores the pre-P0522 behavior, `#2` is picked again. This has the beneficial side effect of making the following code valid: ```C++ template struct A {}; A v; template class TT> void f(TT); // OK: TT picks 'float' as the default argument for the second parameter. void g() { f(v); } ``` --- Since this changes provisional implementation of CWG2398 which has not been released yet, and already contains a changelog entry, we don't provide a changelog entry here. --- clang/lib/Sema/SemaTemplate.cpp | 5 +- clang/lib/Sema/SemaTemplateDeduction.cpp | 76 +++ .../CXX/temp/temp.decls/temp.alias/p2.cpp | 5 +- clang/test/SemaTemplate/cwg2398.cpp | 3 - 4 files changed, 53 insertions(+), 36 deletions(-) diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 39e9dbed0c3e0..268f079980a6c 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -1807,6 +1807,8 @@ static void SetNestedNameSpecifier(Sema , TagDecl *T, // Returns the template parameter list with all default template argument // information. static TemplateParameterList *GetTemplateParameterList(TemplateDecl *TD) { + if (TD->isImplicit()) +return TD->getTemplateParameters(); // Make sure we get the template parameter list from the most // recent declaration, since that is the only one that is guaranteed to // have all the default template argument information. @@ -1827,7 +1829,8 @@ static TemplateParameterList *GetTemplateParameterList(TemplateDecl *TD) { //template friend struct C; // }; // template struct S; - while (D->getFriendObjectKind() != Decl::FriendObjectKind::FOK_None && + while ((D->isImplicit() || + D->getFriendObjectKind() != Decl::FriendObjectKind::FOK_None) && D->getPreviousDecl()) D = D->getPreviousDecl(); return cast(D)->getTemplateParameters(); diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index f16a07e1a1b34..76f47e9cb2560 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -527,8 +527,8 @@ static NamedDecl *getTemplateParameterWithDefault(Sema , NamedDecl *A, R->setDefaultArgument( S.Context, S.getTrivialTemplateArgumentLoc(Default, QualType(), SourceLocation())); -if (R->hasTypeConstraint()) { - auto *C = R->getTypeConstraint(); +if (T->hasTypeConstraint()) { + auto *C = T->getTypeConstraint(); R->setTypeConstraint(C->getConceptReference(), C->getImmediatelyDeclaredConstraint()); } @@ -583,37 +583,53 @@ DeduceTemplateArguments(Sema , TemplateParameterList *TemplateParams, return TemplateDeductionResult::Success; auto NewDeduced = DeducedTemplateArgument(Arg); -// Provisional resolution for CWG2398: If Arg is also a template template -// param, and it names a template specialization, then we deduce a -// synthesized template template parameter based on A, but using the TS's -// arguments as defaults. -if (auto *TempArg = dyn_cast_or_null( -Arg.getAsTemplateDecl())) { +// Provisional resolution for CWG2398: If Arg names a template +// specialization, then we deduce a synthesized template template parameter +// based on A, but using the TS's arguments as defaults. +if (DefaultArguments.size() != 0) { assert(Arg.getKind() == TemplateName::Template); - assert(!TempArg->isExpandedParameterPack()); - + TemplateDecl *TempArg = Arg.getAsTemplateDecl(); TemplateParameterList *As = TempArg->getTemplateParameters(); - if (DefaultArguments.size() != 0) { -assert(DefaultArguments.size() <= As->size()); -SmallVector Params(As->size()); -for (unsigned I = 0; I < DefaultArguments.size(); ++I) - Params[I] = getTemplateParameterWithDefault(S, As->getParam(I), -
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] Implement CWG2398 provisional TTP matching to class templates (PR #92855)
https://github.com/mizvekov edited https://github.com/llvm/llvm-project/pull/92855 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/ldionne approved this pull request. LGTM. After checking, I think this only impacts `add_lit_testsuites` since we don't use many other things from `AddLLVM.cmake` in the runtimes. https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [bolt] Revise IDE folder structure (PR #89742)
aaupov wrote: Please use [BOLT] in the title. https://github.com/llvm/llvm-project/pull/89742 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
https://github.com/shiltian edited https://github.com/llvm/llvm-project/pull/89750 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
@@ -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") shiltian wrote: I suppose these are for Windows (and potentially Xcode on macOS), especially those "folders" don't look like anything on Linux. I'd recommend `libomo/tests`, `libomp/docs`, etc. We don't call our library "OpenMP" library. https://github.com/llvm/llvm-project/pull/89750 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [bolt] Revise IDE folder structure (PR #89742)
@@ -121,7 +123,7 @@ option(BOLT_BUILD_TOOLS "Build the BOLT tools. If OFF, just generate build targets." ON) add_custom_target(bolt) -set_target_properties(bolt PROPERTIES FOLDER "BOLT") +set_target_properties(bolt PROPERTIES FOLDER "BOLT/Meta") ayermolo wrote: This probably should be something more neutral then a company name. https://github.com/llvm/llvm-project/pull/89742 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/jhuber6 approved this pull request. https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89755 >From 0ce849c6e5455577a77f4c25d08e8ec83115a290 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:29:28 +0200 Subject: [PATCH 1/2] Revise IDE folder structure --- cross-project-tests/CMakeLists.txt | 6 +- libc/CMakeLists.txt| 1 + libcxx/CMakeLists.txt | 1 + libcxxabi/CMakeLists.txt | 1 + libunwind/CMakeLists.txt | 1 + llvm-libgcc/CMakeLists.txt | 1 + offload/CMakeLists.txt | 1 + pstl/CMakeLists.txt| 1 + runtimes/CMakeLists.txt| 1 + 9 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cross-project-tests/CMakeLists.txt b/cross-project-tests/CMakeLists.txt index f7c2ca7ad83de..7f2fee48fda77 100644 --- a/cross-project-tests/CMakeLists.txt +++ b/cross-project-tests/CMakeLists.txt @@ -3,6 +3,7 @@ # The subset inside debuginfo-tests invoke clang to generate programs with # various types of debug info, and then run those programs under a debugger # such as GDB or LLDB to verify the results. +set(LLVM_SUBPROJECT_TITLE "Cross-Project") find_package(Python3 COMPONENTS Interpreter) @@ -97,8 +98,3 @@ add_lit_testsuite(check-cross-amdgpu "Running AMDGPU cross-project tests" add_lit_testsuites(CROSS_PROJECT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CROSS_PROJECT_TEST_DEPS} ) - -set_target_properties(check-cross-project PROPERTIES FOLDER "Tests") -set_target_properties(check-debuginfo PROPERTIES FOLDER "Tests") -set_target_properties(check-intrinsic-headers PROPERTIES FOLDER "Tests") -set_target_properties(check-cross-amdgpu PROPERTIES FOLDER "Tests") diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 175efd89d67e6..f35471a06a53e 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc") # Include LLVM's cmake policies. if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 2977c26646cb2..d75f22ecf0222 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -5,6 +5,7 @@ # Setup Project #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index da998d2221dc4..f7673da25d20e 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -5,6 +5,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++abi") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 806d5a783ec39..2117cd9e756ef 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libunwind") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt index 013c9ca2e3307..c6641ab9e3219 100644 --- a/llvm-libgcc/CMakeLists.txt +++ b/llvm-libgcc/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLVM libgcc") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt index abc8baa0805ff..44a3d17b2e59a 100644 --- a/offload/CMakeLists.txt +++ b/offload/CMakeLists.txt @@ -11,6 +11,7 @@ ##===--===## cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "liboffload") if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") set(OPENMP_STANDALONE_BUILD TRUE) diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt index 255e22af9a26b..592e11d356473 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -6,6 +6,7 @@ # #===--===## cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Parallel STL") set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index fcc59c8fa1c37..76ad8aa1f353e 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -9,6 +9,7 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
@@ -9,6 +9,7 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/LLVMVersion.cmake) project(Runtimes C CXX ASM) +set(LLVM_SUBPROJECT_TITLE "Runtimes") Meinersbur wrote: Since LLVM is usually the top-level project everything is sorted under "LLVM" be default. I added a `LLVM_SUBPROJECT_TITLE` to all potential subprojects that are either included via `add_subdirectory` or as a stand-alone build, including this one. I just checked to see if it is actually used, and the answer is yes: At least `check-runtimes` is put into this folder when loading the solution from the `runtimes-bins` directory. I did not go through all runtime targets to ensure they are put into some folder name that makes sense like I did for the LLVM_ENABLE_PROJECTS subprojects since opening a project in the IDE from the runtimes-bin would be done only if there is a concrete problem. However, I wanted to at least make a minimal effort that allows puts targets other than `add_custom_target` into a subtproject folder. https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89750 >From c3edd260d7a917e120d02253083eb472e0985844 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:27:20 +0200 Subject: [PATCH 1/3] [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)
[llvm-branch-commits] [libclc] [libclc] Revise IDE folder structure (PR #89746)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89746 >From 61ffad5a99c584ddb05a32b5d5bf54ecbf6c774b Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 21 May 2024 22:32:39 +0200 Subject: [PATCH] [libclc] Revise IDE folder structure --- libclc/CMakeLists.txt| 13 - libclc/cmake/modules/AddLibclc.cmake | 5 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index 5ce1795243085..bacc0d83ba211 100644 --- a/libclc/CMakeLists.txt +++ b/libclc/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.20.0) project( libclc VERSION 0.2.0 LANGUAGES CXX C) +set(LLVM_SUBPROJECT_TITLE "libclc") set(CMAKE_CXX_STANDARD 17) @@ -54,7 +55,10 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI foreach( tool IN ITEMS clang llvm-as llvm-link opt ) find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) add_executable( libclc::${tool} IMPORTED GLOBAL ) - set_target_properties( libclc::${tool} PROPERTIES IMPORTED_LOCATION ${LLVM_TOOL_${tool}} ) + set_target_properties( libclc::${tool} PROPERTIES +IMPORTED_LOCATION ${LLVM_TOOL_${tool}} +FOLDER "libclc/Tools" + ) endforeach() endif() else() @@ -168,6 +172,7 @@ if( LIBCLC_STANDALONE_BUILD ) else() add_llvm_utility( prepare_builtins utils/prepare-builtins.cpp ) endif() +set_target_properties( prepare_builtins PROPERTIES FOLDER "libclc/Codegenning") target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) @@ -225,12 +230,14 @@ add_custom_command( COMMAND ${Python3_EXECUTABLE} ${script_loc} > convert.cl DEPENDS ${script_loc} ) add_custom_target( "generate_convert.cl" DEPENDS convert.cl ) +set_target_properties( "generate_convert.cl" PROPERTIES FOLDER "libclc/Codegenning" ) add_custom_command( OUTPUT clspv-convert.cl COMMAND ${Python3_EXECUTABLE} ${script_loc} --clspv > clspv-convert.cl DEPENDS ${script_loc} ) add_custom_target( "clspv-generate_convert.cl" DEPENDS clspv-convert.cl ) +set_target_properties( "clspv-generate_convert.cl" PROPERTIES FOLDER "libclc/Codegenning" ) enable_testing() @@ -394,6 +401,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) DEPENDS ${builtins_link_lib} ) add_custom_target( "prepare-${spv_suffix}" ALL DEPENDS "${spv_suffix}" ) + set_target_properties( "prepare-${spv_suffix}" PROPERTIES FOLDER "libclc/Codegenning" ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${spv_suffix} DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) else() @@ -410,6 +418,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) ) set_target_properties( ${builtins_opt_lib_tgt} PROPERTIES TARGET_FILE ${builtins_opt_lib_tgt}.bc + FOLDER "libclc/Device IR/Opt" ) set( builtins_opt_lib $ ) @@ -420,6 +429,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) COMMAND prepare_builtins -o ${obj_suffix} ${builtins_opt_lib} DEPENDS ${builtins_opt_lib} prepare_builtins ) add_custom_target( prepare-${obj_suffix} ALL DEPENDS ${obj_suffix} ) + set_target_properties( "prepare-${obj_suffix}" PROPERTIES FOLDER "libclc/Device IR/Prepare" ) # nvptx-- targets don't include workitem builtins if( NOT clang_triple MATCHES ".*ptx.*--$" ) @@ -434,6 +444,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) add_custom_target( ${alias_suffix} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${obj_suffix} ${alias_suffix} DEPENDS prepare-${obj_suffix} ) +set_target_properties( "${alias_suffix}" PROPERTIES FOLDER "libclc/Device IR/Aliases" ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) endforeach( a ) endif() diff --git a/libclc/cmake/modules/AddLibclc.cmake b/libclc/cmake/modules/AddLibclc.cmake index 7f4620fa6a21d..0276c145ff20a 100644 --- a/libclc/cmake/modules/AddLibclc.cmake +++ b/libclc/cmake/modules/AddLibclc.cmake @@ -110,7 +110,10 @@ function(link_bc) ) add_custom_target( ${ARG_TARGET} ALL DEPENDS ${ARG_TARGET}.bc ) - set_target_properties( ${ARG_TARGET} PROPERTIES TARGET_FILE ${ARG_TARGET}.bc ) + set_target_properties( ${ARG_TARGET} PROPERTIES +TARGET_FILE ${ARG_TARGET}.bc +FOLDER "libclc/Device IR/Linking" + ) endfunction() # Decomposes and returns variables based on a libclc triple and architecture ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [llvm] [openmp] [compiler-rt] Revise IDE folder structure (PR #89753)
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 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") +
[llvm-branch-commits] [compiler-rt] [llvm] [openmp] [compiler-rt] Revise IDE folder structure (PR #89753)
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 Date: Tue, 23 Apr 2024 13:15:38 +0200 Subject: [PATCH 1/4] [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") +
[llvm-branch-commits] [llvm] [bolt] Revise IDE folder structure (PR #89742)
llvmbot wrote: @llvm/pr-subscribers-bolt Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the BOLT part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89742.diff 5 Files Affected: - (modified) bolt/CMakeLists.txt (+3-1) - (modified) bolt/cmake/modules/AddBOLT.cmake (-1) - (modified) bolt/docs/CMakeLists.txt (+1) - (modified) bolt/test/CMakeLists.txt (+1-2) - (modified) bolt/unittests/CMakeLists.txt (+1-1) ``diff diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt index cc3a70fa35e0a..3c1fe967d6597 100644 --- a/bolt/CMakeLists.txt +++ b/bolt/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "BOLT") + include(ExternalProject) set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -121,7 +123,7 @@ option(BOLT_BUILD_TOOLS "Build the BOLT tools. If OFF, just generate build targets." ON) add_custom_target(bolt) -set_target_properties(bolt PROPERTIES FOLDER "BOLT") +set_target_properties(bolt PROPERTIES FOLDER "BOLT/Meta") add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) include_directories( diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake index 1f69b9046320a..c7ac662c6b121 100644 --- a/bolt/cmake/modules/AddBOLT.cmake +++ b/bolt/cmake/modules/AddBOLT.cmake @@ -3,7 +3,6 @@ include(LLVMDistributionSupport) macro(add_bolt_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "BOLT") endmacro() macro(add_bolt_tool name) diff --git a/bolt/docs/CMakeLists.txt b/bolt/docs/CMakeLists.txt index b230512fe5717..12ae852566785 100644 --- a/bolt/docs/CMakeLists.txt +++ b/bolt/docs/CMakeLists.txt @@ -79,6 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating bolt doxygen documentation." VERBATIM) + set_target_properties(doxygen-bolt PROPERTIES FOLDER "BOLT/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-bolt) diff --git a/bolt/test/CMakeLists.txt b/bolt/test/CMakeLists.txt index 89862fd59eb8e..d468ff984840f 100644 --- a/bolt/test/CMakeLists.txt +++ b/bolt/test/CMakeLists.txt @@ -56,7 +56,7 @@ list(APPEND BOLT_TEST_DEPS ) add_custom_target(bolt-test-depends DEPENDS ${BOLT_TEST_DEPS}) -set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT") +set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT/Tests") add_lit_testsuite(check-bolt "Running the BOLT regression tests" ${CMAKE_CURRENT_BINARY_DIR} @@ -64,7 +64,6 @@ add_lit_testsuite(check-bolt "Running the BOLT regression tests" DEPENDS ${BOLT_TEST_DEPS} ARGS ${BOLT_TEST_EXTRA_ARGS} ) -set_target_properties(check-bolt PROPERTIES FOLDER "BOLT") add_lit_testsuites(BOLT ${CMAKE_CURRENT_SOURCE_DIR} PARAMS ${BOLT_TEST_PARAMS} diff --git a/bolt/unittests/CMakeLists.txt b/bolt/unittests/CMakeLists.txt index 77159e92dec55..64414b83d39fe 100644 --- a/bolt/unittests/CMakeLists.txt +++ b/bolt/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(BoltUnitTests) -set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT tests") +set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT/Tests") function(add_bolt_unittest test_dirname) add_unittest(BoltUnitTests ${test_dirname} ${ARGN}) `` https://github.com/llvm/llvm-project/pull/89742 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Revise IDE folder structure (PR #89743)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89743 >From afadef1f53e03e2cf3a1695f3c693913b27382dd Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:03:11 +0200 Subject: [PATCH 1/3] [clang] Revise IDE folder structure --- clang/CMakeLists.txt| 8 +--- clang/bindings/python/tests/CMakeLists.txt | 2 +- clang/cmake/modules/AddClang.cmake | 3 --- clang/docs/CMakeLists.txt | 1 + clang/lib/Analysis/FlowSensitive/CMakeLists.txt | 1 + clang/lib/Headers/CMakeLists.txt| 4 ++-- clang/lib/Tooling/CMakeLists.txt| 2 ++ clang/test/CMakeLists.txt | 5 ++--- clang/tools/libclang/CMakeLists.txt | 2 +- clang/unittests/CMakeLists.txt | 2 +- clang/utils/ClangVisualizers/CMakeLists.txt | 2 +- clang/utils/TableGen/CMakeLists.txt | 2 -- clang/utils/hmaptool/CMakeLists.txt | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index f092766fa19f0..09da3ad9979ff 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Clang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -390,7 +391,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) # Installing the headers needs to depend on generating any public # tablegen'd headers. add_custom_target(clang-headers DEPENDS clang-tablegen-targets) - set_target_properties(clang-headers PROPERTIES FOLDER "Misc") + set_target_properties(clang-headers PROPERTIES FOLDER "Clang/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-headers DEPENDS clang-headers @@ -398,6 +399,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) endif() add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + set_target_properties(bash-autocomplete PROPERTIES FOLDER "Clang/Misc") install(FILES utils/bash-autocomplete.sh DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT bash-autocomplete) @@ -478,7 +480,7 @@ add_custom_target(clang-tablegen-targets omp_gen ClangDriverOptions ${CLANG_TABLEGEN_TARGETS}) -set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc") +set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Clang/Tablegenning/Targets") list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets) # Force target to be built as soon as possible. Clang modules builds depend @@ -541,7 +543,7 @@ endif() # Custom target to install all clang libraries. add_custom_target(clang-libraries) -set_target_properties(clang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(clang-libraries PROPERTIES FOLDER "Clang/Install") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-libraries diff --git a/clang/bindings/python/tests/CMakeLists.txt b/clang/bindings/python/tests/CMakeLists.txt index c4cd2539e9d6c..2543cf739463d 100644 --- a/clang/bindings/python/tests/CMakeLists.txt +++ b/clang/bindings/python/tests/CMakeLists.txt @@ -11,7 +11,7 @@ add_custom_target(check-clang-python WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..) set(RUN_PYTHON_TESTS TRUE) -set_target_properties(check-clang-python PROPERTIES FOLDER "Clang tests") +set_target_properties(check-clang-python PROPERTIES FOLDER "Clang/Tests") # Tests require libclang.so which is only built with LLVM_ENABLE_PIC=ON if(NOT LLVM_ENABLE_PIC) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index 75b0080f67156..a5ef639187d9d 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -26,7 +26,6 @@ function(clang_tablegen) if(CTG_TARGET) add_public_tablegen_target(${CTG_TARGET}) -set_target_properties( ${CTG_TARGET} PROPERTIES FOLDER "Clang tablegenning") set_property(GLOBAL APPEND PROPERTY CLANG_TABLEGEN_TARGETS ${CTG_TARGET}) endif() endfunction(clang_tablegen) @@ -138,13 +137,11 @@ macro(add_clang_library name) endif() endforeach() - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") set_clang_windows_version_resource_properties(${name}) endmacro(add_clang_library) macro(add_clang_executable name) add_llvm_executable( ${name} ${ARGN} ) - set_target_properties(${name} PROPERTIES FOLDER "Clang executables") set_clang_windows_version_resource_properties(${name}) endmacro(add_clang_executable) diff --git a/clang/docs/CMakeLists.txt b/clang/docs/CMakeLists.txt index 4163dd2d90ad5..51e9db29f887f 100644 --- a/clang/docs/CMakeLists.txt +++ b/clang/docs/CMakeLists.txt @@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89748 >From e29002224ef168934ae414e75e765cf197f65bc0 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:21:43 +0200 Subject: [PATCH 1/3] [lldb] Revise IDE folder structure --- lldb/CMakeLists.txt | 1 + lldb/cmake/modules/AddLLDB.cmake| 6 ++ lldb/cmake/modules/LLDBConfig.cmake | 2 +- lldb/cmake/modules/LLDBFramework.cmake | 2 +- lldb/cmake/modules/LLDBStandalone.cmake | 4 ++-- lldb/docs/CMakeLists.txt| 1 + lldb/source/API/CMakeLists.txt | 3 +-- lldb/test/API/CMakeLists.txt| 1 + lldb/test/CMakeLists.txt| 4 ++-- lldb/test/Shell/CMakeLists.txt | 1 + lldb/test/Unit/CMakeLists.txt | 1 + lldb/tools/driver/CMakeLists.txt| 2 -- .../lldb-commandinterpreter-fuzzer/CMakeLists.txt | 1 + lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt| 1 + lldb/tools/lldb-server/CMakeLists.txt | 1 - lldb/unittests/CMakeLists.txt | 2 +- lldb/unittests/tools/lldb-server/CMakeLists.txt | 2 +- lldb/utils/TableGen/CMakeLists.txt | 1 - lldb/utils/lit-cpuid/CMakeLists.txt | 2 +- lldb/utils/lldb-dotest/CMakeLists.txt | 2 +- lldb/utils/lldb-repro/CMakeLists.txt| 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 7844d93d78d29..db9e5517e287b 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLDB") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index fdc4ee0c05d75..538029037dd46 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -29,7 +29,6 @@ function(lldb_tablegen) if(LTG_TARGET) add_public_tablegen_target(${LTG_TARGET}) -set_target_properties( ${LTG_TARGET} PROPERTIES FOLDER "LLDB tablegenning") set_property(GLOBAL APPEND PROPERTY LLDB_TABLEGEN_TARGETS ${LTG_TARGET}) endif() endfunction(lldb_tablegen) @@ -165,10 +164,10 @@ function(add_lldb_library name) get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY) if(EXISTS ${parent_dir}) get_filename_component(category ${parent_dir} NAME) - set_target_properties(${name} PROPERTIES FOLDER "lldb plugins/${category}") + set_target_properties(${name} PROPERTIES FOLDER "LLDB/Plugins/${category}") endif() else() -set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") +set_target_properties(${name} PROPERTIES FOLDER "LLDB/Libraries") endif() # If we want to export all lldb symbols (i.e LLDB_EXPORT_ALL_SYMBOLS=ON), we @@ -208,7 +207,6 @@ function(add_lldb_executable name) else() target_link_libraries(${name} PRIVATE ${ARG_CLANG_LIBS}) endif() - set_target_properties(${name} PROPERTIES FOLDER "lldb executables") if (ARG_BUILD_RPATH) set_target_properties(${name} PROPERTIES BUILD_RPATH "${ARG_BUILD_RPATH}") diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index a758261073ac5..13d07a4fabd6d 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -271,7 +271,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) add_custom_target(lldb-headers) - set_target_properties(lldb-headers PROPERTIES FOLDER "lldb misc") + set_target_properties(lldb-headers PROPERTIES FOLDER "LLDB/Resources") if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-lldb-headers diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index f915839f6b45a..88ea6a568ec4c 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -104,7 +104,7 @@ endforeach() # Wrap output in a target, so lldb-framework can depend on it. add_custom_target(liblldb-resource-headers DEPENDS ${lldb_staged_headers}) -set_target_properties(liblldb-resource-headers PROPERTIES FOLDER "lldb misc") +set_target_properties(liblldb-resource-headers PROPERTIES FOLDER "LLDB/Resources") add_dependencies(liblldb liblldb-resource-headers) # At build time, copy the staged headers into the framework bundle (and do diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index fd16716d71419..c9367214848fd 100644 ---
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89750 >From c3edd260d7a917e120d02253083eb472e0985844 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:27:20 +0200 Subject: [PATCH 1/2] [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)
[llvm-branch-commits] [polly] [polly] Revise IDE folder structure (PR #89752)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89752 >From a85a17723d76371ccc8feb245c455d6aaf2c297f Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:19:16 +0200 Subject: [PATCH 1/2] [polly] Revise IDE folder structure --- polly/CMakeLists.txt | 5 +++-- polly/cmake/polly_macros.cmake | 2 +- polly/docs/CMakeLists.txt | 1 + polly/lib/CMakeLists.txt | 4 +--- polly/test/CMakeLists.txt | 7 ++- polly/unittests/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt index 5d0f2cd7f00ec..a0d1ab49e7837 100644 --- a/polly/CMakeLists.txt +++ b/polly/CMakeLists.txt @@ -4,6 +4,7 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) cmake_minimum_required(VERSION 3.20.0) set(POLLY_STANDALONE_BUILD TRUE) endif() +set(LLVM_SUBPROJECT_TITLE "Polly") # Must go below project(..) include(GNUInstallDirs) @@ -157,8 +158,8 @@ foreach (file IN LISTS files) endforeach () add_custom_target(polly-check-format DEPENDS ${check_format_depends}) -set_target_properties(polly-check-format PROPERTIES FOLDER "Polly") +set_target_properties(polly-check-format PROPERTIES FOLDER "Polly/Meta") add_custom_target(polly-update-format DEPENDS ${update_format_depends}) -set_target_properties(polly-update-format PROPERTIES FOLDER "Polly") +set_target_properties(polly-update-format PROPERTIES FOLDER "Polly/Meta") diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake index df541eeccc4cb..b1bd1e1b03cda 100644 --- a/polly/cmake/polly_macros.cmake +++ b/polly/cmake/polly_macros.cmake @@ -21,7 +21,7 @@ macro(add_polly_library name) set(libkind) endif() add_library( ${name} ${libkind} ${srcs} ) - set_target_properties(${name} PROPERTIES FOLDER "Polly") + set_target_properties(${name} PROPERTIES FOLDER "Polly/Libraries") if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) diff --git a/polly/docs/CMakeLists.txt b/polly/docs/CMakeLists.txt index a1ef5ce5277f7..2bd16e53c542f 100644 --- a/polly/docs/CMakeLists.txt +++ b/polly/docs/CMakeLists.txt @@ -77,6 +77,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating polly doxygen documentation." VERBATIM) + set_target_properties(doxygen-polly PROPERTIES FOLDER "Polly/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-polly) diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt index 4557878e515e6..f18cdcd09cfca 100644 --- a/polly/lib/CMakeLists.txt +++ b/polly/lib/CMakeLists.txt @@ -92,8 +92,6 @@ add_llvm_pass_plugin(Polly LINK_COMPONENTS ${POLLY_COMPONENTS} ) -set_target_properties(obj.Polly PROPERTIES FOLDER "Polly") -set_target_properties(Polly PROPERTIES FOLDER "Polly") if (MSVC_IDE OR XCODE) # Configure source groups for Polly source files. By default, in the IDE there @@ -120,7 +118,7 @@ if (WIN32 OR CYGWIN OR NOT LLVM_ENABLE_PIC) # Add dummy target, either because loadable modules are not supported # as on Windows or because PIC code has been disabled add_custom_target(LLVMPolly) - set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly") + set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly/Meta") else () add_polly_loadable_module(LLVMPolly Plugin/Polly.cpp diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt index 81cee34a780d6..338c7dbfa1158 100644 --- a/polly/test/CMakeLists.txt +++ b/polly/test/CMakeLists.txt @@ -1,7 +1,7 @@ set(LLVM_SHLIBEXT "${CMAKE_SHARED_MODULE_SUFFIX}") add_custom_target(check-polly) -set_target_properties(check-polly PROPERTIES FOLDER "Polly") +set_target_properties(check-polly PROPERTIES FOLDER "Polly/Tests") if(NOT LLVM_MAIN_SRC_DIR) find_program(LLVM_OPT NAMES opt HINTS ${LLVM_TOOLS_BINARY_DIR}) @@ -64,7 +64,6 @@ add_lit_testsuite(check-polly-tests "Running polly regression tests" polly_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg DEPENDS ${POLLY_TEST_DEPS} ) -set_target_properties(check-polly-tests PROPERTIES FOLDER "Polly") add_dependencies(check-polly check-polly-tests) configure_lit_site_cfg( @@ -80,7 +79,6 @@ if (POLLY_GTEST_AVAIL) EXCLUDE_FROM_CHECK_ALL DEPENDS PollyUnitTests ) - set_target_properties(check-polly-unittests PROPERTIES FOLDER "Polly") endif () configure_file( @@ -94,7 +92,6 @@ if (POLLY_BUNDLED_ISL) EXCLUDE_FROM_CHECK_ALL DEPENDS polly-isl-test ) - set_target_properties(check-polly-isl PROPERTIES FOLDER "Polly") endif (POLLY_BUNDLED_ISL) # Run polly-check-format as part of polly-check only if we are compiling with @@ -114,5 +111,5 @@ configure_file( # Add a legacy target spelling: polly-test add_custom_target(polly-test) -set_target_properties(polly-test PROPERTIES FOLDER "Polly") +set_target_properties(polly-test
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89755 >From 0ce849c6e5455577a77f4c25d08e8ec83115a290 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:29:28 +0200 Subject: [PATCH] Revise IDE folder structure --- cross-project-tests/CMakeLists.txt | 6 +- libc/CMakeLists.txt| 1 + libcxx/CMakeLists.txt | 1 + libcxxabi/CMakeLists.txt | 1 + libunwind/CMakeLists.txt | 1 + llvm-libgcc/CMakeLists.txt | 1 + offload/CMakeLists.txt | 1 + pstl/CMakeLists.txt| 1 + runtimes/CMakeLists.txt| 1 + 9 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cross-project-tests/CMakeLists.txt b/cross-project-tests/CMakeLists.txt index f7c2ca7ad83de..7f2fee48fda77 100644 --- a/cross-project-tests/CMakeLists.txt +++ b/cross-project-tests/CMakeLists.txt @@ -3,6 +3,7 @@ # The subset inside debuginfo-tests invoke clang to generate programs with # various types of debug info, and then run those programs under a debugger # such as GDB or LLDB to verify the results. +set(LLVM_SUBPROJECT_TITLE "Cross-Project") find_package(Python3 COMPONENTS Interpreter) @@ -97,8 +98,3 @@ add_lit_testsuite(check-cross-amdgpu "Running AMDGPU cross-project tests" add_lit_testsuites(CROSS_PROJECT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CROSS_PROJECT_TEST_DEPS} ) - -set_target_properties(check-cross-project PROPERTIES FOLDER "Tests") -set_target_properties(check-debuginfo PROPERTIES FOLDER "Tests") -set_target_properties(check-intrinsic-headers PROPERTIES FOLDER "Tests") -set_target_properties(check-cross-amdgpu PROPERTIES FOLDER "Tests") diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 175efd89d67e6..f35471a06a53e 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc") # Include LLVM's cmake policies. if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 2977c26646cb2..d75f22ecf0222 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -5,6 +5,7 @@ # Setup Project #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index da998d2221dc4..f7673da25d20e 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -5,6 +5,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++abi") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 806d5a783ec39..2117cd9e756ef 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libunwind") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt index 013c9ca2e3307..c6641ab9e3219 100644 --- a/llvm-libgcc/CMakeLists.txt +++ b/llvm-libgcc/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLVM libgcc") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt index abc8baa0805ff..44a3d17b2e59a 100644 --- a/offload/CMakeLists.txt +++ b/offload/CMakeLists.txt @@ -11,6 +11,7 @@ ##===--===## cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "liboffload") if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") set(OPENMP_STANDALONE_BUILD TRUE) diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt index 255e22af9a26b..592e11d356473 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -6,6 +6,7 @@ # #===--===## cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Parallel STL") set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index fcc59c8fa1c37..76ad8aa1f353e 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -9,6 +9,7 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
[llvm-branch-commits] [llvm] [bolt] Revise IDE folder structure (PR #89742)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89742 >From 140a539c9e3248b128bdffdbc9ae5e2e8b4366c0 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:23:47 +0200 Subject: [PATCH 1/2] [bolt] Revise IDE folder structure --- bolt/CMakeLists.txt | 2 ++ bolt/cmake/modules/AddBOLT.cmake | 1 - bolt/docs/CMakeLists.txt | 1 + bolt/test/CMakeLists.txt | 3 +-- bolt/unittests/CMakeLists.txt| 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt index cc3a70fa35e0a..26df6a4208b7a 100644 --- a/bolt/CMakeLists.txt +++ b/bolt/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "BOLT") + include(ExternalProject) set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake index 1f69b9046320a..c7ac662c6b121 100644 --- a/bolt/cmake/modules/AddBOLT.cmake +++ b/bolt/cmake/modules/AddBOLT.cmake @@ -3,7 +3,6 @@ include(LLVMDistributionSupport) macro(add_bolt_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "BOLT") endmacro() macro(add_bolt_tool name) diff --git a/bolt/docs/CMakeLists.txt b/bolt/docs/CMakeLists.txt index b230512fe5717..12ae852566785 100644 --- a/bolt/docs/CMakeLists.txt +++ b/bolt/docs/CMakeLists.txt @@ -79,6 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating bolt doxygen documentation." VERBATIM) + set_target_properties(doxygen-bolt PROPERTIES FOLDER "BOLT/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-bolt) diff --git a/bolt/test/CMakeLists.txt b/bolt/test/CMakeLists.txt index 89862fd59eb8e..d468ff984840f 100644 --- a/bolt/test/CMakeLists.txt +++ b/bolt/test/CMakeLists.txt @@ -56,7 +56,7 @@ list(APPEND BOLT_TEST_DEPS ) add_custom_target(bolt-test-depends DEPENDS ${BOLT_TEST_DEPS}) -set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT") +set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT/Tests") add_lit_testsuite(check-bolt "Running the BOLT regression tests" ${CMAKE_CURRENT_BINARY_DIR} @@ -64,7 +64,6 @@ add_lit_testsuite(check-bolt "Running the BOLT regression tests" DEPENDS ${BOLT_TEST_DEPS} ARGS ${BOLT_TEST_EXTRA_ARGS} ) -set_target_properties(check-bolt PROPERTIES FOLDER "BOLT") add_lit_testsuites(BOLT ${CMAKE_CURRENT_SOURCE_DIR} PARAMS ${BOLT_TEST_PARAMS} diff --git a/bolt/unittests/CMakeLists.txt b/bolt/unittests/CMakeLists.txt index 77159e92dec55..64414b83d39fe 100644 --- a/bolt/unittests/CMakeLists.txt +++ b/bolt/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(BoltUnitTests) -set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT tests") +set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT/Tests") function(add_bolt_unittest test_dirname) add_unittest(BoltUnitTests ${test_dirname} ${ARGN}) >From ad704f8babf3c065d928329bf6f663b995f7323e Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 21 May 2024 22:05:54 +0200 Subject: [PATCH 2/2] Finetune BOLT folders --- bolt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt index 26df6a4208b7a..3c1fe967d6597 100644 --- a/bolt/CMakeLists.txt +++ b/bolt/CMakeLists.txt @@ -123,7 +123,7 @@ option(BOLT_BUILD_TOOLS "Build the BOLT tools. If OFF, just generate build targets." ON) add_custom_target(bolt) -set_target_properties(bolt PROPERTIES FOLDER "BOLT") +set_target_properties(bolt PROPERTIES FOLDER "BOLT/Meta") add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) include_directories( ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] [flang] Revise IDE folder structure (PR #89745)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89745 >From 90d0d0f3bed2d826dc38e962a7a9140bf2ff3615 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:13:53 +0200 Subject: [PATCH 1/2] [flang] Revise IDE folder structure --- flang/CMakeLists.txt | 3 ++- flang/cmake/modules/AddFlang.cmake | 3 +-- flang/docs/CMakeLists.txt| 2 +- flang/include/flang/Optimizer/Dialect/CMakeLists.txt | 2 ++ flang/runtime/CMakeLists.txt | 5 + flang/test/CMakeLists.txt| 3 ++- flang/tools/f18/CMakeLists.txt | 1 + flang/unittests/CMakeLists.txt | 3 ++- flang/unittests/Evaluate/CMakeLists.txt | 1 + 9 files changed, 17 insertions(+), 6 deletions(-) diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index c8e75024823f2..3bc4b5dd10c0e 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Flang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -481,7 +482,7 @@ endif() # Custom target to install Flang libraries. add_custom_target(flang-libraries) -set_target_properties(flang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(flang-libraries PROPERTIES FOLDER "Flang/Meta") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-flang-libraries diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake index 41ce8738e7bf2..3a5119b83831f 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake @@ -94,13 +94,12 @@ function(add_flang_library name) add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Flang libraries") + set_target_properties(${name} PROPERTIES FOLDER "Flang/Libraries") set_flang_windows_version_resource_properties(${name}) endfunction(add_flang_library) macro(add_flang_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Flang executables") set_flang_windows_version_resource_properties(${name}) endmacro(add_flang_executable) diff --git a/flang/docs/CMakeLists.txt b/flang/docs/CMakeLists.txt index 3414b8e3acc46..3e4883e881ffa 100644 --- a/flang/docs/CMakeLists.txt +++ b/flang/docs/CMakeLists.txt @@ -79,7 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating flang doxygen documentation." VERBATIM) - + set_target_properties(doxygen-flang PROPERTIES FOLDER "Flang/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-flang) endif() diff --git a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt index f00993d4d3778..203ac212d3ccf 100644 --- a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt +++ b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt @@ -31,6 +31,7 @@ mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters) add_public_tablegen_target(CanonicalizationPatternsIncGen) add_custom_target(flang-doc) +set_target_properties(flang-doc PROPERTIES FOLDER "Flang/Meta") set(dialect_doc_filename "FIRLangRef") set(LLVM_TARGET_DEFINITIONS FIROps.td) @@ -43,4 +44,5 @@ add_custom_command( ${GEN_DOC_FILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md) add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE}) +set_target_properties(${dialect_doc_filename}DocGen PROPERTIES FOLDER "Flang/Docs") add_dependencies(flang-doc ${dialect_doc_filename}DocGen) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index bdd0e07bbfd4d..eaa79851046c6 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -269,21 +269,26 @@ else() LINK_LIBS FortranDecimal.static INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) add_flang_library(FortranRuntime.dynamic ${sources} LINK_LIBS FortranDecimal.dynamic INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.dynamic PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebug) add_flang_library(FortranRuntime.static_dbg ${sources} LINK_LIBS FortranDecimal.static_dbg INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static_dbg PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebugDLL) add_flang_library(FortranRuntime.dynamic_dbg ${sources} LINK_LIBS FortranDecimal.dynamic_dbg INSTALL_WITH_TOOLCHAIN) +
[llvm-branch-commits] [mlir] [mlir] Revise IDE folder structure (PR #89749)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89749 >From 82bac5ccd7d6d2b4e146ed4e383a8484e735606e Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:08:54 +0200 Subject: [PATCH 1/2] [mlir] Revise IDE folder structure --- mlir/CMakeLists.txt| 9 ++--- mlir/cmake/modules/AddMLIR.cmake | 5 +++-- mlir/docs/CMakeLists.txt | 1 + mlir/examples/toy/CMakeLists.txt | 2 +- mlir/examples/transform/CMakeLists.txt | 1 + mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt | 2 ++ mlir/lib/TableGen/CMakeLists.txt | 1 + mlir/test/CAPI/CMakeLists.txt | 2 ++ mlir/test/CMakeLists.txt | 2 +- mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt | 1 + mlir/tools/mlir-pdll/CMakeLists.txt| 1 - mlir/tools/mlir-tblgen/CMakeLists.txt | 1 - mlir/unittests/CMakeLists.txt | 2 -- 13 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt index 5c4301af040b4..0ff6658f831f5 100644 --- a/mlir/CMakeLists.txt +++ b/mlir/CMakeLists.txt @@ -1,5 +1,6 @@ # MLIR project. cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "MLIR") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -96,12 +97,13 @@ endif() # tablegen'd targets. # mlir-generic-headers are dialect-independent. add_custom_target(mlir-generic-headers) -set_target_properties(mlir-generic-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-generic-headers PROPERTIES FOLDER "MLIR/Resources") # mlir-headers may be dialect-dependent. add_custom_target(mlir-headers) -set_target_properties(mlir-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-headers PROPERTIES FOLDER "MLIR/Resources") add_dependencies(mlir-headers mlir-generic-headers) add_custom_target(mlir-doc) +set_target_properties(mlir-doc PROPERTIES FOLDER "MLIR/Docs") # Only enable execution engine if the native target is available. if(${LLVM_NATIVE_ARCH} IN_LIST LLVM_TARGETS_TO_BUILD) @@ -198,6 +200,7 @@ add_subdirectory(lib/CAPI) if (MLIR_INCLUDE_TESTS) add_definitions(-DMLIR_INCLUDE_TESTS) add_custom_target(MLIRUnitTests) + set_target_properties(MLIRUnitTests PROPERTIES FOLDER "MLIR/Tests") if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) add_subdirectory(unittests) else() @@ -258,7 +261,7 @@ endif() # Custom target to install all mlir libraries add_custom_target(mlir-libraries) -set_target_properties(mlir-libraries PROPERTIES FOLDER "Misc") +set_target_properties(mlir-libraries PROPERTIES FOLDER "MLIR/Install") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-mlir-libraries diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake index 1d2ed748bc2f1..5a9a5b799763a 100644 --- a/mlir/cmake/modules/AddMLIR.cmake +++ b/mlir/cmake/modules/AddMLIR.cmake @@ -173,6 +173,7 @@ function(add_mlir_doc doc_filename output_file output_directory command) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.md) add_custom_target(${output_file}DocGen DEPENDS ${GEN_DOC_FILE}) add_dependencies(mlir-doc ${output_file}DocGen) + set_target_properties(${output_file}DocGen PROPERTIES FOLDER "MLIR/Docs") endfunction() # Sets ${srcs} to contain the list of additional headers for the target. Extra @@ -252,7 +253,7 @@ function(add_mlir_example_library name) list(APPEND ARG_DEPENDS mlir-generic-headers) llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs} DEPENDS ${ARG_DEPENDS} LINK_COMPONENTS ${ARG_LINK_COMPONENTS} LINK_LIBS ${ARG_LINK_LIBS}) - set_target_properties(${name} PROPERTIES FOLDER "Examples") + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Examples") if (LLVM_BUILD_EXAMPLES AND NOT ${ARG_DISABLE_INSTALL}) add_mlir_library_install(${name}) else() @@ -329,7 +330,7 @@ function(add_mlir_library name) # Add empty "phony" target add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "MLIR libraries") + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Libraries") # Setup aggregate. if(ARG_ENABLE_AGGREGATION) diff --git a/mlir/docs/CMakeLists.txt b/mlir/docs/CMakeLists.txt index 36cd3f9983881..43192569847cf 100644 --- a/mlir/docs/CMakeLists.txt +++ b/mlir/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 mlir doxygen documentation." VERBATIM) + set_target_properties(doxygen-mlir PROPERTIES FOLDER "MLIR/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-mlir) diff --git a/mlir/examples/toy/CMakeLists.txt
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89747 >From 6c3206c8100ed68ab77ceb98741bef42659bcfc1 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:12:03 +0200 Subject: [PATCH] [lld] Revise IDE folder structure --- lld/CMakeLists.txt | 2 ++ lld/cmake/modules/AddLLD.cmake | 2 -- lld/test/CMakeLists.txt| 5 ++--- lld/unittests/CMakeLists.txt | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index cd8ba627306ed..64c9f23805509 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLD") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -192,6 +193,7 @@ add_subdirectory(tools/lld) if (LLVM_INCLUDE_TESTS) add_custom_target(LLDUnitTests) + set_target_properties(LLDUnitTests PROPERTIES FOLDER "LLD/Tests") if (TARGET llvm_gtest) add_subdirectory(unittests) endif() diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake index 2ee066b415351..9f2684b6f933e 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -11,7 +11,6 @@ macro(add_lld_library name) set(ARG_ENABLE_SHARED SHARED) endif() llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS}) - set_target_properties(${name} PROPERTIES FOLDER "lld libraries") if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) get_target_export_arg(${name} LLD export_to_lldtargets) @@ -33,7 +32,6 @@ endmacro(add_lld_library) macro(add_lld_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "lld executables") endmacro(add_lld_executable) macro(add_lld_tool name) diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt index bb6164f19dcef..25d8f0a424926 100644 --- a/lld/test/CMakeLists.txt +++ b/lld/test/CMakeLists.txt @@ -83,10 +83,9 @@ add_lit_testsuite(check-lld "Running lld test suite" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${LLD_TEST_DEPS} ) -set_target_properties(check-lld PROPERTIES FOLDER "lld tests") add_custom_target(lld-test-depends DEPENDS ${LLD_TEST_DEPS}) -set_target_properties(lld-test-depends PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test-depends PROPERTIES FOLDER "LLD/Tests") add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${LLD_TEST_DEPS} @@ -95,4 +94,4 @@ add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} # Add a legacy target spelling: lld-test add_custom_target(lld-test) add_dependencies(lld-test check-lld) -set_target_properties(lld-test PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test PROPERTIES FOLDER "LLD/Tests") diff --git a/lld/unittests/CMakeLists.txt b/lld/unittests/CMakeLists.txt index ac878fa019083..ffaea3f207833 100644 --- a/lld/unittests/CMakeLists.txt +++ b/lld/unittests/CMakeLists.txt @@ -1,5 +1,3 @@ -set_target_properties(LLDUnitTests PROPERTIES FOLDER "lld tests") - function(add_lld_unittests test_dirname) add_unittest(LLDUnitTests ${test_dirname} ${ARGN}) endfunction() ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89744 >From 937a7728542d880fd37c439bec6dca4ccd3f07d2 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:06:06 +0200 Subject: [PATCH] [clang-tools-extra] Revise IDE folder structure --- clang-tools-extra/CMakeLists.txt | 2 ++ clang-tools-extra/clang-tidy/CMakeLists.txt| 2 +- clang-tools-extra/clang-tidy/misc/CMakeLists.txt | 2 ++ clang-tools-extra/clangd/unittests/CMakeLists.txt | 1 + clang-tools-extra/docs/CMakeLists.txt | 1 + clang-tools-extra/include-cleaner/unittests/CMakeLists.txt | 1 + clang-tools-extra/pseudo/include/CMakeLists.txt| 1 + clang-tools-extra/pseudo/tool/CMakeLists.txt | 1 + clang-tools-extra/pseudo/unittests/CMakeLists.txt | 1 + clang-tools-extra/test/CMakeLists.txt | 1 - clang-tools-extra/unittests/CMakeLists.txt | 2 +- 11 files changed, 12 insertions(+), 3 deletions(-) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 6a3f741721ee6..f6a6b57b5ef0b 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "Clang Tools Extra") + include(CMakeDependentOption) include(GNUInstallDirs) diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index 7e1905aa897b7..430ea4cdbb38e 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -121,7 +121,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) PATTERN "*.h" ) add_custom_target(clang-tidy-headers) - set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Misc") + set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Clang Tools Extra/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-tidy-headers DEPENDS clang-tidy-headers diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt index d9ec268650c05..4eda705c45d2a 100644 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt @@ -15,6 +15,7 @@ add_custom_command( DEPENDS ${clang_tidy_confusable_chars_gen_target} ConfusableTable/confusables.txt) add_custom_target(genconfusable DEPENDS Confusables.inc) +set_target_properties(genconfusable PROPERTIES FOLDER "Clang Tools Extra/Tablegenning") add_clang_library(clangTidyMiscModule ConstCorrectnessCheck.cpp @@ -51,6 +52,7 @@ add_clang_library(clangTidyMiscModule genconfusable ClangDriverOptions ) +set_target_properties(clangTidyMiscModule PROPERTIES FOLDER "Clang Tools Extra/Libraries") clang_target_link_libraries(clangTidyMiscModule PRIVATE diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 7f1ae5c43d80c..0d4628ccf25d8 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -29,6 +29,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../quality/CompletionModel.cmake) gen_decision_forest(${CMAKE_CURRENT_SOURCE_DIR}/decision_forest_model DecisionForestRuntimeTest ::ns1::ns2::test::Example) add_custom_target(ClangdUnitTests) +set_target_properties(ClangdUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangdUnitTests ClangdTests Annotations.cpp ASTTests.cpp diff --git a/clang-tools-extra/docs/CMakeLists.txt b/clang-tools-extra/docs/CMakeLists.txt index 8f442e1f661ed..272db266b5054 100644 --- a/clang-tools-extra/docs/CMakeLists.txt +++ b/clang-tools-extra/docs/CMakeLists.txt @@ -77,6 +77,7 @@ if (DOXYGEN_FOUND) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating clang doxygen documentation." VERBATIM) +set_target_properties(doxygen-clang-tools PROPERTIES FOLDER "Clang Tools Extra/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-clang-tools) diff --git a/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt b/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt index 1e89534b51116..416535649f622 100644 --- a/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt +++ b/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS ) add_custom_target(ClangIncludeCleanerUnitTests) +set_target_properties(ClangIncludeCleanerUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangIncludeCleanerUnitTests ClangIncludeCleanerTests AnalysisTest.cpp FindHeadersTest.cpp diff --git a/clang-tools-extra/pseudo/include/CMakeLists.txt b/clang-tools-extra/pseudo/include/CMakeLists.txt index
[llvm-branch-commits] [mlir] [mlir] Revise IDE folder structure (PR #89749)
https://github.com/joker-eph approved this pull request. https://github.com/llvm/llvm-project/pull/89749 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [NFCI][metadata][clang] Use create{Unlikely, Likely}BranchWeights (PR #89467)
https://github.com/AaronBallman approved this pull request. LGTM! https://github.com/llvm/llvm-project/pull/89467 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [NFCI][metadata][clang] Use create{Unlikely, Likely}BranchWeights (PR #89467)
https://github.com/AaronBallman edited https://github.com/llvm/llvm-project/pull/89467 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
wangpc-pp wrote: > Submit your PRs to `main` branch I used [spr](https://getcord.github.io/spr/) to create this PR, so I think it's OK. https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
https://github.com/medismailben approved this pull request. Nice! LGTM! https://github.com/llvm/llvm-project/pull/89748 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
https://github.com/bulbazord approved this pull request. https://github.com/llvm/llvm-project/pull/89748 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
https://github.com/asl requested changes to this pull request. Submit your PRs to `main` branch https://github.com/llvm/llvm-project/pull/92871 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Discard SHT_LLVM_LTO sections in relocatable links (PR #92825)
https://github.com/ilovepi updated https://github.com/llvm/llvm-project/pull/92825 >From 0b9155faf2dc063f81091c8e78d14dd4446c2db5 Mon Sep 17 00:00:00 2001 From: Paul Kirth Date: Tue, 21 May 2024 09:58:46 -0700 Subject: [PATCH] Fix fallthrough and update comment Created using spr 1.3.4 --- lld/ELF/InputFiles.cpp | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index 0ac49761601c4..33fd86b269f81 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -833,14 +833,15 @@ void ObjFile::initializeSections(bool ignoreComdats, createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); break; case SHT_LLVM_LTO: - // When doing a relocatable link with FatLTO objects, if we're not using - // the bitcode, discard it, since it will be concatenated together when - // handling orphan sections, and which will be an invalid bitcode object. + // Discard .llvm.lto in a relocatable link that does not use the bitcode. + // The concatenated output does not properly reflect the linking + // semantics. In addition, since we do not use the bitcode wrapper format, + // the concatenated raw bitcode would be invalid. if (config->relocatable && !config->fatLTOObjects) { sections[i] = ::discarded; break; } - LLVM_FALLTHROUGH; + [[fallthrough]]; default: this->sections[i] = createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Discard SHT_LLVM_LTO sections in relocatable links (PR #92825)
https://github.com/ilovepi updated https://github.com/llvm/llvm-project/pull/92825 >From 0b9155faf2dc063f81091c8e78d14dd4446c2db5 Mon Sep 17 00:00:00 2001 From: Paul Kirth Date: Tue, 21 May 2024 09:58:46 -0700 Subject: [PATCH] Fix fallthrough and update comment Created using spr 1.3.4 --- lld/ELF/InputFiles.cpp | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index 0ac49761601c4..33fd86b269f81 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -833,14 +833,15 @@ void ObjFile::initializeSections(bool ignoreComdats, createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); break; case SHT_LLVM_LTO: - // When doing a relocatable link with FatLTO objects, if we're not using - // the bitcode, discard it, since it will be concatenated together when - // handling orphan sections, and which will be an invalid bitcode object. + // Discard .llvm.lto in a relocatable link that does not use the bitcode. + // The concatenated output does not properly reflect the linking + // semantics. In addition, since we do not use the bitcode wrapper format, + // the concatenated raw bitcode would be invalid. if (config->relocatable && !config->fatLTOObjects) { sections[i] = ::discarded; break; } - LLVM_FALLTHROUGH; + [[fallthrough]]; default: this->sections[i] = createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add interchange directive (PR #92030)
@@ -5779,6 +5779,80 @@ class OMPReverseDirective final : public OMPLoopTransformationDirective { } }; +/// Represents the '#pragma omp interchange' loop transformation directive. +/// +/// \code{c} +/// #pragma omp interchange +/// for (int i = 0; i < m; ++i) +/// for (int j = 0; j < n; ++j) +/// .. +/// \endcode +class OMPInterchangeDirective final : public OMPLoopTransformationDirective { alexey-bataev wrote: If the directive itslef can be used without clauses, need to introduce the directive at first and then add a clause in a separate patch https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
@@ -5711,6 +5712,71 @@ class OMPUnrollDirective final : public OMPLoopTransformationDirective { } }; +/// Represents the '#pragma omp reverse' loop transformation directive. +/// +/// \code +/// #pragma omp reverse +/// for (int i = 0; i < n; ++i) +/// ... +/// \endcode +class OMPReverseDirective final : public OMPLoopTransformationDirective { + friend class ASTStmtReader; + friend class OMPExecutableDirective; + + /// Offsets of child members. + enum { +PreInitsOffset = 0, +TransformedStmtOffset, + }; + + explicit OMPReverseDirective(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPLoopTransformationDirective(OMPReverseDirectiveClass, + llvm::omp::OMPD_reverse, StartLoc, + EndLoc, 1) {} + + void setPreInits(Stmt *PreInits) { +Data->getChildren()[PreInitsOffset] = PreInits; + } + + void setTransformedStmt(Stmt *S) { +Data->getChildren()[TransformedStmtOffset] = S; + } + +public: + /// Create a new AST node representation for '#pragma omp reverse'. + /// + /// \param C Context of the AST. + /// \param StartLoc Location of the introducer (e.g. the 'omp' token). + /// \param EndLocLocation of the directive's end (e.g. the tok::eod). + /// \param AssociatedStmt The outermost associated loop. + /// \param TransformedStmt The loop nest after tiling, or nullptr in + ///dependent contexts. + /// \param PreInits Helper preinits statements for the loop nest. + static OMPReverseDirective * + Create(const ASTContext , SourceLocation StartLoc, SourceLocation EndLoc, + Stmt *AssociatedStmt, Stmt *TransformedStmt, Stmt *PreInits); + + /// Build an empty '#pragma omp reverse' AST node for deserialization. + /// + /// \param C Context of the AST. + /// \param NumClauses Number of clauses to allocate. + static OMPReverseDirective *CreateEmpty(const ASTContext , + unsigned NumClauses); alexey-bataev wrote: No need for NumClauses, always 0 https://github.com/llvm/llvm-project/pull/92916 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Discard SHT_LLVM_LTO sections in relocatable links (PR #92825)
https://github.com/MaskRay approved this pull request. https://github.com/llvm/llvm-project/pull/92825 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
@@ -51,6 +52,7 @@ add_clang_library(clangTidyMiscModule genconfusable ClangDriverOptions ) +set_target_properties(clangTidyMiscModule PROPERTIES FOLDER "Clang Tools Extra/Libraries") PiotrZSL wrote: why this is set for Misc module, but not for other check modules. https://github.com/llvm/llvm-project/pull/89744 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
https://github.com/PiotrZSL edited https://github.com/llvm/llvm-project/pull/89744 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
https://github.com/PiotrZSL commented: For me this entire change doesn't make sense. https://github.com/llvm/llvm-project/pull/89744 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
https://github.com/JDevlieghere approved this pull request. https://github.com/llvm/llvm-project/pull/89748 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Discard SHT_LLVM_LTO sections in relocatable links (PR #92825)
https://github.com/ilovepi updated https://github.com/llvm/llvm-project/pull/92825 >From 0b9155faf2dc063f81091c8e78d14dd4446c2db5 Mon Sep 17 00:00:00 2001 From: Paul Kirth Date: Tue, 21 May 2024 09:58:46 -0700 Subject: [PATCH] Fix fallthrough and update comment Created using spr 1.3.4 --- lld/ELF/InputFiles.cpp | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index 0ac49761601c4..33fd86b269f81 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -833,14 +833,15 @@ void ObjFile::initializeSections(bool ignoreComdats, createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); break; case SHT_LLVM_LTO: - // When doing a relocatable link with FatLTO objects, if we're not using - // the bitcode, discard it, since it will be concatenated together when - // handling orphan sections, and which will be an invalid bitcode object. + // Discard .llvm.lto in a relocatable link that does not use the bitcode. + // The concatenated output does not properly reflect the linking + // semantics. In addition, since we do not use the bitcode wrapper format, + // the concatenated raw bitcode would be invalid. if (config->relocatable && !config->fatLTOObjects) { sections[i] = ::discarded; break; } - LLVM_FALLTHROUGH; + [[fallthrough]]; default: this->sections[i] = createInputSection(i, sec, check(obj.getSectionName(sec, shstrtab))); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
@@ -9,6 +9,7 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/LLVMVersion.cmake) project(Runtimes C CXX ASM) +set(LLVM_SUBPROJECT_TITLE "Runtimes") jhuber6 wrote: Is this needed? My understanding is that the runtimes CMake here is the root that includes all the other projects, so this doesn't actually contain any "projects'> https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/nickdesaulniers approved this pull request. libc parts LGTM https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
llvmbot wrote: @llvm/pr-subscribers-libcxx Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the part for the remaining subprojects that have just one file changed each. For the runtime subprojects this is because they cannot be used in `LLVM_ENABLE_PROJECTS` and therefore its targets do not appear in the IDE when compiling as part of LLVM. `LLVM_SUBPROJECT_TITLE` is still defined and useful when loading the project from the `runtimes/runtimes-bins` folder withing the LLVM build dir, or for out-of-tree builds. A follow-up patch may do a more complete folder organization. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89755.diff 9 Files Affected: - (modified) cross-project-tests/CMakeLists.txt (+1-5) - (modified) libc/CMakeLists.txt (+1) - (modified) libcxx/CMakeLists.txt (+1) - (modified) libcxxabi/CMakeLists.txt (+1) - (modified) libunwind/CMakeLists.txt (+1) - (modified) llvm-libgcc/CMakeLists.txt (+1) - (modified) offload/CMakeLists.txt (+1) - (modified) pstl/CMakeLists.txt (+1) - (modified) runtimes/CMakeLists.txt (+1) ``diff diff --git a/cross-project-tests/CMakeLists.txt b/cross-project-tests/CMakeLists.txt index f7c2ca7ad83de..7f2fee48fda77 100644 --- a/cross-project-tests/CMakeLists.txt +++ b/cross-project-tests/CMakeLists.txt @@ -3,6 +3,7 @@ # The subset inside debuginfo-tests invoke clang to generate programs with # various types of debug info, and then run those programs under a debugger # such as GDB or LLDB to verify the results. +set(LLVM_SUBPROJECT_TITLE "Cross-Project") find_package(Python3 COMPONENTS Interpreter) @@ -97,8 +98,3 @@ add_lit_testsuite(check-cross-amdgpu "Running AMDGPU cross-project tests" add_lit_testsuites(CROSS_PROJECT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CROSS_PROJECT_TEST_DEPS} ) - -set_target_properties(check-cross-project PROPERTIES FOLDER "Tests") -set_target_properties(check-debuginfo PROPERTIES FOLDER "Tests") -set_target_properties(check-intrinsic-headers PROPERTIES FOLDER "Tests") -set_target_properties(check-cross-amdgpu PROPERTIES FOLDER "Tests") diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 175efd89d67e6..f35471a06a53e 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc") # Include LLVM's cmake policies. if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 2977c26646cb2..d75f22ecf0222 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -5,6 +5,7 @@ # Setup Project #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index da998d2221dc4..f7673da25d20e 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -5,6 +5,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++abi") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 806d5a783ec39..2117cd9e756ef 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libunwind") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt index 013c9ca2e3307..c6641ab9e3219 100644 --- a/llvm-libgcc/CMakeLists.txt +++ b/llvm-libgcc/CMakeLists.txt @@ -3,6 +3,7 @@ #=== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLVM libgcc")
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
llvmbot wrote: @llvm/pr-subscribers-lldb Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the LLDB part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89748.diff 21 Files Affected: - (modified) lldb/CMakeLists.txt (+1) - (modified) lldb/cmake/modules/AddLLDB.cmake (+2-4) - (modified) lldb/cmake/modules/LLDBConfig.cmake (+1-1) - (modified) lldb/cmake/modules/LLDBFramework.cmake (+1-1) - (modified) lldb/cmake/modules/LLDBStandalone.cmake (+2-2) - (modified) lldb/docs/CMakeLists.txt (+1) - (modified) lldb/source/API/CMakeLists.txt (-2) - (modified) lldb/test/API/CMakeLists.txt (+1) - (modified) lldb/test/CMakeLists.txt (+2-2) - (modified) lldb/test/Shell/CMakeLists.txt (+1) - (modified) lldb/test/Unit/CMakeLists.txt (+1) - (modified) lldb/tools/driver/CMakeLists.txt (-2) - (modified) lldb/tools/lldb-fuzzer/lldb-commandinterpreter-fuzzer/CMakeLists.txt (+1) - (modified) lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt (+1) - (modified) lldb/tools/lldb-server/CMakeLists.txt (-1) - (modified) lldb/unittests/CMakeLists.txt (+1-1) - (modified) lldb/unittests/tools/lldb-server/CMakeLists.txt (+1-1) - (modified) lldb/utils/TableGen/CMakeLists.txt (-1) - (modified) lldb/utils/lit-cpuid/CMakeLists.txt (+1-1) - (modified) lldb/utils/lldb-dotest/CMakeLists.txt (+1-1) - (modified) lldb/utils/lldb-repro/CMakeLists.txt (+1-1) ``diff diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 7844d93d78d29..db9e5517e287b 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLDB") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index fdc4ee0c05d75..538029037dd46 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -29,7 +29,6 @@ function(lldb_tablegen) if(LTG_TARGET) add_public_tablegen_target(${LTG_TARGET}) -set_target_properties( ${LTG_TARGET} PROPERTIES FOLDER "LLDB tablegenning") set_property(GLOBAL APPEND PROPERTY LLDB_TABLEGEN_TARGETS ${LTG_TARGET}) endif() endfunction(lldb_tablegen) @@ -165,10 +164,10 @@ function(add_lldb_library name) get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY) if(EXISTS ${parent_dir}) get_filename_component(category ${parent_dir} NAME) - set_target_properties(${name} PROPERTIES FOLDER "lldb plugins/${category}") + set_target_properties(${name} PROPERTIES FOLDER "LLDB/Plugins/${category}") endif() else() -set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") +set_target_properties(${name} PROPERTIES FOLDER "LLDB/Libraries") endif() # If we want to export all lldb symbols (i.e LLDB_EXPORT_ALL_SYMBOLS=ON), we @@ -208,7 +207,6 @@ function(add_lldb_executable name) else() target_link_libraries(${name} PRIVATE ${ARG_CLANG_LIBS}) endif() - set_target_properties(${name} PROPERTIES FOLDER "lldb executables") if (ARG_BUILD_RPATH) set_target_properties(${name} PROPERTIES BUILD_RPATH "${ARG_BUILD_RPATH}") diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index a758261073ac5..13d07a4fabd6d 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -271,7 +271,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) add_custom_target(lldb-headers) - set_target_properties(lldb-headers PROPERTIES FOLDER "lldb misc") + set_target_properties(lldb-headers PROPERTIES FOLDER "LLDB/Resources") if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-lldb-headers diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index f915839f6b45a..88ea6a568ec4c 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -104,7 +104,7 @@ endforeach() # Wrap output in a
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
llvmbot wrote: @llvm/pr-subscribers-offload Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the OpenMP part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89750.diff 5 Files Affected: - (modified) offload/unittests/CMakeLists.txt (+1-1) - (modified) openmp/CMakeLists.txt (+1) - (modified) openmp/docs/CMakeLists.txt (+1) - (modified) openmp/runtime/cmake/LibompMicroTests.cmake (+5) - (modified) openmp/runtime/src/CMakeLists.txt (+7) ``diff 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 +++
[llvm-branch-commits] [mlir] [mlir] Revise IDE folder structure (PR #89749)
llvmbot wrote: @llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-core Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the MLIR part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89749.diff 13 Files Affected: - (modified) mlir/CMakeLists.txt (+6-3) - (modified) mlir/cmake/modules/AddMLIR.cmake (+3-2) - (modified) mlir/docs/CMakeLists.txt (+1) - (modified) mlir/examples/toy/CMakeLists.txt (+1-1) - (modified) mlir/examples/transform/CMakeLists.txt (+1) - (modified) mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt (+2) - (modified) mlir/lib/TableGen/CMakeLists.txt (+1) - (modified) mlir/test/CAPI/CMakeLists.txt (+2) - (modified) mlir/test/CMakeLists.txt (+1-1) - (modified) mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt (+1) - (modified) mlir/tools/mlir-pdll/CMakeLists.txt (-1) - (modified) mlir/tools/mlir-tblgen/CMakeLists.txt (-1) - (modified) mlir/unittests/CMakeLists.txt (-2) ``diff diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt index 5c4301af040b4..0ff6658f831f5 100644 --- a/mlir/CMakeLists.txt +++ b/mlir/CMakeLists.txt @@ -1,5 +1,6 @@ # MLIR project. cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "MLIR") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -96,12 +97,13 @@ endif() # tablegen'd targets. # mlir-generic-headers are dialect-independent. add_custom_target(mlir-generic-headers) -set_target_properties(mlir-generic-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-generic-headers PROPERTIES FOLDER "MLIR/Resources") # mlir-headers may be dialect-dependent. add_custom_target(mlir-headers) -set_target_properties(mlir-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-headers PROPERTIES FOLDER "MLIR/Resources") add_dependencies(mlir-headers mlir-generic-headers) add_custom_target(mlir-doc) +set_target_properties(mlir-doc PROPERTIES FOLDER "MLIR/Docs") # Only enable execution engine if the native target is available. if(${LLVM_NATIVE_ARCH} IN_LIST LLVM_TARGETS_TO_BUILD) @@ -198,6 +200,7 @@ add_subdirectory(lib/CAPI) if (MLIR_INCLUDE_TESTS) add_definitions(-DMLIR_INCLUDE_TESTS) add_custom_target(MLIRUnitTests) + set_target_properties(MLIRUnitTests PROPERTIES FOLDER "MLIR/Tests") if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) add_subdirectory(unittests) else() @@ -258,7 +261,7 @@ endif() # Custom target to install all mlir libraries add_custom_target(mlir-libraries) -set_target_properties(mlir-libraries PROPERTIES FOLDER "Misc") +set_target_properties(mlir-libraries PROPERTIES FOLDER "MLIR/Install") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-mlir-libraries diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake index 1d2ed748bc2f1..5a9a5b799763a 100644 --- a/mlir/cmake/modules/AddMLIR.cmake +++ b/mlir/cmake/modules/AddMLIR.cmake @@ -173,6 +173,7 @@ function(add_mlir_doc doc_filename output_file output_directory command) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.md) add_custom_target(${output_file}DocGen DEPENDS ${GEN_DOC_FILE}) add_dependencies(mlir-doc ${output_file}DocGen) + set_target_properties(${output_file}DocGen PROPERTIES FOLDER "MLIR/Docs") endfunction() # Sets ${srcs} to contain the list of additional headers for the target. Extra @@ -252,7 +253,7 @@ function(add_mlir_example_library name) list(APPEND ARG_DEPENDS mlir-generic-headers) llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs} DEPENDS ${ARG_DEPENDS} LINK_COMPONENTS ${ARG_LINK_COMPONENTS} LINK_LIBS ${ARG_LINK_LIBS}) - set_target_properties(${name} PROPERTIES FOLDER "Examples") + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Examples") if (LLVM_BUILD_EXAMPLES AND NOT ${ARG_DISABLE_INSTALL}) add_mlir_library_install(${name}) else() @@ -329,7 +330,7 @@ function(add_mlir_library name) # Add empty "phony" target add_custom_target(${name})
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
llvmbot wrote: @llvm/pr-subscribers-lld Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the LLD part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89747.diff 4 Files Affected: - (modified) lld/CMakeLists.txt (+2) - (modified) lld/cmake/modules/AddLLD.cmake (-2) - (modified) lld/test/CMakeLists.txt (+2-3) - (modified) lld/unittests/CMakeLists.txt (-2) ``diff diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index cd8ba627306ed..64c9f23805509 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLD") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -192,6 +193,7 @@ add_subdirectory(tools/lld) if (LLVM_INCLUDE_TESTS) add_custom_target(LLDUnitTests) + set_target_properties(LLDUnitTests PROPERTIES FOLDER "LLD/Tests") if (TARGET llvm_gtest) add_subdirectory(unittests) endif() diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake index 2ee066b415351..9f2684b6f933e 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -11,7 +11,6 @@ macro(add_lld_library name) set(ARG_ENABLE_SHARED SHARED) endif() llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS}) - set_target_properties(${name} PROPERTIES FOLDER "lld libraries") if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) get_target_export_arg(${name} LLD export_to_lldtargets) @@ -33,7 +32,6 @@ endmacro(add_lld_library) macro(add_lld_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "lld executables") endmacro(add_lld_executable) macro(add_lld_tool name) diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt index bb6164f19dcef..25d8f0a424926 100644 --- a/lld/test/CMakeLists.txt +++ b/lld/test/CMakeLists.txt @@ -83,10 +83,9 @@ add_lit_testsuite(check-lld "Running lld test suite" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${LLD_TEST_DEPS} ) -set_target_properties(check-lld PROPERTIES FOLDER "lld tests") add_custom_target(lld-test-depends DEPENDS ${LLD_TEST_DEPS}) -set_target_properties(lld-test-depends PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test-depends PROPERTIES FOLDER "LLD/Tests") add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${LLD_TEST_DEPS} @@ -95,4 +94,4 @@ add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} # Add a legacy target spelling: lld-test add_custom_target(lld-test) add_dependencies(lld-test check-lld) -set_target_properties(lld-test PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test PROPERTIES FOLDER "LLD/Tests") diff --git a/lld/unittests/CMakeLists.txt b/lld/unittests/CMakeLists.txt index ac878fa019083..ffaea3f207833 100644 --- a/lld/unittests/CMakeLists.txt +++ b/lld/unittests/CMakeLists.txt @@ -1,5 +1,3 @@ -set_target_properties(LLDUnitTests PROPERTIES FOLDER "lld tests") - function(add_lld_unittests test_dirname) add_unittest(LLDUnitTests ${test_dirname} ${ARGN}) endfunction() `` https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] [flang] Revise IDE folder structure (PR #89745)
llvmbot wrote: @llvm/pr-subscribers-flang-fir-hlfir Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the Flang part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89745.diff 9 Files Affected: - (modified) flang/CMakeLists.txt (+2-1) - (modified) flang/cmake/modules/AddFlang.cmake (+1-2) - (modified) flang/docs/CMakeLists.txt (+1-1) - (modified) flang/include/flang/Optimizer/Dialect/CMakeLists.txt (+2) - (modified) flang/runtime/CMakeLists.txt (+5) - (modified) flang/test/CMakeLists.txt (+2-1) - (modified) flang/tools/f18/CMakeLists.txt (+1) - (modified) flang/unittests/CMakeLists.txt (+2-1) - (modified) flang/unittests/Evaluate/CMakeLists.txt (+1) ``diff diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index c8e75024823f2..3bc4b5dd10c0e 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Flang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -481,7 +482,7 @@ endif() # Custom target to install Flang libraries. add_custom_target(flang-libraries) -set_target_properties(flang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(flang-libraries PROPERTIES FOLDER "Flang/Meta") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-flang-libraries diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake index 41ce8738e7bf2..3a5119b83831f 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake @@ -94,13 +94,12 @@ function(add_flang_library name) add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Flang libraries") + set_target_properties(${name} PROPERTIES FOLDER "Flang/Libraries") set_flang_windows_version_resource_properties(${name}) endfunction(add_flang_library) macro(add_flang_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Flang executables") set_flang_windows_version_resource_properties(${name}) endmacro(add_flang_executable) diff --git a/flang/docs/CMakeLists.txt b/flang/docs/CMakeLists.txt index 3414b8e3acc46..3e4883e881ffa 100644 --- a/flang/docs/CMakeLists.txt +++ b/flang/docs/CMakeLists.txt @@ -79,7 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating flang doxygen documentation." VERBATIM) - + set_target_properties(doxygen-flang PROPERTIES FOLDER "Flang/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-flang) endif() diff --git a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt index f00993d4d3778..203ac212d3ccf 100644 --- a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt +++ b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt @@ -31,6 +31,7 @@ mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters) add_public_tablegen_target(CanonicalizationPatternsIncGen) add_custom_target(flang-doc) +set_target_properties(flang-doc PROPERTIES FOLDER "Flang/Meta") set(dialect_doc_filename "FIRLangRef") set(LLVM_TARGET_DEFINITIONS FIROps.td) @@ -43,4 +44,5 @@ add_custom_command( ${GEN_DOC_FILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md) add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE}) +set_target_properties(${dialect_doc_filename}DocGen PROPERTIES FOLDER "Flang/Docs") add_dependencies(flang-doc ${dialect_doc_filename}DocGen) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index bdd0e07bbfd4d..eaa79851046c6 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -269,21 +269,26 @@ else() LINK_LIBS FortranDecimal.static INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static PROPERTIES FOLDER
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
llvmbot wrote: @llvm/pr-subscribers-pgo Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the Compiler-RT part. See #89153 for the entire series and motivation. 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. --- Patch is 31.58 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/89753.diff 42 Files Affected: - (modified) compiler-rt/CMakeLists.txt (+2-1) - (modified) compiler-rt/cmake/Modules/AddCompilerRT.cmake (+10-9) - (modified) compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake (+2-2) - (modified) compiler-rt/cmake/Modules/CompilerRTUtils.cmake (+2-2) - (modified) compiler-rt/cmake/base-config-ix.cmake (+2-2) - (modified) compiler-rt/include/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/asan/tests/CMakeLists.txt (+4-4) - (modified) compiler-rt/lib/builtins/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/fuzzer/tests/CMakeLists.txt (+3-3) - (modified) compiler-rt/lib/gwp_asan/tests/CMakeLists.txt (+2-2) - (modified) compiler-rt/lib/interception/tests/CMakeLists.txt (+2-2) - (modified) compiler-rt/lib/memprof/tests/CMakeLists.txt (+2-2) - (modified) compiler-rt/lib/orc/tests/CMakeLists.txt (+3-3) - (modified) compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt (+2-2) - (modified) compiler-rt/lib/stats/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/tsan/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/tsan/dd/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/tsan/rtl/CMakeLists.txt (+1-1) - (modified) compiler-rt/lib/xray/tests/CMakeLists.txt (+2-2) - (modified) compiler-rt/test/CMakeLists.txt (+1) - (modified) compiler-rt/test/asan/CMakeLists.txt (-3) - (modified) compiler-rt/test/asan_abi/CMakeLists.txt (-1) - (modified) compiler-rt/test/builtins/CMakeLists.txt (-1) - (modified) compiler-rt/test/cfi/CMakeLists.txt (-3) - (modified) compiler-rt/test/dfsan/CMakeLists.txt (-1) - (modified) compiler-rt/test/fuzzer/CMakeLists.txt (-1) - (modified) compiler-rt/test/gwp_asan/CMakeLists.txt (-1) - (modified) compiler-rt/test/hwasan/CMakeLists.txt (-2) - (modified) compiler-rt/test/interception/CMakeLists.txt (-1) - (modified) compiler-rt/test/lsan/CMakeLists.txt (-1) - (modified) compiler-rt/test/memprof/CMakeLists.txt (-3) - (modified) compiler-rt/test/metadata/CMakeLists.txt (-1) - (modified) compiler-rt/test/msan/CMakeLists.txt (-1) - (modified) compiler-rt/test/orc/CMakeLists.txt (-1) - (modified) compiler-rt/test/profile/CMakeLists.txt (-1) - (modified) compiler-rt/test/safestack/CMakeLists.txt (-1) - (modified) compiler-rt/test/sanitizer_common/CMakeLists.txt (-2) - (modified) compiler-rt/test/shadowcallstack/CMakeLists.txt (-1) - (modified) compiler-rt/test/tsan/CMakeLists.txt (-1) - (modified) compiler-rt/test/ubsan/CMakeLists.txt (-2) - (modified) compiler-rt/test/ubsan_minimal/CMakeLists.txt (-1) - (modified) compiler-rt/test/xray/CMakeLists.txt (-1) ``diff 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..902e26dcbb882 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -97,7 +97,7 @@ function(add_compiler_rt_object_libraries
[llvm-branch-commits] [flang] [flang] Revise IDE folder structure (PR #89745)
llvmbot wrote: @llvm/pr-subscribers-flang-runtime Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the Flang part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89745.diff 9 Files Affected: - (modified) flang/CMakeLists.txt (+2-1) - (modified) flang/cmake/modules/AddFlang.cmake (+1-2) - (modified) flang/docs/CMakeLists.txt (+1-1) - (modified) flang/include/flang/Optimizer/Dialect/CMakeLists.txt (+2) - (modified) flang/runtime/CMakeLists.txt (+5) - (modified) flang/test/CMakeLists.txt (+2-1) - (modified) flang/tools/f18/CMakeLists.txt (+1) - (modified) flang/unittests/CMakeLists.txt (+2-1) - (modified) flang/unittests/Evaluate/CMakeLists.txt (+1) ``diff diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index c8e75024823f2..3bc4b5dd10c0e 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Flang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -481,7 +482,7 @@ endif() # Custom target to install Flang libraries. add_custom_target(flang-libraries) -set_target_properties(flang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(flang-libraries PROPERTIES FOLDER "Flang/Meta") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-flang-libraries diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake index 41ce8738e7bf2..3a5119b83831f 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake @@ -94,13 +94,12 @@ function(add_flang_library name) add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Flang libraries") + set_target_properties(${name} PROPERTIES FOLDER "Flang/Libraries") set_flang_windows_version_resource_properties(${name}) endfunction(add_flang_library) macro(add_flang_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Flang executables") set_flang_windows_version_resource_properties(${name}) endmacro(add_flang_executable) diff --git a/flang/docs/CMakeLists.txt b/flang/docs/CMakeLists.txt index 3414b8e3acc46..3e4883e881ffa 100644 --- a/flang/docs/CMakeLists.txt +++ b/flang/docs/CMakeLists.txt @@ -79,7 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating flang doxygen documentation." VERBATIM) - + set_target_properties(doxygen-flang PROPERTIES FOLDER "Flang/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-flang) endif() diff --git a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt index f00993d4d3778..203ac212d3ccf 100644 --- a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt +++ b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt @@ -31,6 +31,7 @@ mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters) add_public_tablegen_target(CanonicalizationPatternsIncGen) add_custom_target(flang-doc) +set_target_properties(flang-doc PROPERTIES FOLDER "Flang/Meta") set(dialect_doc_filename "FIRLangRef") set(LLVM_TARGET_DEFINITIONS FIROps.td) @@ -43,4 +44,5 @@ add_custom_command( ${GEN_DOC_FILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md) add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE}) +set_target_properties(${dialect_doc_filename}DocGen PROPERTIES FOLDER "Flang/Docs") add_dependencies(flang-doc ${dialect_doc_filename}DocGen) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index bdd0e07bbfd4d..eaa79851046c6 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -269,21 +269,26 @@ else() LINK_LIBS FortranDecimal.static INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static PROPERTIES FOLDER
[llvm-branch-commits] [polly] [polly] Revise IDE folder structure (PR #89752)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89752 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
llvmbot wrote: @llvm/pr-subscribers-clang-tidy Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the Clang-tools-extra part. See #89153 for the entire series and motivation. 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. --- Full diff: https://github.com/llvm/llvm-project/pull/89744.diff 11 Files Affected: - (modified) clang-tools-extra/CMakeLists.txt (+2) - (modified) clang-tools-extra/clang-tidy/CMakeLists.txt (+1-1) - (modified) clang-tools-extra/clang-tidy/misc/CMakeLists.txt (+2) - (modified) clang-tools-extra/clangd/unittests/CMakeLists.txt (+1) - (modified) clang-tools-extra/docs/CMakeLists.txt (+1) - (modified) clang-tools-extra/include-cleaner/unittests/CMakeLists.txt (+1) - (modified) clang-tools-extra/pseudo/include/CMakeLists.txt (+1) - (modified) clang-tools-extra/pseudo/tool/CMakeLists.txt (+1) - (modified) clang-tools-extra/pseudo/unittests/CMakeLists.txt (+1) - (modified) clang-tools-extra/test/CMakeLists.txt (-1) - (modified) clang-tools-extra/unittests/CMakeLists.txt (+1-1) ``diff diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 6a3f741721ee6..f6a6b57b5ef0b 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "Clang Tools Extra") + include(CMakeDependentOption) include(GNUInstallDirs) diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index 7e1905aa897b7..430ea4cdbb38e 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -121,7 +121,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) PATTERN "*.h" ) add_custom_target(clang-tidy-headers) - set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Misc") + set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Clang Tools Extra/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-tidy-headers DEPENDS clang-tidy-headers diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt index d9ec268650c05..4eda705c45d2a 100644 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt @@ -15,6 +15,7 @@ add_custom_command( DEPENDS ${clang_tidy_confusable_chars_gen_target} ConfusableTable/confusables.txt) add_custom_target(genconfusable DEPENDS Confusables.inc) +set_target_properties(genconfusable PROPERTIES FOLDER "Clang Tools Extra/Tablegenning") add_clang_library(clangTidyMiscModule ConstCorrectnessCheck.cpp @@ -51,6 +52,7 @@ add_clang_library(clangTidyMiscModule genconfusable ClangDriverOptions ) +set_target_properties(clangTidyMiscModule PROPERTIES FOLDER "Clang Tools Extra/Libraries") clang_target_link_libraries(clangTidyMiscModule PRIVATE diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 7f1ae5c43d80c..0d4628ccf25d8 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -29,6 +29,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../quality/CompletionModel.cmake) gen_decision_forest(${CMAKE_CURRENT_SOURCE_DIR}/decision_forest_model DecisionForestRuntimeTest ::ns1::ns2::test::Example) add_custom_target(ClangdUnitTests) +set_target_properties(ClangdUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangdUnitTests ClangdTests Annotations.cpp ASTTests.cpp diff --git a/clang-tools-extra/docs/CMakeLists.txt b/clang-tools-extra/docs/CMakeLists.txt index 8f442e1f661ed..272db266b5054 100644 --- a/clang-tools-extra/docs/CMakeLists.txt +++ b/clang-tools-extra/docs/CMakeLists.txt @@ -77,6 +77,7 @@ if (DOXYGEN_FOUND) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating clang doxygen documentation." VERBATIM) +set_target_properties(doxygen-clang-tools PROPERTIES FOLDER "Clang Tools
[llvm-branch-commits] [libc] [libcxx] [libcxxabi] [libunwind] [llvm] [pstl] Revise IDE folder structure (PR #89755)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89755 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [openmp] [openmp] Revise IDE folder structure (PR #89750)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89750 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [mlir] [mlir] Revise IDE folder structure (PR #89749)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89749 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lldb] [lldb] Revise IDE folder structure (PR #89748)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89748 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libclc] [libclc] Revise IDE folder structure (PR #89746)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89746 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] [flang] Revise IDE folder structure (PR #89745)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89745 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang-tools-extra] [clang-tools-extra] Revise IDE folder structure (PR #89744)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89744 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Revise IDE folder structure (PR #89743)
Meinersbur wrote: > Oh the fun of PR numbers now lining up with Phabricator numbers. I thought > you meant https://reviews.llvm.org/D89741 and was very confused until I saw > #89741. :-D I'll take a look! Well, seems I still have muscle memory from Phabricator times :-) Thanks for the review! https://github.com/llvm/llvm-project/pull/89743 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
@@ -5711,6 +5712,73 @@ class OMPUnrollDirective final : public OMPLoopTransformationDirective { } }; +/// Represents the '#pragma omp reverse' loop transformation directive. +/// +/// \code +/// #pragma omp reverse +/// for (int i = 0; i < n; ++i) +/// ... +/// \endcode +class OMPReverseDirective final : public OMPLoopTransformationDirective { + friend class ASTStmtReader; + friend class OMPExecutableDirective; + + /// Offsets of child members. + enum { +PreInitsOffset = 0, +TransformedStmtOffset, + }; + + explicit OMPReverseDirective(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPLoopTransformationDirective(OMPReverseDirectiveClass, + llvm::omp::OMPD_reverse, StartLoc, + EndLoc, 1) {} + + void setPreInits(Stmt *PreInits) { +Data->getChildren()[PreInitsOffset] = PreInits; + } + + void setTransformedStmt(Stmt *S) { +Data->getChildren()[TransformedStmtOffset] = S; + } + +public: + /// Create a new AST node representation for '#pragma omp reverse'. + /// + /// \param C Context of the AST. + /// \param StartLoc Location of the introducer (e.g. the 'omp' token). + /// \param EndLocLocation of the directive's end (e.g. the tok::eod). + /// \param Clauses The directive's clauses. + /// \param AssociatedStmt The outermost associated loop. + /// \param TransformedStmt The loop nest after tiling, or nullptr in + ///dependent contexts. + /// \param PreInits Helper preinits statements for the loop nest. + static OMPReverseDirective * + Create(const ASTContext , SourceLocation StartLoc, SourceLocation EndLoc, + ArrayRef Clauses, Stmt *AssociatedStmt, alexey-bataev wrote: If it does not have clauses, this param must be excluded https://github.com/llvm/llvm-project/pull/92916 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
@@ -6546,6 +6547,10 @@ StmtResult SemaOpenMP::ActOnOpenMPExecutableDirective( Res = ActOnOpenMPUnrollDirective(ClausesWithImplicit, AStmt, StartLoc, EndLoc); break; + case OMPD_reverse: +Res = ActOnOpenMPReverseDirective(ClausesWithImplicit, AStmt, StartLoc, alexey-bataev wrote: Do not pass clauses here, if they are not expected, just assert, that it should be empty https://github.com/llvm/llvm-project/pull/92916 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
mizvekov wrote: > I don't quite get the justification for this, but also don't see any downside > for it, so I think this is acceptable. It's unfortunate GitHub does not show a PR stack like phab did. This is needed for another patch you already reviewed: https://github.com/llvm/llvm-project/pull/92855 It allows forming default arguments for packs as part of TTP template argument deduction, based on the same principles already implemented in https://github.com/llvm/llvm-project/pull/89807 https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add interchange directive (PR #92030)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
llvmbot wrote: @llvm/pr-subscribers-clang Author: Michael Kruse (Meinersbur) Changes Add the reverse directive which will be introduced in the upcoming OpenMP 6.0 specification. A preview has been published in [Technical Report 12](https://www.openmp.org/wp-content/uploads/openmp-TR12.pdf). This is the reverse directive part extracted out of #92030 which included reverse and interchange. --- Patch is 144.58 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/92916.diff 30 Files Affected: - (modified) clang/include/clang-c/Index.h (+4) - (modified) clang/include/clang/AST/RecursiveASTVisitor.h (+3) - (modified) clang/include/clang/AST/StmtOpenMP.h (+70-2) - (modified) clang/include/clang/Basic/StmtNodes.td (+1) - (modified) clang/include/clang/Sema/SemaOpenMP.h (+5) - (modified) clang/include/clang/Serialization/ASTBitCodes.h (+1) - (modified) clang/lib/AST/StmtOpenMP.cpp (+19) - (modified) clang/lib/AST/StmtPrinter.cpp (+5) - (modified) clang/lib/AST/StmtProfile.cpp (+4) - (modified) clang/lib/Basic/OpenMPKinds.cpp (+2-1) - (modified) clang/lib/CodeGen/CGStmt.cpp (+3) - (modified) clang/lib/CodeGen/CGStmtOpenMP.cpp (+8) - (modified) clang/lib/CodeGen/CodeGenFunction.h (+1) - (modified) clang/lib/Parse/ParseOpenMP.cpp (+2) - (modified) clang/lib/Sema/SemaExceptionSpec.cpp (+1) - (modified) clang/lib/Sema/SemaOpenMP.cpp (+190) - (modified) clang/lib/Sema/TreeTransform.h (+11) - (modified) clang/lib/Serialization/ASTReaderStmt.cpp (+12) - (modified) clang/lib/Serialization/ASTWriterStmt.cpp (+5) - (added) clang/test/OpenMP/reverse_ast_print.cpp (+159) - (added) clang/test/OpenMP/reverse_codegen.cpp (+1554) - (added) clang/test/OpenMP/reverse_messages.cpp (+40) - (modified) clang/tools/libclang/CIndex.cpp (+7) - (modified) clang/tools/libclang/CXCursor.cpp (+3) - (modified) llvm/include/llvm/Frontend/OpenMP/OMP.td (+3) - (added) openmp/runtime/test/transform/reverse/foreach.cpp (+162) - (added) openmp/runtime/test/transform/reverse/intfor.c (+25) - (added) openmp/runtime/test/transform/reverse/iterfor.cpp (+164) - (added) openmp/runtime/test/transform/reverse/parallel-wsloop-collapse-foreach.cpp (+285) - (added) openmp/runtime/test/transform/reverse/parallel-wsloop-collapse-intfor.cpp (+51) ``diff diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h index 365b607c74117..c7d63818ece23 100644 --- a/clang/include/clang-c/Index.h +++ b/clang/include/clang-c/Index.h @@ -2146,6 +2146,10 @@ enum CXCursorKind { */ CXCursor_OMPScopeDirective = 306, + /** OpenMP reverse directive. + */ + CXCursor_OMPReverseDirective = 307, + /** OpenACC Compute Construct. */ CXCursor_OpenACCComputeConstruct = 320, diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index f5cefedb07e0e..06b29d59785f6 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -3021,6 +3021,9 @@ DEF_TRAVERSE_STMT(OMPTileDirective, DEF_TRAVERSE_STMT(OMPUnrollDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) +DEF_TRAVERSE_STMT(OMPReverseDirective, + { TRY_TO(TraverseOMPExecutableDirective(S)); }) + DEF_TRAVERSE_STMT(OMPForDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) diff --git a/clang/include/clang/AST/StmtOpenMP.h b/clang/include/clang/AST/StmtOpenMP.h index f735fa5643aec..4be2e2d3a4605 100644 --- a/clang/include/clang/AST/StmtOpenMP.h +++ b/clang/include/clang/AST/StmtOpenMP.h @@ -1007,8 +1007,9 @@ class OMPLoopTransformationDirective : public OMPLoopBasedDirective { Stmt *getPreInits() const; static bool classof(const Stmt *T) { -return T->getStmtClass() == OMPTileDirectiveClass || - T->getStmtClass() == OMPUnrollDirectiveClass; +Stmt::StmtClass C = T->getStmtClass(); +return C == OMPTileDirectiveClass || C == OMPUnrollDirectiveClass || + C == OMPReverseDirectiveClass; } }; @@ -5711,6 +5712,73 @@ class OMPUnrollDirective final : public OMPLoopTransformationDirective { } }; +/// Represents the '#pragma omp reverse' loop transformation directive. +/// +/// \code +/// #pragma omp reverse +/// for (int i = 0; i < n; ++i) +/// ... +/// \endcode +class OMPReverseDirective final : public OMPLoopTransformationDirective { + friend class ASTStmtReader; + friend class OMPExecutableDirective; + + /// Offsets of child members. + enum { +PreInitsOffset = 0, +TransformedStmtOffset, + }; + + explicit OMPReverseDirective(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPLoopTransformationDirective(OMPReverseDirectiveClass, + llvm::omp::OMPD_reverse, StartLoc, + EndLoc, 1) {} + + void setPreInits(Stmt *PreInits) { +Data->getChildren()[PreInitsOffset] = PreInits; + } + + void
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
llvmbot wrote: @llvm/pr-subscribers-flang-openmp @llvm/pr-subscribers-clang-modules Author: Michael Kruse (Meinersbur) Changes Add the reverse directive which will be introduced in the upcoming OpenMP 6.0 specification. A preview has been published in [Technical Report 12](https://www.openmp.org/wp-content/uploads/openmp-TR12.pdf). This is the reverse directive part extracted out of #92030 which included reverse and interchange. --- Patch is 144.58 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/92916.diff 30 Files Affected: - (modified) clang/include/clang-c/Index.h (+4) - (modified) clang/include/clang/AST/RecursiveASTVisitor.h (+3) - (modified) clang/include/clang/AST/StmtOpenMP.h (+70-2) - (modified) clang/include/clang/Basic/StmtNodes.td (+1) - (modified) clang/include/clang/Sema/SemaOpenMP.h (+5) - (modified) clang/include/clang/Serialization/ASTBitCodes.h (+1) - (modified) clang/lib/AST/StmtOpenMP.cpp (+19) - (modified) clang/lib/AST/StmtPrinter.cpp (+5) - (modified) clang/lib/AST/StmtProfile.cpp (+4) - (modified) clang/lib/Basic/OpenMPKinds.cpp (+2-1) - (modified) clang/lib/CodeGen/CGStmt.cpp (+3) - (modified) clang/lib/CodeGen/CGStmtOpenMP.cpp (+8) - (modified) clang/lib/CodeGen/CodeGenFunction.h (+1) - (modified) clang/lib/Parse/ParseOpenMP.cpp (+2) - (modified) clang/lib/Sema/SemaExceptionSpec.cpp (+1) - (modified) clang/lib/Sema/SemaOpenMP.cpp (+190) - (modified) clang/lib/Sema/TreeTransform.h (+11) - (modified) clang/lib/Serialization/ASTReaderStmt.cpp (+12) - (modified) clang/lib/Serialization/ASTWriterStmt.cpp (+5) - (added) clang/test/OpenMP/reverse_ast_print.cpp (+159) - (added) clang/test/OpenMP/reverse_codegen.cpp (+1554) - (added) clang/test/OpenMP/reverse_messages.cpp (+40) - (modified) clang/tools/libclang/CIndex.cpp (+7) - (modified) clang/tools/libclang/CXCursor.cpp (+3) - (modified) llvm/include/llvm/Frontend/OpenMP/OMP.td (+3) - (added) openmp/runtime/test/transform/reverse/foreach.cpp (+162) - (added) openmp/runtime/test/transform/reverse/intfor.c (+25) - (added) openmp/runtime/test/transform/reverse/iterfor.cpp (+164) - (added) openmp/runtime/test/transform/reverse/parallel-wsloop-collapse-foreach.cpp (+285) - (added) openmp/runtime/test/transform/reverse/parallel-wsloop-collapse-intfor.cpp (+51) ``diff diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h index 365b607c74117..c7d63818ece23 100644 --- a/clang/include/clang-c/Index.h +++ b/clang/include/clang-c/Index.h @@ -2146,6 +2146,10 @@ enum CXCursorKind { */ CXCursor_OMPScopeDirective = 306, + /** OpenMP reverse directive. + */ + CXCursor_OMPReverseDirective = 307, + /** OpenACC Compute Construct. */ CXCursor_OpenACCComputeConstruct = 320, diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index f5cefedb07e0e..06b29d59785f6 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -3021,6 +3021,9 @@ DEF_TRAVERSE_STMT(OMPTileDirective, DEF_TRAVERSE_STMT(OMPUnrollDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) +DEF_TRAVERSE_STMT(OMPReverseDirective, + { TRY_TO(TraverseOMPExecutableDirective(S)); }) + DEF_TRAVERSE_STMT(OMPForDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) diff --git a/clang/include/clang/AST/StmtOpenMP.h b/clang/include/clang/AST/StmtOpenMP.h index f735fa5643aec..4be2e2d3a4605 100644 --- a/clang/include/clang/AST/StmtOpenMP.h +++ b/clang/include/clang/AST/StmtOpenMP.h @@ -1007,8 +1007,9 @@ class OMPLoopTransformationDirective : public OMPLoopBasedDirective { Stmt *getPreInits() const; static bool classof(const Stmt *T) { -return T->getStmtClass() == OMPTileDirectiveClass || - T->getStmtClass() == OMPUnrollDirectiveClass; +Stmt::StmtClass C = T->getStmtClass(); +return C == OMPTileDirectiveClass || C == OMPUnrollDirectiveClass || + C == OMPReverseDirectiveClass; } }; @@ -5711,6 +5712,73 @@ class OMPUnrollDirective final : public OMPLoopTransformationDirective { } }; +/// Represents the '#pragma omp reverse' loop transformation directive. +/// +/// \code +/// #pragma omp reverse +/// for (int i = 0; i < n; ++i) +/// ... +/// \endcode +class OMPReverseDirective final : public OMPLoopTransformationDirective { + friend class ASTStmtReader; + friend class OMPExecutableDirective; + + /// Offsets of child members. + enum { +PreInitsOffset = 0, +TransformedStmtOffset, + }; + + explicit OMPReverseDirective(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPLoopTransformationDirective(OMPReverseDirectiveClass, + llvm::omp::OMPD_reverse, StartLoc, + EndLoc, 1) {} + + void setPreInits(Stmt *PreInits) { +
[llvm-branch-commits] [clang] [llvm] [openmp] [Clang][OpenMP] Add reverse directive (PR #92916)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/92916 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add interchange directive (PR #92030)
Meinersbur wrote: Extracted out the reverse part into #92916 https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add interchange directive (PR #92030)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add reverse and interchange directives (PR #92030)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] [llvm] [openmp] [Clang][OpenMP] Add reverse and interchange directives (PR #92030)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/92030 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/erichkeane approved this pull request. I don't quite get the justification for this, but also don't see any downside for it, so I think this is acceptable. https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Implement CWG2398 provisional TTP matching to class templates (PR #92855)
https://github.com/erichkeane approved this pull request. Seems reasonable, lgtm. https://github.com/llvm/llvm-project/pull/92855 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Revise IDE folder structure (PR #89743)
https://github.com/AaronBallman approved this pull request. I verified the layout seems reasonable in Visual Studio 2022; LGTM! https://github.com/llvm/llvm-project/pull/89743 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Revise IDE folder structure (PR #89743)
AaronBallman wrote: > @AaronBallman Would you mind reviewing D89741 ? I was convinced a stakeholder > there but they decided to drop out instead of approving it. Oh the fun of PR numbers now lining up with Phabricator numbers. I thought you meant https://reviews.llvm.org/D89741 and was very confused until I saw https://github.com/llvm/llvm-project/pull/89741. :-D I'll take a look! https://github.com/llvm/llvm-project/pull/89743 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang] Revise IDE folder structure (PR #89743)
Meinersbur wrote: @AaronBallman Would you mind reviewing D89741 ? I was convinced a stakeholder there but they decided to drop out instead of approving it. https://github.com/llvm/llvm-project/pull/89743 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/Endilll edited https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/Endilll commented: LGTM, but you should wait for someone with more knowledge of our templates. https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
llvmbot wrote: @llvm/pr-subscribers-backend-aarch64 Author: Pengcheng Wang (wangpc-pp) Changes This doesn't take effect as we have overrided `enablePostRAScheduler` and we should use the `FeaturePostRAScheduler` feature in processor definitions. --- Full diff: https://github.com/llvm/llvm-project/pull/92871.diff 6 Files Affected: - (modified) llvm/lib/Target/AArch64/AArch64SchedA510.td (-1) - (modified) llvm/lib/Target/AArch64/AArch64SchedA55.td (-1) - (modified) llvm/lib/Target/AArch64/AArch64SchedA64FX.td (-1) - (modified) llvm/lib/Target/AArch64/AArch64SchedThunderX.td (-1) - (modified) llvm/lib/Target/AArch64/AArch64SchedThunderX2T99.td (-1) - (modified) llvm/lib/Target/AArch64/AArch64SchedThunderX3T110.td (-1) ``diff diff --git a/llvm/lib/Target/AArch64/AArch64SchedA510.td b/llvm/lib/Target/AArch64/AArch64SchedA510.td index 9456878946151..715f9fe4e050e 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedA510.td +++ b/llvm/lib/Target/AArch64/AArch64SchedA510.td @@ -21,7 +21,6 @@ def CortexA510Model : SchedMachineModel { let LoadLatency = 3;// Cycles for loads to access the cache. // Most loads have a latency of 2, but some have higher latencies. // 3 seems to be a good tradeoff - let PostRAScheduler = 1;// Enable PostRA scheduler pass. let CompleteModel = 0; // Covers instructions applicable to Cortex-A510. // FIXME: Remove when all errors have been fixed. diff --git a/llvm/lib/Target/AArch64/AArch64SchedA55.td b/llvm/lib/Target/AArch64/AArch64SchedA55.td index cb77be350d124..7f508062dbdde 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedA55.td +++ b/llvm/lib/Target/AArch64/AArch64SchedA55.td @@ -26,7 +26,6 @@ def CortexA55Model : SchedMachineModel { // a latency of 3, but some have a latency of 4 // or 5. Setting it 4 looked to be good trade-off. let MispredictPenalty = 8; // A branch direction mispredict. - let PostRAScheduler = 1;// Enable PostRA scheduler pass. let CompleteModel = 0; // Covers instructions applicable to Cortex-A55. list UnsupportedFeatures = [HasSVE, HasMTE]; diff --git a/llvm/lib/Target/AArch64/AArch64SchedA64FX.td b/llvm/lib/Target/AArch64/AArch64SchedA64FX.td index d6fe84a2c9c9b..f738f754f61cd 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedA64FX.td +++ b/llvm/lib/Target/AArch64/AArch64SchedA64FX.td @@ -17,7 +17,6 @@ def A64FXModel : SchedMachineModel { let MispredictPenalty = 12; // Extra cycles for mispredicted branch. // Determined via a mix of micro-arch details and experimentation. let LoopMicroOpBufferSize = 128; - let PostRAScheduler = 1; // Using PostRA sched. let CompleteModel = 1; list UnsupportedFeatures = !listconcat(SMEUnsupported.F, SVEUnsupported.F, diff --git a/llvm/lib/Target/AArch64/AArch64SchedThunderX.td b/llvm/lib/Target/AArch64/AArch64SchedThunderX.td index 8df3f56e45738..aa7456ce0d58f 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedThunderX.td +++ b/llvm/lib/Target/AArch64/AArch64SchedThunderX.td @@ -22,7 +22,6 @@ def ThunderXT8XModel : SchedMachineModel { let MicroOpBufferSize = 0; // ThunderX T88/T81/T83 are in-order. let LoadLatency = 3;// Optimistic load latency. let MispredictPenalty = 8; // Branch mispredict penalty. - let PostRAScheduler = 1;// Use PostRA scheduler. let CompleteModel = 1; list UnsupportedFeatures = !listconcat(SVEUnsupported.F, diff --git a/llvm/lib/Target/AArch64/AArch64SchedThunderX2T99.td b/llvm/lib/Target/AArch64/AArch64SchedThunderX2T99.td index ef4baa3dedff9..ad14b12d496fe 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedThunderX2T99.td +++ b/llvm/lib/Target/AArch64/AArch64SchedThunderX2T99.td @@ -22,7 +22,6 @@ def ThunderX2T99Model : SchedMachineModel { let MispredictPenalty = 12; // Extra cycles for mispredicted branch. // Determined via a mix of micro-arch details and experimentation. let LoopMicroOpBufferSize = 128; - let PostRAScheduler = 1; // Using PostRA sched. let CompleteModel = 1; list UnsupportedFeatures = !listconcat(SVEUnsupported.F, diff --git a/llvm/lib/Target/AArch64/AArch64SchedThunderX3T110.td b/llvm/lib/Target/AArch64/AArch64SchedThunderX3T110.td index 796bd4b8b5c9a..29e2537dd92aa 100644 --- a/llvm/lib/Target/AArch64/AArch64SchedThunderX3T110.td +++ b/llvm/lib/Target/AArch64/AArch64SchedThunderX3T110.td @@ -21,7 +21,6 @@ def ThunderX3T110Model : SchedMachineModel { let MispredictPenalty = 12; // Extra cycles for mispredicted branch. // Determined via a mix of micro-arch details and experimentation. let LoopMicroOpBufferSize = 128; // FIXME: might be much bigger in TX3. - let PostRAScheduler = 1; // Using PostRA sched. let CompleteModel = 1; list UnsupportedFeatures = !listconcat(SVEUnsupported.F, ``
[llvm-branch-commits] [AArch64] Remove usage of PostRAScheduler (PR #92871)
https://github.com/wangpc-pp created https://github.com/llvm/llvm-project/pull/92871 This doesn't take effect as we have overrided `enablePostRAScheduler` and we should use the `FeaturePostRAScheduler` feature in processor definitions. ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/mizvekov edited https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
@@ -10082,7 +10082,9 @@ class Sema final : public SemaBase { bool SubstTemplateArgument(const TemplateArgumentLoc , const MultiLevelTemplateArgumentList , - TemplateArgumentLoc ); + TemplateArgumentLoc , + SourceLocation Loc = {}, + const DeclarationName = {}); Endilll wrote: Can you add this to the description? https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/Endilll edited https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
@@ -10082,7 +10082,9 @@ class Sema final : public SemaBase { bool SubstTemplateArgument(const TemplateArgumentLoc , const MultiLevelTemplateArgumentList , - TemplateArgumentLoc ); + TemplateArgumentLoc , + SourceLocation Loc = {}, + const DeclarationName = {}); mizvekov wrote: There are a few places we used SubsType, because we only had a type, now we use SubstTemplateArgument. SubstTemplateArgument was missing arguments for setting Instantiation location and entity names. Adding those is needed so we don't regress in diagnostics. https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/Endilll commented: It looks like you have two sets of changes here: 1) the ones related to `TemplateTypeParmDecl::getDefaultArgument()` 2) the ones related to `Sema::SubstTemplateArgument()` You don't seem to touch the latter in PR description. It would be nice if you can explain why you do both sets of changes in one PR, or split the PR in two. https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
@@ -10082,7 +10082,9 @@ class Sema final : public SemaBase { bool SubstTemplateArgument(const TemplateArgumentLoc , const MultiLevelTemplateArgumentList , - TemplateArgumentLoc ); + TemplateArgumentLoc , + SourceLocation Loc = {}, + const DeclarationName = {}); Endilll wrote: Changes to both declaration and implementation of `SubstTemplateArgument` doesn't seem related. https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [clang-tools-extra] [clang] NFCI: use TemplateArgumentLoc for type-param DefaultArgument (PR #92854)
https://github.com/Endilll edited https://github.com/llvm/llvm-project/pull/92854 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits