Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-11-10 05:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve VS solution tree

Browse Source 
Move shared specific targets to neo shared folder
Move opencl specific targets to opencl runtime folder

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-11-19 10:12:40 +01:00
committed by Compute-Runtime-Automation
parent 2003fe46a6
commit 920d873657
13 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/source/CMakeLists.txt
View File

@@ -15,6 +15,7 @@ endif()
project(neo) project(neo)
set(MSVC_DEF_ADDITIONAL_EXPORTS "") set(MSVC_DEF_ADDITIONAL_EXPORTS "")
set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime") set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime")
set(OPENCL_BUIILINS_PROJECTS_FOLDER "built_ins")
if(NOT TARGET ${BIKSIM_LIB_NAME}) if(NOT TARGET ${BIKSIM_LIB_NAME})
add_subdirectory(builtin_kernels_simulation) add_subdirectory(builtin_kernels_simulation)

2
opencl/source/built_ins/kernels/CMakeLists.txt
View File

@@ -5,7 +5,7 @@
# #
add_custom_target(builtins_vme_sources) add_custom_target(builtins_vme_sources)
set_target_properties(builtins_vme_sources PROPERTIES FOLDER "built_ins") set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins_vme_sources) add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins_vme_sources)
add_subdirectories() add_subdirectories()

2
opencl/source/built_ins/registry/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ add_library(${BUILTINS_VME_LIB_NAME} OBJECT EXCLUDE_FROM_ALL
register_ext_vme_source.cpp register_ext_vme_source.cpp
) )
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
target_include_directories(${BUILTINS_VME_LIB_NAME} PRIVATE target_include_directories(${BUILTINS_VME_LIB_NAME} PRIVATE
${KHRONOS_HEADERS_DIR} ${KHRONOS_HEADERS_DIR}

2
opencl/source/builtin_kernels_simulation/CMakeLists.txt
View File

@@ -53,5 +53,5 @@ target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
${NEO__IGC_INCLUDE_DIR} ${NEO__IGC_INCLUDE_DIR}
${THIRD_PARTY_DIR} ${THIRD_PARTY_DIR}
) )
set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=) target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=)

7
opencl/source/scheduler/scheduler_binary.cmake
View File

@@ -5,8 +5,9 @@
# #
add_custom_target(scheduler) add_custom_target(scheduler)
set(OPENCL_SCHEDULER_PROJECTS_FOLDER "scheduler")
set(SCHEDULER_OUTDIR_WITH_ARCH "${TargetDir}/scheduler/${NEO_ARCH}") set(SCHEDULER_OUTDIR_WITH_ARCH "${TargetDir}/scheduler/${NEO_ARCH}")
set_target_properties(scheduler PROPERTIES FOLDER "scheduler") set_target_properties(scheduler PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}")
set(SCHEDULER_KERNEL scheduler.cl) set(SCHEDULER_KERNEL scheduler.cl)
if(DEFINED NEO__IGC_INCLUDE_DIR) if(DEFINED NEO__IGC_INCLUDE_DIR)
@@ -55,7 +56,7 @@ function(compile_kernel target gen_type platform_type kernel)
set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE) set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE)
add_custom_target(${target} DEPENDS ${OUTPUTPATH}) add_custom_target(${target} DEPENDS ${OUTPUTPATH})
set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/scheduler/${gen_type_lower}") set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}/${gen_type_lower}")
endfunction() endfunction()
macro(macro_for_each_gen) macro(macro_for_each_gen)
@@ -88,7 +89,7 @@ endif()
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES FOLDER "scheduler") set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}")
add_dependencies(${SCHEDULER_BINARY_LIB_NAME} scheduler) add_dependencies(${SCHEDULER_BINARY_LIB_NAME} scheduler)

1
opencl/test/unit_test/CMakeLists.txt
View File

@@ -207,6 +207,7 @@ if(UNIX)
endif() endif()
set_target_properties(unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER}) set_target_properties(unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(copy_test_files_per_product PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER}) set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(run_unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER}) set_target_properties(run_unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})

4
shared/source/CMakeLists.txt
View File

