Clean-up IGC part of the driver solution by sorting cmake targets in…

…to directories

Clean-up IGC part of the driver solution by sorting cmake targets into directories

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}")
 

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}")

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()

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()

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)

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")

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

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}")
 

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}

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")

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})

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)
 

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")

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")

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}")

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")

IGC/ZEBinWriter/zebin/spec/version.md

@@ -7,14 +7,15 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ==========================-->
 
 # ZEBIN Version
-Version 1.45
+Version 1.46
 
 ## Versioning
 Format: \<_Major number_\>.\<_Minor number_\>
 - Major number: Increase when non-backward-compatible features are added. For example, rename attributes or remove attributes.
 - 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.

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)

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")

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")

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)