intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move files to core

Browse Source 
- OsLibrary class
- sku_info directory
- gmm_lib.h header

Change-Id: Ia86280e61cd2913c546afc40c3751b42e04ab137
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-11-19 11:49:19 +01:00
committed by sys_ocldev
parent e7ee6daaa0
commit 13921f698e
81 changed files with 135 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -777,6 +777,7 @@ include_directories(${NEO_BUILD_DIR})
include_directories(${NEO_SOURCE_DIR})
include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/core/sku_info/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
@@ -786,7 +787,6 @@ include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_
include_directories(${NEO_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
if(HAVE_INSTRUMENTATION)
set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})

2
core/compiler_interface/compiler_interface.h
View File

@@ -8,9 +8,9 @@
#pragma once
#include "core/compiler_interface/compiler_cache.h"
#include "core/helpers/string.h"
#include "core/os_interface/os_library.h"
#include "core/utilities/arrayref.h"
#include "runtime/built_ins/sip.h"
#include "runtime/os_interface/os_library.h"
#include "cif/common/cif_main.h"
#include "ocl_igc_interface/code_type.h"

2
core/compiler_interface/compiler_interface.inl
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "core/os_interface/os_library.h"
#include "runtime/helpers/validators.h"
#include "runtime/os_interface/os_library.h"
#include "cif/builtins/memory/buffer/buffer.h"
#include "cif/common/cif.h"

13
core/gmm_helper/CMakeLists.txt Normal file
View File

@@ -0,0 +1,13 @@
#
# Copyright (C) 2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(NEO_CORE_GMM_HELPER
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
)
set_property(GLOBAL PROPERTY NEO_CORE_GMM_HELPER ${NEO_CORE_GMM_HELPER})
add_subdirectories()

0
runtime/gmm_helper/gmm_lib.h → core/gmm_helper/gmm_lib.h
View File

1
core/os_interface/CMakeLists.txt
View File

@@ -8,6 +8,7 @@ set(NEO_CORE_OS_INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
)

2
core/os_interface/linux/CMakeLists.txt
View File

@@ -8,6 +8,8 @@ set(NEO_CORE_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.h
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.h
)

4
runtime/os_interface/linux/os_library.cpp → core/os_interface/linux/os_library_linux.cpp
View File

