From 5943113a013739de54416ffc200591dc8db8238c Mon Sep 17 00:00:00 2001 From: Katarzyna Cencelewska Date: Mon, 10 Jan 2022 17:44:23 +0000 Subject: [PATCH] Remove device enqueue part 2 Clear "SUPPORT_DEVICE_ENQUEUE" from cmakes Related-To: NEO-6559 Signed-off-by: Katarzyna Cencelewska --- .../builtin_kernels_simulation/CMakeLists.txt | 5 ----- opencl/source/enable_cores.cmake | 17 +------------- .../source/scheduler/scheduler_binary.cmake | 22 +------------------ platforms.cmake | 1 - 4 files changed, 2 insertions(+), 43 deletions(-) diff --git a/opencl/source/builtin_kernels_simulation/CMakeLists.txt b/opencl/source/builtin_kernels_simulation/CMakeLists.txt index 34b5b4a0aa..9b0fbb5ccc 100644 --- a/opencl/source/builtin_kernels_simulation/CMakeLists.txt +++ b/opencl/source/builtin_kernels_simulation/CMakeLists.txt @@ -35,11 +35,6 @@ endif() macro(macro_for_each_core_type) foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) list(APPEND DEFAULT_CORE_PLATFORMS_DEFITIONS DEFAULT_${CORE_TYPE}_PLATFORM=${DEFAULT_SUPPORTED_${CORE_TYPE}_PLATFORM}) - if(${SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE}}) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/scheduler_simulation_${CORE_TYPE_LOWER}.cpp) - list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/scheduler_simulation_${CORE_TYPE_LOWER}.cpp) - endif() - endif() endforeach() endmacro() diff --git a/opencl/source/enable_cores.cmake b/opencl/source/enable_cores.cmake index 8802988bf1..86996ac0b0 100644 --- a/opencl/source/enable_cores.cmake +++ b/opencl/source/enable_cores.cmake @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright (C) 2018-2022 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -23,21 +23,6 @@ macro(macro_for_each_core_type) include("${COREX_PREFIX}/additional_files_${CORE_TYPE_LOWER}.cmake") endif() - if(${SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE}}) - if(EXISTS ${COREX_PREFIX}/device_enqueue.h) - list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/device_enqueue.h) - endif() - if(EXISTS ${COREX_PREFIX}/scheduler_definitions.h) - list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/scheduler_definitions.h) - endif() - if(EXISTS ${COREX_PREFIX}/scheduler_builtin_kernel.inl) - list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/scheduler_builtin_kernel.inl) - endif() - if(EXISTS ${COREX_PREFIX}/device_queue_${CORE_TYPE_LOWER}.cpp) - list(APPEND RUNTIME_SRCS_${CORE_TYPE}_CPP_BASE ${COREX_PREFIX}/device_queue_${CORE_TYPE_LOWER}.cpp) - endif() - endif() - foreach(SRC_IT ${RUNTIME_SRCS_COREX_CPP_BASE}) if(EXISTS ${COREX_PREFIX}/${SRC_IT}_${CORE_TYPE_LOWER}.cpp) list(APPEND RUNTIME_SRCS_${CORE_TYPE}_CPP_BASE ${COREX_PREFIX}/${SRC_IT}_${CORE_TYPE_LOWER}.cpp) diff --git a/opencl/source/scheduler/scheduler_binary.cmake b/opencl/source/scheduler/scheduler_binary.cmake index d9ec8efb53..143f2d38a3 100644 --- a/opencl/source/scheduler/scheduler_binary.cmake +++ b/opencl/source/scheduler/scheduler_binary.cmake @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright (C) 2018-2022 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -69,26 +69,6 @@ function(compile_kernel target core_type platform_type kernel) endif() endfunction() -macro(macro_for_each_core_type) - foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) - if(${CORE_TYPE}_HAS_${PLATFORM_TYPE} AND SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE}) - get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE}) - set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM}) - if(COMPILE_BUILT_INS AND PLATFORM_2_0_LOWER) - compile_kernel(scheduler_${family_name_with_type} ${CORE_TYPE} ${PLATFORM_TYPE} ${SCHEDULER_KERNEL}) - if(TARGET scheduler_${family_name_with_type}) - add_dependencies(scheduler scheduler_${family_name_with_type}) - list(APPEND SCHEDULER_TARGETS scheduler_${family_name_with_type}) - endif() - list(APPEND GENERATED_SCHEDULER_CPPS ${SCHEDULER_CPP}) - endif() - endif() - endforeach() - if(NOT "${GENERATED_SCHEDULER_CPPS}" STREQUAL "") - source_group("generated files\\${CORE_TYPE_LOWER}" FILES ${GENERATED_SCHEDULER_CPPS}) - endif() -endmacro() - apply_macro_for_each_core_type("SUPPORTED") add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt) diff --git a/platforms.cmake b/platforms.cmake index 95ef7aed6f..2f8a485e1c 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -158,7 +158,6 @@ macro(SET_FLAGS_FOR CORE_TYPE) set(SUPPORT_${CORE_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${CORE_TYPE} devices") set(TESTS_${CORE_TYPE} ${SUPPORT_${CORE_TYPE}} CACHE BOOL "Build ULTs for ${CORE_TYPE} devices") - set(SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE} FALSE CACHE BOOL "Disabled support ${CORE_TYPE} for device side enqueue" FORCE) if(NOT SUPPORT_${CORE_TYPE} OR NEO_SKIP_UNIT_TESTS) set(TESTS_${CORE_TYPE} FALSE)