Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move ocl extensions logic to shared

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-11-04 15:39:09 +00:00
committed by Compute-Runtime-Automation
parent 4bf4b170f1
commit 21ef249961
17 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/cl_device/cl_device.cpp
View File

@ -7,6 +7,7 @@
#include "opencl/source/cl_device/cl_device.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device/device.h"
#include "shared/source/device/sub_device.h"
@ -18,7 +19,6 @@
#include "shared/source/source_level_debugger/source_level_debugger.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/platform/platform.h"
namespace NEO {

2
opencl/source/cl_device/cl_device_caps.cpp
View File

@ -5,6 +5,7 @@
*
*/
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device/device.h"
#include "shared/source/device/device_info.h"
@ -16,7 +17,6 @@
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/sharings/sharing_factory.h"
#include "driver_version.h"

4
opencl/source/cl_device/cl_device_info.h
View File

@ -7,8 +7,8 @@
#pragma once
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/helpers/constants.h"
#include "shared/source/utilities/stackvec.h"
#include "opencl/extensions/public/cl_ext_private.h"
@ -16,8 +16,6 @@
namespace NEO {
using OpenClCFeaturesContainer = StackVec<cl_name_version, 15>;
struct ClDeviceInfoParam {
union {
cl_bool boolean;

6
opencl/source/compiler_interface/CMakeLists.txt
View File

@ -9,5 +9,9 @@ set(RUNTIME_SRCS_COMPILER_INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/default_cl_cache_config.cpp
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMPILER_INTERFACE})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE
${RUNTIME_SRCS_COMPILER_INTERFACE}
${NEO_SHARED_DIRECTORY}/compiler_interface/oclc_extensions.cpp
${NEO_SHARED_DIRECTORY}/compiler_interface/oclc_extensions.h
)
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMPILER_INTERFACE ${RUNTIME_SRCS_COMPILER_INTERFACE})

4
opencl/source/platform/CMakeLists.txt
View File

@ -1,13 +1,11 @@
#
# Copyright (C) 2018-2020 Intel Corporation
# Copyright (C) 2018-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(RUNTIME_SRCS_PLATFORM
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/extensions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/extensions.h
${CMAKE_CURRENT_SOURCE_DIR}/platform.cpp
${CMAKE_CURRENT_SOURCE_DIR}/platform.h
${CMAKE_CURRENT_SOURCE_DIR}/platform_info.h

2
opencl/source/platform/platform.cpp
View File

@ -10,6 +10,7 @@
#include "shared/source/built_ins/sip.h"
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/compiler_interface/compiler_interface.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device/root_device.h"
#include "shared/source/execution_environment/execution_environment.h"
@ -27,7 +28,6 @@
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/gtpin/gtpin_notify.h"
#include "opencl/source/helpers/get_info_status_mapper.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/sharings/sharing_factory.h"
#include "CL/cl_ext.h"

2
opencl/source/program/program.cpp
View File

@ -10,6 +10,7 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/compiler_interface/compiler_interface.h"
#include "shared/source/compiler_interface/intermediate_representations.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/device_binary_format/device_binary_formats.h"
#include "shared/source/device_binary_format/elf/elf_encoder.h"
#include "shared/source/device_binary_format/elf/ocl_elf.h"
@ -28,7 +29,6 @@
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/context/context.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/platform/platform.h"
#include "opencl/source/program/block_kernel_manager.h"

3
opencl/source/sharings/sharing_factory.cpp
View File

@ -7,10 +7,9 @@
#include "sharing_factory.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "opencl/source/platform/extensions.h"
namespace NEO {
std::unique_ptr<SharingFactory> SharingFactory::build() {

2
opencl/test/unit_test/device/device_caps_tests.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
#include "shared/source/os_interface/os_interface.h"
@ -19,7 +20,6 @@
#include "shared/test/common/mocks/mock_sip.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/test/unit_test/fixtures/device_info_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"

2
opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
View File

@ -5,6 +5,7 @@
*
*/
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/test/common/mocks/mock_gmm.h"
@ -13,7 +14,6 @@
#include "opencl/source/helpers/cl_memory_properties_helpers.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"

3
opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
View File

@ -8,6 +8,7 @@
#include "offline_compiler_tests.h"
#include "shared/source/compiler_interface/intermediate_representations.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/helpers/file_io.h"
#include "shared/source/helpers/hw_info.h"
@ -15,8 +16,6 @@
#include "shared/test/common/mocks/mock_compilers.h"
#include "shared/test/unit_test/device_binary_format/zebin_tests.h"
#include "opencl/source/platform/extensions.h"
#include "compiler_options.h"
#include "environment.h"
#include "gmock/gmock.h"

2
opencl/test/unit_test/platform/platform_tests.cpp
View File

@ -5,6 +5,7 @@
*
*/
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/device/device.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/helpers/string.h"
@ -21,7 +22,6 @@
#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/sharings/sharing_factory.h"
#include "opencl/test/unit_test/fixtures/platform_fixture.h"
#include "opencl/test/unit_test/mocks/mock_cl_device.h"

2
opencl/test/unit_test/sharings/sharing_factory_tests.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/device/device.h"
#include "shared/source/helpers/string.h"
#include "shared/test/common/fixtures/memory_management_fixture.h"
@ -13,7 +14,6 @@
#include "shared/test/common/mocks/mock_device.h"
#include "opencl/source/context/context.h"
#include "opencl/source/platform/extensions.h"
#include "opencl/source/platform/platform.h"
#include "opencl/source/sharings/sharing.h"
#include "opencl/source/sharings/sharing_factory.h"

4
shared/offline_compiler/source/CMakeLists.txt
View File

@ -41,8 +41,8 @@ set(CLOC_LIB_SRCS_LIB
${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}kernel_descriptor.cpp
${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}kernel_descriptor.h
${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
${NEO_SOURCE_DIR}/opencl/source/platform/extensions.cpp
${NEO_SOURCE_DIR}/opencl/source/platform/extensions.h
${NEO_SHARED_DIRECTORY}/compiler_interface/oclc_extensions.cpp
${NEO_SHARED_DIRECTORY}/compiler_interface/oclc_extensions.h
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.h
${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp

2
opencl/source/platform/extensions.cpp → shared/source/compiler_interface/oclc_extensions.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/source/platform/extensions.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/helpers/hw_info.h"

9
opencl/source/platform/extensions.h → shared/source/compiler_interface/oclc_extensions.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -7,14 +7,17 @@
#pragma once
#include "shared/source/helpers/hw_info.h"
#include "shared/source/utilities/stackvec.h"
#include "opencl/source/cl_device/cl_device_info.h"
#include "CL/cl.h"
#include <string>
using OpenClCFeaturesContainer = StackVec<cl_name_version, 15>;
namespace NEO {
struct HardwareInfo;
namespace Extensions {
constexpr const char *const sharingFormatQuery = "cl_intel_sharing_format_query ";
}

4
shared/source/helpers/compiler_options_parser.cpp
View File

@ -8,8 +8,8 @@
#include "shared/source/helpers/compiler_options_parser.h"
#include "shared/source/compiler_interface/compiler_options/compiler_options_base.h"
#include "opencl/source/platform/extensions.h"
#include "shared/source/compiler_interface/oclc_extensions.h"
#include "shared/source/helpers/hw_info.h"
#include <cstdint>
#include <sstream>