@@ -5,12 +5,10 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/linux/os_library_linux.h"
#include "core/helpers/debug_helpers.h"
#include "os_library.h"
#include <dlfcn.h>
namespace NEO {

2
runtime/os_interface/linux/os_library.h → core/os_interface/linux/os_library_linux.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
namespace NEO {
namespace Linux {

0
runtime/os_interface/os_library.h → core/os_interface/os_library.h
View File

2
core/os_interface/windows/CMakeLists.txt
View File

@@ -8,6 +8,8 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.h
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.h
${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h

4
runtime/os_interface/windows/os_library.cpp → core/os_interface/windows/os_library_win.cpp
View File

@@ -5,9 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "os_library.h"
#include "core/os_interface/windows/os_library_win.h"
namespace NEO {

2
runtime/os_interface/windows/os_library.h → core/os_interface/windows/os_library_win.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#define UMDF_USING_NTSTATUS
#include "core/os_interface/windows/windows_wrapper.h"

21
core/sku_info/CMakeLists.txt Normal file
View File

@@ -0,0 +1,21 @@
#
# Copyright (C) 2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(NEO_CORE_SKU_INFO_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base.h
${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_transfer.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/sku_info.h
${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_transfer.cpp
)
set(NEO_CORE_SKU_INFO_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/operations/windows/sku_info_receiver.h
${CMAKE_CURRENT_SOURCE_DIR}/operations/windows${BRANCH_DIR_SUFFIX}/sku_info_receiver.cpp
)
set_property(GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE ${NEO_CORE_SKU_INFO_BASE})
set_property(GLOBAL PROPERTY NEO_CORE_SKU_INFO_WINDOWS ${NEO_CORE_SKU_INFO_WINDOWS})

2
runtime/sku_info/definitions/sku_info.h → core/sku_info/definitions/sku_info.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/sku_info/sku_info_base.h"
#include "core/sku_info/sku_info_base.h"
namespace NEO {
struct FeatureTable : FeatureTableBase {};

2
runtime/sku_info/operations/sku_info_transfer.cpp → core/sku_info/operations/sku_info_transfer.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/sku_info/operations/sku_info_transfer.h"
#include "core/sku_info/operations/sku_info_transfer.h"
namespace NEO {
void SkuInfoTransfer::transferWaTableForGmm(_WA_TABLE *dstWaTable, const NEO::WorkaroundTable *srcWaTable) {

4
runtime/sku_info/operations/sku_info_transfer.h → core/sku_info/operations/sku_info_transfer.h
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "runtime/sku_info/operations/sku_info_transfer.h"
#include "core/gmm_helper/gmm_lib.h"
#include "core/sku_info/operations/sku_info_transfer.h"
#include "sku_info.h"

2
runtime/sku_info/operations/sku_info_receiver.cpp → core/sku_info/operations/windows/sku_info_receiver.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/sku_info/operations/sku_info_receiver.h"
#include "core/sku_info/operations/windows/sku_info_receiver.h"
namespace NEO {
void SkuInfoReceiver::receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _ADAPTER_INFO *adapterInfo) {

0
runtime/sku_info/operations/sku_info_receiver.h → core/sku_info/operations/windows/sku_info_receiver.h
View File

0
runtime/sku_info/sku_info_base.h → core/sku_info/sku_info_base.h
View File

7
offline_compiler/CMakeLists.txt
View File

@@ -10,6 +10,7 @@ set(CLOC_SRCS_LIB
${NEO_SOURCE_DIR}/core/helpers/abort.cpp
${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
${NEO_SOURCE_DIR}/core/helpers/file_io.cpp
${NEO_SOURCE_DIR}/core/os_interface/os_library.h
${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
@@ -44,12 +45,14 @@ endif()
if(WIN32)
list(APPEND CLOC_SRCS_LIB
${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
)
else()
list(APPEND CLOC_SRCS_LIB
${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
)
endif()

2
offline_compiler/decoder/helper.cpp
View File

@@ -7,9 +7,9 @@
#include "helper.h"
#include "core/os_interface/os_library.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_inc_base.h"
#include "runtime/os_interface/os_library.h"
#include "igfxfmid.h"

2
offline_compiler/decoder/helper.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "igfxfmid.h"

2
offline_compiler/decoder/iga_wrapper.cpp
View File

@@ -7,9 +7,9 @@
#include "iga_wrapper.h"
#include "core/os_interface/os_library.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_inc_base.h"
#include "runtime/os_interface/os_library.h"
#include "helper.h"
#include "igfxfmid.h"

2
offline_compiler/extra_settings.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "offline_compiler.h"

2
offline_compiler/main.cpp
View File

@@ -5,9 +5,9 @@
*
*/
#include "core/os_interface/os_library.h"
#include "offline_compiler/multi_command.h"
#include "offline_compiler/offline_compiler.h"
#include "runtime/os_interface/os_library.h"
#include "decoder/binary_decoder.h"
#include "decoder/binary_encoder.h"

2
offline_compiler/multi_command.h
View File

@@ -5,9 +5,9 @@
*
*/
#include "core/os_interface/os_library.h"
#include "offline_compiler/offline_compiler.h"
#include "offline_compiler/utilities/safety_caller.h"
#include "runtime/os_interface/os_library.h"
#include "decoder/binary_decoder.h"
#include "decoder/binary_encoder.h"

2
offline_compiler/offline_compiler.cpp
View File

@@ -11,11 +11,11 @@
#include "core/helpers/debug_helpers.h"
#include "core/helpers/file_io.h"
#include "core/helpers/string.h"
#include "core/os_interface/os_library.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/validators.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/os_inc_base.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/platform/extensions.h"
#include "cif/common/cif_main.h"

2
offline_compiler/utilities/linux/safety_caller_linux.cpp
View File

@@ -5,9 +5,9 @@
*
*/
#include "core/os_interface/os_library.h"
#include "offline_compiler/offline_compiler.h"
#include "offline_compiler/utilities/linux/safety_guard_linux.h"
#include "runtime/os_interface/os_library.h"
using namespace NEO;

2
offline_compiler/utilities/windows/seh_exception.cpp
View File

@@ -7,7 +7,7 @@
#include "seh_exception.h"
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include <memory>
#include <string>

1
runtime/CMakeLists.txt
View File

@@ -32,6 +32,7 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
add_subdirectories()
add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
include(enable_gens.cmake)
include(core_files.cmake)
# Enable SSE4/AVX2 options for files that need them
if(MSVC)

16
runtime/core_files.cmake Normal file
View File

@@ -0,0 +1,16 @@
#
# Copyright (C) 2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
get_property(NEO_CORE_GMM_HELPER GLOBAL PROPERTY NEO_CORE_GMM_HELPER)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_GMM_HELPER})
get_property(NEO_CORE_SKU_INFO_BASE GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_BASE})
if(WIN32)
get_property(NEO_CORE_SKU_INFO_WINDOWS GLOBAL PROPERTY NEO_CORE_SKU_INFO_WINDOWS)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_WINDOWS})
endif()

2
runtime/dll/linux/options.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "External/Common/GmmLibDllName.h"
#include "igc.opencl.h"

3
runtime/gmm_helper/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2018 Intel Corporation
# Copyright (C) 2018-2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
@@ -15,7 +15,6 @@ set(RUNTIME_SRCS_GMM_HELPER_BASE
${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h
${CMAKE_CURRENT_SOURCE_DIR}/resource_info_impl.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/gmm_utils.cpp

2
runtime/gmm_helper/client_context/gmm_client_context_base.cpp
View File

@@ -8,11 +8,11 @@
#include "runtime/gmm_helper/client_context/gmm_client_context_base.h"
#include "core/helpers/debug_helpers.h"
#include "core/sku_info/operations/sku_info_transfer.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_interface.h"
#include "runtime/platform/platform.h"
#include "runtime/sku_info/operations/sku_info_transfer.h"
namespace NEO {
GmmClientContextBase::GmmClientContextBase(HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) : destroyFunc(destroyFunc) {

2
runtime/gmm_helper/client_context/gmm_client_context_base.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include <memory>

2
runtime/gmm_helper/gmm.h
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "core/gmm_helper/gmm_lib.h"
#include "runtime/api/cl_types.h"
#include "runtime/gmm_helper/gmm_lib.h"
#include "storage_info.h"

4
runtime/gmm_helper/gmm_helper.cpp
View File

@@ -9,13 +9,13 @@
#include "core/helpers/debug_helpers.h"
#include "core/memory_manager/graphics_allocation.h"
#include "core/os_interface/os_library.h"
#include "core/sku_info/operations/sku_info_transfer.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/helpers/get_info.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/surface_formats.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/platform/platform.h"
#include "runtime/sku_info/operations/sku_info_transfer.h"
#include "gmm_client_context.h"

2
runtime/gmm_helper/gmm_helper.h
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "core/gmm_helper/gmm_lib.h"
#include "core/memory_manager/memory_constants.h"
#include "runtime/gmm_helper/gmm_lib.h"
#include <memory>

2
runtime/gmm_helper/gmm_interface.cpp
View File

@@ -6,8 +6,8 @@
*/
#include "core/helpers/debug_helpers.h"
#include "core/os_interface/os_library.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/os_interface/os_library.h"
namespace Os {
extern const char *gmmDllName;

2
runtime/gmm_helper/gmm_memory_base.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include <memory>

2
runtime/gmm_helper/page_table_mngr.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include <functional>
#include <memory>

2
runtime/gmm_helper/resource_info.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include <functional>
#include <memory>

2
runtime/helpers/cache_policy.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
namespace CacheSettings {
constexpr uint32_t unknownMocs = GMM_RESOURCE_USAGE_UNKNOWN;

2
runtime/helpers/surface_formats.cpp
View File

@@ -7,8 +7,8 @@
#include "surface_formats.h"
#include "core/gmm_helper/gmm_lib.h"
#include "runtime/api/cl_types.h"
#include "runtime/gmm_helper/gmm_lib.h"
#include "runtime/helpers/array_count.h"
#include "runtime/mem_obj/image.h"

2
runtime/helpers/surface_formats.h
View File

@@ -13,8 +13,8 @@
#include "CL/cl_ext.h"
#endif
#include "core/gmm_helper/gmm_lib.h"
#include "core/utilities/arrayref.h"
#include "runtime/gmm_helper/gmm_lib.h"
namespace NEO {
enum GFX3DSTATE_SURFACEFORMAT : unsigned short {

2
runtime/helpers/windows/gl_helper.h
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "GL/gl.h"

1
runtime/os_interface/CMakeLists.txt
View File

@@ -22,7 +22,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
${CMAKE_CURRENT_SOURCE_DIR}/os_context.h
${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
${CMAKE_CURRENT_SOURCE_DIR}/os_thread.h
${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_time.h

2
runtime/os_interface/linux/CMakeLists.txt
View File

@@ -43,8 +43,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.h

2
runtime/os_interface/metrics_library.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "instrumentation.h"

2
runtime/os_interface/os_inc_base.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
namespace Os {
// Compiler library names

2
runtime/os_interface/windows/CMakeLists.txt
View File

@@ -33,8 +33,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_socket.h
${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.cpp

2
runtime/os_interface/windows/gdi_interface.h
View File

@@ -6,9 +6,9 @@
*/
#pragma once
#include "core/os_interface/windows/os_library_win.h"
#include "runtime/helpers/options.h"
#include "runtime/os_interface/windows/os_inc.h"
#include "runtime/os_interface/windows/os_library.h"
#include "runtime/os_interface/windows/thk_wrapper.h"
#include <d3d9types.h>

2
runtime/os_interface/windows/wddm/wddm.cpp
View File

@@ -10,6 +10,7 @@
#include "core/command_stream/preemption.h"
#include "core/helpers/interlocked_max.h"
#include "core/os_interface/windows/debug_registry_reader.h"
#include "core/sku_info/operations/windows/sku_info_receiver.h"
#include "core/utilities/stackvec.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gmm_helper/gmm.h"
@@ -27,7 +28,6 @@
#include "runtime/os_interface/windows/wddm_engine_mapper.h"
#include "runtime/os_interface/windows/wddm_residency_allocations_container.h"
#include "runtime/platform/platform.h"
#include "runtime/sku_info/operations/sku_info_receiver.h"
#include "gmm_memory.h"

2
runtime/os_interface/windows/wddm/wddm.h
View File

@@ -7,10 +7,10 @@
#pragma once
#include "core/command_stream/preemption_mode.h"
#include "core/gmm_helper/gmm_lib.h"
#include "core/helpers/debug_helpers.h"
#include "core/memory_manager/gfx_partition.h"
#include "core/utilities/spinlock.h"
#include "runtime/gmm_helper/gmm_lib.h"
#include "runtime/os_interface/os_context.h"
#include "sku_info.h"

2
runtime/sharings/gl/gl_sharing.h
View File

@@ -7,8 +7,8 @@
#pragma once
#include "core/os_interface/os_library.h"
#include "runtime/helpers/windows/gl_helper.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/os_interface/windows/gl/gl_sharing_os.h"
#include "runtime/sharings/sharing.h"

2
runtime/sharings/unified/unified_sharing.h
View File

@@ -7,8 +7,8 @@
#pragma once
#include "core/os_interface/os_library.h"
#include "runtime/mem_obj/mem_obj.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/sharings/sharing.h"
#include "runtime/sharings/unified/unified_sharing_types.h"

25
runtime/sku_info/CMakeLists.txt
View File

@@ -1,25 +0,0 @@
#
# Copyright (C) 2018 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(RUNTIME_SRCS_SKU_INFO_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base.h
${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_transfer.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/sku_info.h
${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_transfer.cpp
)
set(RUNTIME_SRCS_SKU_INFO_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_receiver.h
${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_receiver.cpp
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_BASE})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SKU_INFO_BASE ${RUNTIME_SRCS_SKU_INFO_BASE})
if(WIN32)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_WINDOWS})
endif()

2
runtime/source_level_debugger/source_level_debugger.h
View File

@@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include <memory>
#include <string>

2
unit_tests/global_environment.h
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "core/os_interface/os_library.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_library.h"
#include "unit_tests/mocks/mock_compilers.h"
#include "gtest/gtest.h"

2
unit_tests/gmm_helper/gmm_interface_tests.cpp
View File

@@ -5,12 +5,12 @@
*
*/
#include "core/sku_info/operations/sku_info_transfer.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_interface.h"
#include "runtime/platform/platform.h"
#include "runtime/sku_info/operations/sku_info_transfer.h"
#include "unit_tests/helpers/variable_backup.h"
#include "gtest/gtest.h"

2
unit_tests/helpers/windows/gl_helper_tests.cpp
View File

@@ -5,9 +5,9 @@
*
*/
#include "core/os_interface/os_library.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/helpers/windows/gl_helper.h"
#include "runtime/os_interface/os_library.h"
#include "test.h"
#include "unit_tests/helpers/windows/mock_function.h"

4
unit_tests/igdrcl_tests_pch.h
View File

@@ -5,16 +5,16 @@
*
*/
#include "core/gmm_helper/gmm_lib.h"
#include "core/helpers/abort.h"
#include "core/helpers/debug_helpers.h"
#include "core/helpers/ptr_math.h"
#include "core/memory_manager/memory_constants.h"
#include "core/sku_info/sku_info_base.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/gmm_lib.h"
#include "runtime/helpers/completion_stamp.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/kmd_notify_properties.h"
#include "runtime/sku_info/sku_info_base.h"
#include "test.h"
#include "unit_tests/gen_common/gen_cmd_parse.h"

2
unit_tests/libult/source_level_debugger_library.h
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "igfx_debug_interchange_types.h"

2
unit_tests/linux/main_linux.cpp
View File

@@ -5,8 +5,8 @@
*
*/
#include "core/os_interface/os_library.h"
#include "runtime/os_interface/linux/drm_neo.h"
#include "runtime/os_interface/os_library.h"
#include "test.h"
#include "unit_tests/custom_event_listener.h"

2
unit_tests/mock_gdi/mock_gdi.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include "runtime/os_interface/windows/os_time_win.h"
#include <d3d10_1.h>

2
unit_tests/offline_compiler/main.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "unit_tests/custom_event_listener.h"
#include "unit_tests/helpers/test_files.h"

8
unit_tests/offline_compiler/segfault_test/CMakeLists.txt
View File

@@ -9,22 +9,24 @@ set(CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${NEO_SOURCE_DIR}/core/helpers/abort.cpp
${NEO_SOURCE_DIR}/runtime/os_interface/os_library.h
${NEO_SOURCE_DIR}/core/os_interface/os_library.h
${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
)
if(WIN32)
list(APPEND CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
)
else()
list(APPEND CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
)
endif()

2
unit_tests/os_interface/device_factory_tests.cpp
View File

@@ -6,13 +6,13 @@
*/
#include "core/memory_manager/memory_constants.h"
#include "core/os_interface/os_library.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/options.h"
#include "runtime/os_interface/device_factory.h"
#include "runtime/os_interface/os_interface.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/platform/platform.h"
#include "unit_tests/mocks/mock_execution_environment.h"

2
unit_tests/os_interface/linux/options.cpp
View File

@@ -6,7 +6,7 @@
*/
#include "common/gtsysinfo.h"
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "igfxfmid.h"

6
unit_tests/os_interface/os_library_tests.cpp
View File

@@ -6,11 +6,11 @@
*/
#if defined(_WIN32)
#include "runtime/os_interface/windows/os_library.h"
#include "core/os_interface/windows/os_library_win.h"
#elif defined(__linux__)
#include "runtime/os_interface/linux/os_library.h"
#include "core/os_interface/linux/os_library_linux.h"
#endif
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "test.h"
#include "unit_tests/fixtures/memory_management_fixture.h"

2
unit_tests/os_interface/windows/gdi_dll_fixture.h
View File

@@ -6,9 +6,9 @@
*/
#pragma once
#include "core/os_interface/os_library.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/options.h"
#include "runtime/os_interface/os_library.h"
#include "unit_tests/mock_gdi/mock_gdi.h"
using namespace NEO;

2
unit_tests/os_interface/windows/gdi_interface_tests.cpp
View File

@@ -6,8 +6,8 @@
*/
#if defined(_WIN32)
#include "core/os_interface/os_library.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/os_interface/windows/gdi_interface.h"
#include "test.h"

2
unit_tests/os_interface/windows/gl/gl_dll_helper.h
View File

@@ -6,8 +6,8 @@
*/
#pragma once
#include "core/os_interface/os_library.h"
#include "public/cl_gl_private_intel.h"
#include "runtime/os_interface/os_library.h"
#include "Gl/gl.h"

2
unit_tests/os_interface/windows/options.cpp
View File

@@ -6,7 +6,7 @@
*/
#include "common/gtsysinfo.h"
#include "runtime/os_interface/os_library.h"
#include "core/os_interface/os_library.h"
#include "igfxfmid.h"

2
unit_tests/os_interface/windows/os_library_win_tests.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/windows/os_library.h"
#include "core/os_interface/windows/os_library_win.h"
#include "test.h"
#include "unit_tests/helpers/variable_backup.h"

2
unit_tests/os_interface/windows/wddm20_tests.cpp
View File

@@ -5,6 +5,7 @@
*
*/
#include "core/os_interface/os_library.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gmm_helper/gmm.h"
@@ -12,7 +13,6 @@
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/options.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/os_interface/os_time.h"
#include "runtime/os_interface/windows/os_context_win.h"
#include "runtime/os_interface/windows/os_interface.h"

2
unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -8,6 +8,7 @@
#include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h"
#include "core/helpers/aligned_memory.h"
#include "core/os_interface/os_library.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "core/unit_tests/utilities/base_object_utils.h"
#include "runtime/gmm_helper/gmm.h"
@@ -17,7 +18,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/mem_obj/image.h"
#include "runtime/mem_obj/mem_obj_helper.h"
#include "runtime/os_interface/os_library.h"
#include "runtime/os_interface/windows/os_context_win.h"
#include "runtime/os_interface/windows/wddm_residency_controller.h"
#include "runtime/platform/platform.h"

2
unit_tests/sku_info/sku_info_base_reference.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include "runtime/gmm_helper/gmm_lib.h"
#include "core/gmm_helper/gmm_lib.h"
#include "sku_info.h"

2
unit_tests/sku_info/sku_info_receiver_tests.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/sku_info/operations/sku_info_receiver.h"
#include "core/sku_info/operations/windows/sku_info_receiver.h"
#include "unit_tests/sku_info/sku_info_base_reference.h"
#include "gtest/gtest.h"

2
unit_tests/sku_info/sku_info_transfer_tests.cpp
View File

@@ -5,7 +5,7 @@
*
*/
#include "runtime/sku_info/operations/sku_info_transfer.h"
#include "core/sku_info/operations/sku_info_transfer.h"
#include "unit_tests/sku_info/sku_info_base_reference.h"
#include "gtest/gtest.h"