@@ -4,8 +4,9 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
set(SHARED_SOURCE_PROJECTS_FOLDER "neo shared")
if(NOT DEFINED NEO_SHARED_RELEASE_LIB_NAME) if(NOT DEFINED NEO_SHARED_RELEASE_LIB_NAME)
MESSAGE(FATAL_ERROR "NEO Core library name undefined!") MESSAGE(FATAL_ERROR "NEO Shared library name undefined!")
endif() endif()
include(enable_gens.cmake) include(enable_gens.cmake)
@@ -25,6 +26,7 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_GEN_FLAGS_DEFINITONS}) list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_GEN_FLAGS_DEFINITONS})
set_property(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) set_property(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
set_target_properties(${LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}")
target_compile_definitions(${LIB_NAME} PUBLIC PUBLIC GMM_LIB_DLL ${LIB_FLAGS_DEFINITIONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM} PRIVATE OGL=1) target_compile_definitions(${LIB_NAME} PUBLIC PUBLIC GMM_LIB_DLL ${LIB_FLAGS_DEFINITIONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM} PRIVATE OGL=1)
target_compile_definitions(${LIB_NAME} PUBLIC ${NEO_CORE_COMPILE_DEFS}) target_compile_definitions(${LIB_NAME} PUBLIC ${NEO_CORE_COMPILE_DEFS})

1
shared/source/built_ins/CMakeLists.txt
View File

@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
set(SHARED_BUIILINS_PROJECTS_FOLDER "built_ins")
set(NEO_CORE_SRCS_BUILT_INS set(NEO_CORE_SRCS_BUILT_INS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/built_ins_storage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_storage.cpp

4
shared/source/built_ins/builtins_binary.cmake
View File

@@ -80,7 +80,7 @@ endif()
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
target_include_directories(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PRIVATE target_include_directories(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PRIVATE
${ENGINE_NODE_DIR} ${ENGINE_NODE_DIR}
@@ -98,7 +98,7 @@ endif()
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
target_include_directories(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PRIVATE target_include_directories(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PRIVATE
${ENGINE_NODE_DIR} ${ENGINE_NODE_DIR}

4
shared/source/built_ins/kernels/CMakeLists.txt
View File

@@ -5,7 +5,7 @@
# #
add_custom_target(builtins) add_custom_target(builtins)
set_target_properties(builtins PROPERTIES FOLDER "built_ins") set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins) add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins)
add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins) add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins)
@@ -182,7 +182,7 @@ macro(macro_for_each_gen)
set(target_name builtins_${family_name_with_type}) set(target_name builtins_${family_name_with_type})
add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS}) add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS})
add_dependencies(builtins ${target_name}) add_dependencies(builtins ${target_name})
set_target_properties(${target_name} PROPERTIES FOLDER "built_ins/${family_name_with_type}") set_target_properties(${target_name} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}/${family_name_with_type}")
endif() endif()
endforeach() endforeach()
endmacro() endmacro()

2
shared/source/built_ins/registry/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL
) )
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE
${ENGINE_NODE_DIR} ${ENGINE_NODE_DIR}

2
shared/test/unit_test/CMakeLists.txt
View File

@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
set(SHARED_TEST_PROJECTS_FOLDER "neo shared")
if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS) if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS)
set(TARGET_NAME neo_shared_tests) set(TARGET_NAME neo_shared_tests)
@@ -83,6 +84,7 @@ if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS)
endif() endif()
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
target_include_directories(${TARGET_NAME} PRIVATE target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}

10
shared/test/unit_test/test_files/CMakeLists.txt
View File

@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
set(SHARED_TEST_PROJECTS_SUB_FOLDER "prepare test files")
if(NOT DEFINED cloc_cmd_prefix) if(NOT DEFINED cloc_cmd_prefix)
if(WIN32) if(WIN32)
set(cloc_cmd_prefix ocloc) set(cloc_cmd_prefix ocloc)
@@ -62,18 +63,19 @@ function(neo_shared_copy_test_files target product revision_id)
DEPENDS ${source_dir} DEPENDS ${source_dir}
) )
add_dependencies(${target} copy_compiler_files) add_dependencies(${target} copy_compiler_files)
set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}") set_target_properties(${target} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}/${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
endfunction() endfunction()
file(GLOB_RECURSE TEST_KERNELS *.cl) file(GLOB_RECURSE TEST_KERNELS *.cl)
add_custom_target(prepare_test_kernel_for_shared) add_custom_target(prepare_test_kernel_for_shared)
set_target_properties(prepare_test_kernel_for_shared PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}")
macro(macro_for_each_platform) macro(macro_for_each_platform)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
if(${PLATFORM_IT}_IS_${PLATFORM_TYPE}) if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID}) neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID})
add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT}_${REVISION_ID}) add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID})
endif() endif()
endforeach() endforeach()
endforeach() endforeach()
@@ -91,7 +93,7 @@ macro(macro_for_each_gen)
compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS}) compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS})
add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}}) add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
set_target_properties(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}") set_target_properties(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}/${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
add_dependencies(prepare_test_kernel_for_shared prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID}) add_dependencies(prepare_test_kernel_for_shared prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID})
endforeach() endforeach()
endif() endif()