From 6256eb795b14b42cad0253ae389b5bfecca097fb Mon Sep 17 00:00:00 2001 From: "Jakacki, Jakub" Date: Tue, 6 Aug 2024 09:01:29 +0000 Subject: [PATCH] Clean-up IGC part of the driver solution by sorting cmake targets into directories Clean-up IGC part of the driver solution by sorting cmake targets into directories --- IGC/AdaptorOCL/CMakeLists.txt | 2 ++ IGC/BiFModule/CMakeLists.txt | 2 ++ IGC/BiFModule/cmake/BiFModuleCache.cmake | 4 ++++ IGC/CMakeLists.txt | 4 ++++ IGC/Compiler/CMakeLists.txt | 2 ++ IGC/Compiler/tests/CMakeLists.txt | 2 +- IGC/DebugInfo/CMakeLists.txt | 2 ++ IGC/ElfPackager/CMakeLists.txt | 1 + IGC/GenISAIntrinsics/CMakeLists.txt | 5 ++++- IGC/MDAutogen/CMakeLists.txt | 1 + IGC/Metrics/protobuf_metrics.cmake | 3 +++ IGC/Options/CMakeLists.txt | 2 ++ IGC/Options/include/igc/Options/CMakeLists.txt | 1 + IGC/PCH/CMakeLists.txt | 1 + IGC/VISALinkerDriver/CMakeLists.txt | 2 ++ IGC/ZEBinWriter/zebin/CMakeLists.txt | 2 ++ IGC/ZEBinWriter/zebin/spec/version.md | 3 ++- visa/CMakeLists.txt | 7 ++++++- visa/FC_linker/CMakeLists.txt | 2 +- visa/iga/IGAExe/CMakeLists.txt | 2 +- visa/iga/IGALibrary/CMakeLists.txt | 8 ++++---- 21 files changed, 48 insertions(+), 10 deletions(-) diff --git a/IGC/AdaptorOCL/CMakeLists.txt b/IGC/AdaptorOCL/CMakeLists.txt index 91fac5ae24c0..67aec6ff686c 100644 --- a/IGC/AdaptorOCL/CMakeLists.txt +++ b/IGC/AdaptorOCL/CMakeLists.txt @@ -168,6 +168,8 @@ add_library("${IGC_BUILD__PROJ__AdaptorOCL}" STATIC ${IGC_BUILD__HDR__AdaptorOCL} ) +set_target_properties("${IGC_BUILD__PROJ__AdaptorOCL}" PROPERTIES FOLDER "Libraries/Adaptors") + add_dependencies("${IGC_BUILD__PROJ__AdaptorOCL}" "${IGC_BUILD__PROJ__GenISAIntrinsics}") set_property(TARGET "${IGC_BUILD__PROJ__AdaptorOCL}" PROPERTY PROJECT_LABEL "${IGC_BUILD__PROJ_LABEL__AdaptorOCL}") diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt index 4fd94db5ca40..c564619a6743 100644 --- a/IGC/BiFModule/CMakeLists.txt +++ b/IGC/BiFModule/CMakeLists.txt @@ -634,6 +634,8 @@ add_custom_target("${IGC_BUILD__PROJ__BiFModule_OCL}" ) set_property(TARGET "${IGC_BUILD__PROJ__BiFModule_OCL}" PROPERTY PROJECT_LABEL "${IGC_BUILD__PROJ_LABEL__BiFModule_OCL}") +set_target_properties("${IGC_BUILD__PROJ__BiFModule_OCL}" PROPERTIES FOLDER "Misc/BiF") + generate_bif_src_checksum(${IGC_BUILD__PROJ__BiFModule_OCL}) generate_bif_prebuild_pack(${IGC_BUILD__PROJ__BiFModule_OCL} "${IGC_BUILD__PROJ_DEPENDS_BiFModule_OCL}") diff --git a/IGC/BiFModule/cmake/BiFModuleCache.cmake b/IGC/BiFModule/cmake/BiFModuleCache.cmake index c3bb9d90d907..20381c6d2938 100644 --- a/IGC/BiFModule/cmake/BiFModuleCache.cmake +++ b/IGC/BiFModule/cmake/BiFModuleCache.cmake @@ -43,6 +43,8 @@ add_custom_target("${IGC_BUILD__PROJ__BiFModuleCache_INIT}" DEPENDS "${BiFModule_Init}" ) +set_target_properties("${IGC_BUILD__PROJ__BiFModuleCache_INIT}" PROPERTIES FOLDER "Misc/BiF") + # Function generates BiFModule-SRC checksum # @param bifModuleTgt BiFModule target function(generate_bif_src_checksum bifModuleTgt) @@ -62,6 +64,7 @@ function(generate_bif_src_checksum bifModuleTgt) add_custom_target("${IGC_BUILD__PROJ__BiFModuleCache_SRC_CHECKSUM_OCL}" DEPENDS "${BiFModule_SRC_SHA_PATH}" ) + set_target_properties("${IGC_BUILD__PROJ__BiFModuleCache_SRC_CHECKSUM_OCL}" PROPERTIES FOLDER "Misc/BiF") add_dependencies(${bifModuleTgt} ${IGC_BUILD__PROJ__BiFModuleCache_SRC_CHECKSUM_OCL}) @@ -89,4 +92,5 @@ function(generate_bif_prebuild_pack bifModuleTgt bifModuleDepends) add_custom_target("${IGC_BUILD__PROJ__BiFModuleCache_OCL}" DEPENDS ${bifModuleTgt} "${BiFModule_PREBUILD_SHA_PATH}" ) + set_target_properties("${IGC_BUILD__PROJ__BiFModuleCache_OCL}" PROPERTIES FOLDER "Misc/BiF") endfunction() diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt index 86f5ca4774e9..748f81668c4b 100644 --- a/IGC/CMakeLists.txt +++ b/IGC/CMakeLists.txt @@ -1604,6 +1604,8 @@ if (FCL_ENABLED) ${IGC_BUILD__RES__IGC__fcl_dll} ) + set_target_properties("${IGC_BUILD__PROJ__fcl_dll}" PROPERTIES FOLDER "Libraries") + add_dependencies("${IGC_BUILD__PROJ__fcl_dll}" opencl-clang-lib) endif() @@ -1714,6 +1716,8 @@ if(IGC_OPTION__BUILD_IGC_OPT OR IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS) ${IGC_BUILD__SRC__IGC__igc_lib} ${IGC_BUILD__HDR__IGC__igc_lib} ) + set_target_properties("${IGC_BUILD__PROJ__igc_lib}" PROPERTIES FOLDER "Libraries") + if(IGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR) target_link_libraries("${IGC_BUILD__PROJ__igc_lib}" PRIVATE LLVMSPIRVLib) endif() diff --git a/IGC/Compiler/CMakeLists.txt b/IGC/Compiler/CMakeLists.txt index bb6a69c1a48e..101636f67ff3 100644 --- a/IGC/Compiler/CMakeLists.txt +++ b/IGC/Compiler/CMakeLists.txt @@ -202,6 +202,8 @@ add_library("${IGC_BUILD__PROJ__Compiler}" STATIC ${IGC_BUILD__HDR__Compiler} ${IGC_BUILD__HDR_Win_Lin_Dar__Compiler} ) + +set_target_properties("${IGC_BUILD__PROJ__Compiler}" PROPERTIES FOLDER "Libraries") set_property(TARGET "${IGC_BUILD__PROJ__Compiler}" PROPERTY PROJECT_LABEL "${IGC_BUILD__PROJ_LABEL__Compiler}") target_link_libraries("${IGC_BUILD__PROJ__Compiler}" IGCOptions) diff --git a/IGC/Compiler/tests/CMakeLists.txt b/IGC/Compiler/tests/CMakeLists.txt index a454dd719ad4..c99d9e9a0013 100644 --- a/IGC/Compiler/tests/CMakeLists.txt +++ b/IGC/Compiler/tests/CMakeLists.txt @@ -74,4 +74,4 @@ set_target_properties(check-igc # Line below is just used to group LIT-related targets in single directory # in IDE. This is completely optional. -set_target_properties(check-igc PROPERTIES FOLDER "LIT Tests") +set_target_properties(check-igc PROPERTIES FOLDER "Tests/LIT Tests") diff --git a/IGC/DebugInfo/CMakeLists.txt b/IGC/DebugInfo/CMakeLists.txt index 393122de52e6..814f9beef819 100644 --- a/IGC/DebugInfo/CMakeLists.txt +++ b/IGC/DebugInfo/CMakeLists.txt @@ -22,6 +22,8 @@ set(DEBUG_INFO_LIBRARY_SOURCES add_library(GenXDebugInfo STATIC ${DEBUG_INFO_LIBRARY_SOURCES}) add_dependencies(GenXDebugInfo intrinsics_gen ${IGC_BUILD__PROJ__GenISAIntrinsics}) +set_target_properties(GenXDebugInfo PROPERTIES FOLDER "Libraries") + igc_get_llvm_targets(LLVM_LIBS BinaryFormat Core diff --git a/IGC/ElfPackager/CMakeLists.txt b/IGC/ElfPackager/CMakeLists.txt index 03206336fd21..9bcc428d9a1d 100644 --- a/IGC/ElfPackager/CMakeLists.txt +++ b/IGC/ElfPackager/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT TARGET ${IGC_BUILD__PROJ__ElfPackager}) ${IGC_SOURCE_DIR}/AdaptorOCL/CLElfLib/ElfWriter.h ${IGC_SOURCE_DIR}/AdaptorOCL/CLElfLib/ElfReader.h ) + set_target_properties("${IGC_BUILD__PROJ__ElfPackager}" PROPERTIES FOLDER "Tools") add_dependencies("${IGC_BUILD__PROJ__ElfPackager}" "${IGC_BUILD__PROJ__GenISAIntrinsics}") diff --git a/IGC/GenISAIntrinsics/CMakeLists.txt b/IGC/GenISAIntrinsics/CMakeLists.txt index 60bc68e2b853..63482039333e 100644 --- a/IGC/GenISAIntrinsics/CMakeLists.txt +++ b/IGC/GenISAIntrinsics/CMakeLists.txt @@ -81,7 +81,7 @@ FILES ${IGC_BUILD__GenISAIntrinsics_GENERATOR_TEMPLATES} ) -set_property(TARGET IntrinsicDefintionGenerator PROPERTY FOLDER "CommonGenerators") +set_property(TARGET IntrinsicDefintionGenerator PROPERTY FOLDER "Misc/CommonGenerators") set(IGC_BUILD__SRC__GenISAIntrinsics ${IGC_BUILD__GenISAIntrinsics_GENERATOR_OUTPUT_SOURCES} @@ -104,6 +104,9 @@ add_library("${IGC_BUILD__PROJ__GenISAIntrinsics}" STATIC ${IGC_BUILD__SRC__GenISAIntrinsics} ${IGC_BUILD__HDR__GenISAIntrinsics} ) + +set_target_properties("${IGC_BUILD__PROJ__GenISAIntrinsics}" PROPERTIES FOLDER "Libraries") + target_include_directories("${IGC_BUILD__PROJ__GenISAIntrinsics}" PRIVATE ${IGC_OPTION__OUTPUT_DIR}/${IGC_CMAKE_CFG_INTDIR} diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt index 4c1eec65ef05..c9522feea29d 100644 --- a/IGC/MDAutogen/CMakeLists.txt +++ b/IGC/MDAutogen/CMakeLists.txt @@ -21,6 +21,7 @@ add_custom_command(OUTPUT "${_autogenTarget}" add_custom_target(MDAutogen DEPENDS "${_autogenTarget}" COMMENT "Building custom target for Metadata Framework") +set_target_properties(MDAutogen PROPERTIES FOLDER "Misc") set_property(TARGET MDAutogen PROPERTY PROJECT_LABEL "MetadataFrameWorkAutogen") diff --git a/IGC/Metrics/protobuf_metrics.cmake b/IGC/Metrics/protobuf_metrics.cmake index a22b79d43d82..696a7c62b377 100644 --- a/IGC/Metrics/protobuf_metrics.cmake +++ b/IGC/Metrics/protobuf_metrics.cmake @@ -27,6 +27,7 @@ if(IGC_METRICS) add_custom_target(igc_metric_proto_sources_generator DEPENDS ${IGC_METRICS_SRC} ${IGC_METRICS_SRC} SOURCES ${IGC_METRICS_PROTO_SCHEMAS}) + set_target_properties(igc_metric_proto_sources_generator PROPERTIES FOLDER "Misc") get_target_property(PROTOBUF_HDRS protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES) @@ -55,6 +56,7 @@ if(IGC_METRICS) DEPENDS ${_proto_files} SOURCES "${CMAKE_CURRENT_LIST_DIR}/create_metrics_version_header.cmake" ) + set_target_properties(igc_metric_version_header_generator PROPERTIES FOLDER "Misc") list(APPEND IGC_METRICS_HDRS ${IGCMetricsVerFile}) @@ -71,6 +73,7 @@ list(APPEND IGC_METRICS_HDRS "Metrics/IGCMetric.h") list(APPEND IGC_METRICS_HDRS "Metrics/IGCMetricImpl.h") add_library(igc_metric STATIC ${IGC_METRICS_SRCS} ${IGC_METRICS_HDRS}) +set_target_properties(igc_metric PROPERTIES FOLDER "Libraries") add_dependencies(igc_metric intrinsics_gen) add_dependencies(igc_metric ${IGC_BUILD__PROJ__GenISAIntrinsics}) diff --git a/IGC/Options/CMakeLists.txt b/IGC/Options/CMakeLists.txt index 1dc079d1c1eb..42715a77c08f 100644 --- a/IGC/Options/CMakeLists.txt +++ b/IGC/Options/CMakeLists.txt @@ -8,6 +8,8 @@ add_library(IGCOptions STATIC "") +set_target_properties(IGCOptions PROPERTIES FOLDER "Misc") + add_subdirectory(src) add_subdirectory(include/igc/Options) diff --git a/IGC/Options/include/igc/Options/CMakeLists.txt b/IGC/Options/include/igc/Options/CMakeLists.txt index 8cd6f23b3d87..9413ddfabafe 100644 --- a/IGC/Options/include/igc/Options/CMakeLists.txt +++ b/IGC/Options/include/igc/Options/CMakeLists.txt @@ -13,3 +13,4 @@ set(LLVM_TARGET_DEFINITIONS InternalOptions.td) igc_tablegen(LLVM InternalOptions.inc -gen-opt-parser-defs) add_public_tablegen_target(IGCOptionsTablegen) +set_target_properties(IGCOptionsTablegen PROPERTIES FOLDER "Misc") diff --git a/IGC/PCH/CMakeLists.txt b/IGC/PCH/CMakeLists.txt index 1677fb833650..8af5de4073bc 100644 --- a/IGC/PCH/CMakeLists.txt +++ b/IGC/PCH/CMakeLists.txt @@ -12,3 +12,4 @@ if(MSVC) endif() add_library(${IGC_BUILD__PROJ__PCH} STATIC ${PCH_FILES}) +set_target_properties(${IGC_BUILD__PROJ__PCH} PROPERTIES FOLDER "Misc") diff --git a/IGC/VISALinkerDriver/CMakeLists.txt b/IGC/VISALinkerDriver/CMakeLists.txt index 76c60620d825..fb2775385f34 100644 --- a/IGC/VISALinkerDriver/CMakeLists.txt +++ b/IGC/VISALinkerDriver/CMakeLists.txt @@ -22,6 +22,8 @@ set(VLD_INCLUDE_FILE add_library("${IGC_BUILD__PROJ__VISALinkerDriver}" STATIC ${VLD_SOURCE_FILE} ${VLD_INFO_INCLUDE_FILE}) +set_target_properties("${IGC_BUILD__PROJ__VISALinkerDriver}" PROPERTIES FOLDER "Libraries") + # This is needed for llvm/IR/Attributes.inc: No such file or directory error add_dependencies("${IGC_BUILD__PROJ__VISALinkerDriver}" "${IGC_BUILD__PROJ__GenISAIntrinsics}") add_dependencies("${IGC_BUILD__PROJ__VISALinkerDriver}" "${IGC_BUILD__PROJ__SPIRV-Tools}") diff --git a/IGC/ZEBinWriter/zebin/CMakeLists.txt b/IGC/ZEBinWriter/zebin/CMakeLists.txt index 842a921c910f..0178cd8ec15e 100644 --- a/IGC/ZEBinWriter/zebin/CMakeLists.txt +++ b/IGC/ZEBinWriter/zebin/CMakeLists.txt @@ -24,3 +24,5 @@ if(MSVC) ) target_compile_options(zebinlib PRIVATE ${ZEBIN_COMPILER_OPTIONS}) endif() + +set_target_properties(zebinlib PROPERTIES FOLDER "Libraries") diff --git a/IGC/ZEBinWriter/zebin/spec/version.md b/IGC/ZEBinWriter/zebin/spec/version.md index b9e1d914be6e..32c493cf4b47 100644 --- a/IGC/ZEBinWriter/zebin/spec/version.md +++ b/IGC/ZEBinWriter/zebin/spec/version.md @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT ============================= end_copyright_notice ==========================--> # ZEBIN Version -Version 1.45 +Version 1.46 ## Versioning Format: \<_Major number_\>.\<_Minor number_\> @@ -15,6 +15,7 @@ Format: \<_Major number_\>.\<_Minor number_\> - Minor number: Increase when backward-compatible features are added. For example, add new attributes. ## Change Note +- **Version 1.46**: Change cmake target directory from IGC/zebinlib to IGC/Libraries/zebinlib - **Version 1.45**: Add .text section into ELF section content. - **Version 1.44**: Add implicit arg for inline sampler in bindless mode. - **Version 1.43**: Internal changes. diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt index 9e773f1400a6..e59782446549 100644 --- a/visa/CMakeLists.txt +++ b/visa/CMakeLists.txt @@ -84,6 +84,8 @@ endif(WIN32) # In the case where this is the IGC build we need to add a dummy custom target check_headers add_custom_target(check_headers) +set_target_properties(check_headers PROPERTIES FOLDER "Misc") + if(MSVC) bs_set_wdk(check_headers) endif(MSVC) @@ -144,6 +146,8 @@ list(APPEND CISAScanner_dependencies add_custom_target(CISAScanner_target DEPENDS ${CISAScanner_dependencies}) +set_target_properties(CISAScanner_target PROPERTIES FOLDER "Misc") + if (MSVC) #set up standard defines from the common WDK path. bs_set_wdk(CISAScanner_target) @@ -461,7 +465,7 @@ if (UNIX OR WIN32) set_target_properties(GenX_IR_Exe PROPERTIES COMPILE_DEFINITIONS "${GenX_IR_Exe_DEFINITIONS}" - FOLDER CM_JITTER_EXE) + FOLDER "Tools/CM_JITTER_EXE") if (MSVC) #set up standard defines from the common WDK path. @@ -521,6 +525,7 @@ endif() ${FLEX_CISAScanner_OUTPUTS} ${GenX_IR_EXE_lex_yacc} ) + set_target_properties(GenX_IR PROPERTIES FOLDER "Libraries") add_dependencies(GenX_IR CISAScanner_target) set_target_properties( GenX_IR PROPERTIES OUTPUT_NAME "igfxcmjit${TARGET_MODIFIER}") if(WIN32) diff --git a/visa/FC_linker/CMakeLists.txt b/visa/FC_linker/CMakeLists.txt index 10711c95aff4..e6881ead42a6 100644 --- a/visa/FC_linker/CMakeLists.txt +++ b/visa/FC_linker/CMakeLists.txt @@ -82,7 +82,7 @@ set_target_properties(FC_EXE PROPERTIES COMPILE_DEFINITIONS "${FC_EXE_DEFINITIONS}" PDB_NAME "fc_exe" LINK_FLAGS "${FC_EXE_LINK_FLAGS}" - FOLDER "FCProjs" + FOLDER "Tools/FCProjs" ) target_include_directories(FC_EXE PUBLIC "../include") diff --git a/visa/iga/IGAExe/CMakeLists.txt b/visa/iga/IGAExe/CMakeLists.txt index 4d1a4a3ef4fa..a8bb5a79cb07 100644 --- a/visa/iga/IGAExe/CMakeLists.txt +++ b/visa/iga/IGAExe/CMakeLists.txt @@ -127,7 +127,7 @@ set_target_properties(IGA_EXE PROPERTIES COMPILE_DEFINITIONS "${IGA_EXE_DEFINITIONS}" PDB_NAME "iga${TARGET_MODIFIER}_exe" LINK_FLAGS "${IGA_EXE_LINK_FLAGS}" - FOLDER "IGAProjs" + FOLDER "Tools/IGAProjs" ) target_include_directories(IGA_EXE PUBLIC "../IGALibrary" "../include") diff --git a/visa/iga/IGALibrary/CMakeLists.txt b/visa/iga/IGALibrary/CMakeLists.txt index ea39ddeae2b2..ca03acdaeb02 100644 --- a/visa/iga/IGALibrary/CMakeLists.txt +++ b/visa/iga/IGALibrary/CMakeLists.txt @@ -212,7 +212,7 @@ set_target_properties(IGA_OLIB PROPERTIES COMPILE_DEFINITIONS "${IGA_DEFINITIONS}" COMPILER_FLAGS "${IGA_COMPILER_FLAGS}" LINK_FLAGS "${IGA_LINK_FLAGS}" - FOLDER "IGAProjs" + FOLDER "Libraries/IGAProjs" ) if(IGC_BUILD AND MSVC) @@ -244,7 +244,7 @@ set_target_properties(IGA_SLIB PROPERTIES COMPILE_DEFINITIONS "${IGA_SLIB_DEFINITIONS}" COMPILER_FLAGS "${IGA_COMPILER_FLAGS}" LINK_FLAGS "${IGA_SLIB_LINK_FLAGS}" - FOLDER "IGAProjs" + FOLDER "Libraries/IGAProjs" ) if(IGC_BUILD AND MSVC) @@ -285,7 +285,7 @@ set_target_properties(IGA_ENC_LIB PROPERTIES COMPILE_DEFINITIONS "${IGA_ENC_LIB_DEFINITIONS}" COMPILER_FLAGS "${IGA_COMPILER_FLAGS}" LINK_FLAGS "${IGA_LINK_FLAGS}" - FOLDER "IGAProjs" + FOLDER "Libraries/IGAProjs" ) if(IGC_BUILD AND MSVC) @@ -326,7 +326,7 @@ set_property(TARGET IGA_DLL APPEND PROPERTY LINK_FLAGS "${IGA_DLL_LINK_FLAGS}" ) set_property(TARGET IGA_DLL APPEND PROPERTY - FOLDER "IGAProjs" + FOLDER "Libraries/IGAProjs" ) if(IGC_BUILD AND MSVC)