Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move DebugSettingsReader to a core dir

Browse Source 
Related-To: NEO-3677

Change-Id: I3374abde6717be20c064ec6d65c0751a783f5138
Signed-off-by: Jobczyk, Lukasz <lukasz.jobczyk@intel.com>
This commit is contained in:
Jobczyk, Lukasz
2019-08-29 12:15:33 +02:00
committed by sys_ocldev
parent 1ec794286f
commit 10795c716f
57 changed files with 95 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/os_interface/linux/CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
#
# Copyright (C) 2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
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
)
if(UNIX)
set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
endif()

2
runtime/os_interface/linux/debug_env_reader.cpp → core/os_interface/linux/debug_env_reader.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "runtime/utilities/linux/debug_env_reader.h"
#include "core/os_interface/linux/debug_env_reader.h"
namespace NEO {

2
runtime/utilities/linux/debug_env_reader.h → core/os_interface/linux/debug_env_reader.h
View File

@ -7,8 +7,8 @@
#pragma once
#include "core/utilities/debug_settings_reader.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/utilities/debug_settings_reader.h"
namespace NEO {

16
core/os_interface/windows/CMakeLists.txt Normal file
View File

@ -0,0 +1,16 @@
#
# Copyright (C) 2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
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}/windows_wrapper.h
)
if(WIN32)
set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_WINDOWS ${NEO_CORE_OS_INTERFACE_WINDOWS})
endif()

7
runtime/os_interface/windows/debug_registry_reader.cpp → core/os_interface/windows/debug_registry_reader.cpp
View File

@ -5,10 +5,11 @@
*
*/
#include "core/os_interface/windows/debug_registry_reader.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "core/utilities/debug_settings_reader.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/windows/registry_reader.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "runtime/utilities/debug_settings_reader.h"
#include <stdint.h>

2
runtime/os_interface/windows/registry_reader.h → core/os_interface/windows/debug_registry_reader.h
View File

@ -7,7 +7,7 @@
#pragma once
#include "runtime/utilities/debug_settings_reader.h"
#include "core/utilities/debug_settings_reader.h"
#include "os_inc.h"
#include <Windows.h>

0
runtime/os_interface/windows/windows_wrapper.h → core/os_interface/windows/windows_wrapper.h
View File

2
core/unit_tests/helpers/debug_manager_state_restore.h
View File

@ -6,8 +6,8 @@
*/
#pragma once
#include "core/utilities/debug_settings_reader.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/utilities/debug_settings_reader.h"
using namespace NEO;

5
core/utilities/CMakeLists.txt
View File

@ -8,6 +8,11 @@ set(NEO_CORE_UTILITIES
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/clflush.h
${CMAKE_CURRENT_SOURCE_DIR}/cpu_info.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h
)

2
runtime/utilities/debug_file_reader.cpp → core/utilities/debug_file_reader.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "runtime/utilities/debug_file_reader.h"
#include "core/utilities/debug_file_reader.h"
using namespace std;

2
runtime/utilities/debug_file_reader.h → core/utilities/debug_file_reader.h
View File

@ -7,7 +7,7 @@
#pragma once
#include "runtime/utilities/debug_settings_reader.h"
#include "core/utilities/debug_settings_reader.h"
#include <map>
#include <sstream>

4
runtime/utilities/debug_settings_reader.cpp → core/utilities/debug_settings_reader.cpp
View File

@ -5,9 +5,9 @@
*
*/
#include "debug_settings_reader.h"
#include "core/utilities/debug_settings_reader.h"
#include "debug_file_reader.h"
#include "core/utilities/debug_file_reader.h"
namespace NEO {

0
runtime/utilities/debug_settings_reader.h → core/utilities/debug_settings_reader.h
View File

2
runtime/utilities/debug_settings_reader_creator.cpp → core/utilities/debug_settings_reader_creator.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "runtime/utilities/debug_settings_reader_creator.h"
#include "core/utilities/debug_settings_reader_creator.h"
namespace NEO {
std::unique_ptr<SettingsReader> SettingsReaderCreator::create() {

2
runtime/utilities/debug_settings_reader_creator.h → core/utilities/debug_settings_reader_creator.h
View File

@ -7,7 +7,7 @@
#pragma once
#include "debug_settings_reader.h"
#include "core/utilities/debug_settings_reader.h"
#include <memory>

2
offline_compiler/helper.cpp
View File

@ -5,9 +5,9 @@
*
*/
#include "core/utilities/debug_settings_reader_creator.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/utilities/debug_settings_reader_creator.h"
namespace NEO {

2
runtime/api/dispatch.h
View File

@ -19,7 +19,7 @@
#include "CL/cl_d3d11.h"
#include "CL/cl_dx9_media_sharing.h"
#define CL_DX9_MEDIA_SHARING_INTEL_EXT
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "CL/cl_dx9_media_sharing_intel.h"
#else

2
runtime/command_stream/aub_subcapture.cpp
View File

@ -7,9 +7,9 @@
#include "runtime/command_stream/aub_subcapture.h"
#include "core/utilities/debug_settings_reader.h"
#include "runtime/helpers/dispatch_info.h"
#include "runtime/kernel/kernel.h"
#include "runtime/utilities/debug_settings_reader.h"
namespace NEO {

2
runtime/compiler_interface/binary_cache.cpp
View File

@ -6,13 +6,13 @@
*/
#include <core/helpers/aligned_memory.h>
#include <core/utilities/debug_settings_reader.h>
#include <runtime/compiler_interface/binary_cache.h>
#include <runtime/helpers/file_io.h>
#include <runtime/helpers/hash.h>
#include <runtime/helpers/hw_info.h>
#include <runtime/os_interface/os_inc_base.h>
#include <runtime/program/program.h>
#include <runtime/utilities/debug_settings_reader.h>
#include "config.h"
#include "os_inc.h"

2
runtime/dll/CMakeLists.txt
View File

@ -20,13 +20,13 @@ set(RUNTIME_SRCS_DLL_BASE
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
${IGDRCL_SOURCE_DIR}/core/utilities/clflush.cpp
${IGDRCL_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp
${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp
${IGDRCL_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
${IGDRCL_SOURCE_DIR}/runtime/helpers/debug_helpers.cpp
${IGDRCL_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
${IGDRCL_SOURCE_DIR}/runtime/utilities/debug_settings_reader_creator.cpp
${GTPIN_INIT_FILE}
${HW_SRC_LINK}

2
runtime/gmm_helper/gmm_lib.h
View File

@ -7,7 +7,7 @@
#pragma once
#ifdef WIN32
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include <d3d9types.h>

2
runtime/os_interface/debug_settings_manager.cpp
View File

@ -9,13 +9,13 @@
#include "core/helpers/ptr_math.h"
#include "core/helpers/string.h"
#include "core/utilities/debug_settings_reader_creator.h"
#include "runtime/event/event.h"
#include "runtime/helpers/dispatch_info.h"
#include "runtime/helpers/timestamp_packet.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/mem_obj.h"
#include "runtime/os_interface/definitions/translate_debug_settings.h"
#include "runtime/utilities/debug_settings_reader_creator.h"
#include "CL/cl.h"

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

@ -9,7 +9,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
${CMAKE_CURRENT_SOURCE_DIR}/device_factory_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
@ -57,6 +56,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
)
if(UNIX)
get_property(NEO_CORE_OS_INTERFACE_LINUX GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX)
list(APPEND RUNTIME_SRCS_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX})
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_LINUX ${RUNTIME_SRCS_OS_INTERFACE_LINUX})

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

@ -16,7 +16,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp
${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.h
${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
@ -46,7 +45,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp
${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h
${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
${CMAKE_CURRENT_SOURCE_DIR}/registry_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h
${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_allocation.cpp
@ -67,7 +65,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.h
${CMAKE_CURRENT_SOURCE_DIR}/windows_defs.h
${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h
@ -77,6 +74,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
)
if(WIN32)
get_property(NEO_CORE_OS_INTERFACE_WINDOWS GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_WINDOWS)
list(APPEND RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${NEO_CORE_OS_INTERFACE_WINDOWS})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE
${RUNTIME_SRCS_OS_INTERFACE_WINDOWS}
)

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

@ -6,9 +6,9 @@
*/
#pragma once
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/memory_manager/deferrable_deletion.h"
#include "runtime/os_interface/os_context.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include <d3dkmthk.h>

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

@ -7,9 +7,9 @@
#include "runtime/device/driver_info.h"
#include "core/os_interface/windows/debug_registry_reader.h"
#include "runtime/os_interface/windows/driver_info.h"
#include "runtime/os_interface/windows/os_interface.h"
#include "runtime/os_interface/windows/registry_reader.h"
#include "runtime/os_interface/windows/wddm/wddm.h"
namespace NEO {

2
runtime/os_interface/windows/gl/gl_sharing_win.cpp
View File

@ -5,8 +5,8 @@
*
*/
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/helpers/timestamp_packet.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "runtime/sharings/gl/gl_arb_sync_event.h"
#include "runtime/sharings/gl/gl_sharing.h"

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

@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include <d3dkmthk.h>

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

@ -7,9 +7,9 @@
#pragma once
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/os_interface/os_interface.h"
#include "runtime/os_interface/windows/wddm/wddm.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "profileapi.h"
#include "umKmInc/sharedata.h"

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

@ -9,7 +9,7 @@
#include "runtime/os_interface/os_library.h"
#define UMDF_USING_NTSTATUS
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
namespace NEO {
namespace Windows {

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

@ -6,8 +6,8 @@
*/
#pragma once
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/os_interface/os_time.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "gfxEscape.h"

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

@ -7,7 +7,7 @@
#include "runtime/os_interface/print.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include <cctype>
#include <cstdint>

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

@ -8,6 +8,7 @@
#include "runtime/os_interface/windows/wddm/wddm.h"
#include "core/helpers/interlocked_max.h"
#include "core/os_interface/windows/debug_registry_reader.h"
#include "runtime/command_stream/preemption.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gmm_helper/gmm.h"
@ -19,7 +20,6 @@
#include "runtime/os_interface/windows/gdi_interface.h"
#include "runtime/os_interface/windows/kmdaf_listener.h"
#include "runtime/os_interface/windows/os_context_win.h"
#include "runtime/os_interface/windows/registry_reader.h"
#include "runtime/os_interface/windows/wddm/wddm_interface.h"
#include "runtime/os_interface/windows/wddm_allocation.h"
#include "runtime/os_interface/windows/wddm_engine_mapper.h"

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

@ -6,9 +6,9 @@
*/
#pragma once
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/os_interface/os_context.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include <d3dkmthk.h>

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

@ -8,8 +8,8 @@
#pragma once
#define UMDF_USING_NTSTATUS
#include "core/helpers/aligned_memory.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/memory_manager/graphics_allocation.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include <d3dkmthk.h>

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

@ -7,10 +7,10 @@
#pragma once
#include "core/helpers/aligned_memory.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/os_interface/os_context.h"
#include "runtime/os_interface/windows/wddm_allocation.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include <d3dkmthk.h>

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

@ -7,10 +7,10 @@
#pragma once
#include "core/os_interface/windows/windows_wrapper.h"
#include "core/utilities/spinlock.h"
#include "runtime/memory_manager/residency_container.h"
#include "runtime/os_interface/windows/windows_defs.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include <atomic>
#include <mutex>

2
runtime/sku_info/operations/sku_info_receiver.h
View File

@ -6,7 +6,7 @@
*/
#pragma once
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "sku_info.h"
#include "umKmInc/sharedata.h"

5
runtime/utilities/CMakeLists.txt
View File

@ -8,11 +8,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h
${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h
${CMAKE_CURRENT_SOURCE_DIR}/directory.h
${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp
${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h

2
runtime/utilities/windows/directory.cpp
View File

@ -7,7 +7,7 @@
#include "runtime/utilities/directory.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
namespace NEO {

2
runtime/utilities/windows/timer_util.cpp
View File

@ -7,8 +7,8 @@
#include "runtime/utilities/timer_util.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/helpers/debug_helpers.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
namespace NEO {

2
unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl
View File

@ -6,7 +6,7 @@
*/
#if defined(_WIN32)
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
#endif
#include "runtime/device/device.h"

1
unit_tests/api/cl_retain_mem_obj_tests.inl
View File

@ -52,6 +52,5 @@ TEST_F(clRetainMemObjectTests, GivenValidParamsWhenRetainingMemObjectThenRefCoun
retVal = clReleaseMemObject(buffer);
EXPECT_EQ(CL_SUCCESS, retVal);
}
} // namespace ULT

2
unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
View File

@ -5,11 +5,11 @@
*
*/
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/built_ins/built_ins.h"
#include "runtime/helpers/preamble.h"
#include "runtime/memory_manager/graphics_allocation.h"
#include "runtime/memory_manager/memory_constants.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "runtime/sharings/gl/gl_buffer.h"
#include "unit_tests/command_queue/enqueue_fixture.h"
#include "unit_tests/fixtures/hello_world_fixture.h"

2
unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
View File

@ -8,6 +8,7 @@
#include "core/command_stream/linear_stream.h"
#include "core/helpers/aligned_memory.h"
#include "core/helpers/ptr_math.h"
#include "core/os_interface/linux/debug_env_reader.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/built_ins/built_ins.h"
#include "runtime/command_queue/command_queue_hw.h"
@ -22,7 +23,6 @@
#include "runtime/memory_manager/graphics_allocation.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/utilities/linux/debug_env_reader.h"
#include "test.h"
#include "unit_tests/fixtures/built_in_fixture.h"
#include "unit_tests/fixtures/device_fixture.h"

2
unit_tests/command_stream/command_stream_receiver_hw_tests.cpp
View File

@ -8,6 +8,7 @@
#include "core/command_stream/linear_stream.h"
#include "core/helpers/aligned_memory.h"
#include "core/helpers/ptr_math.h"
#include "core/os_interface/linux/debug_env_reader.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/built_ins/built_ins.h"
#include "runtime/command_queue/command_queue_hw.h"
@ -25,7 +26,6 @@
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/os_context.h"
#include "runtime/utilities/linux/debug_env_reader.h"
#include "test.h"
#include "unit_tests/fixtures/built_in_fixture.h"
#include "unit_tests/fixtures/device_fixture.h"

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

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

2
unit_tests/main.cpp
View File

@ -6,11 +6,11 @@
*/
#include "core/unit_tests/helpers/memory_leak_listener.h"
#include "core/utilities/debug_settings_reader.h"
#include "runtime/gmm_helper/resource_info.h"
#include "runtime/helpers/options.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/hw_info_config.h"
#include "runtime/utilities/debug_settings_reader.h"
#include "unit_tests/custom_event_listener.h"
#include "unit_tests/mocks/mock_gmm.h"
#include "unit_tests/mocks/mock_program.h"

2
unit_tests/os_interface/debug_settings_manager_tests.cpp
View File

@ -6,7 +6,7 @@
*/
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/utilities/debug_file_reader.h"
#include "core/utilities/debug_file_reader.h"
#include "unit_tests/fixtures/buffer_fixture.h"
#include "unit_tests/fixtures/image_fixture.h"
#include "unit_tests/mocks/mock_buffer.h"

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

@ -5,7 +5,7 @@
*
*/
#include "runtime/utilities/linux/debug_env_reader.h"
#include "core/os_interface/linux/debug_env_reader.h"
#include "test.h"

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

@ -5,13 +5,13 @@
*
*/
#include "core/os_interface/windows/debug_registry_reader.h"
#include "runtime/command_stream/preemption.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/helpers/options.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "runtime/os_interface/windows/driver_info.h"
#include "runtime/os_interface/windows/os_interface.h"
#include "runtime/os_interface/windows/registry_reader.h"
#include "unit_tests/helpers/variable_backup.h"
#include "unit_tests/libult/create_command_stream.h"
#include "unit_tests/mocks/mock_csr.h"

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

@ -7,9 +7,9 @@
#include "mock_performance_counters_win.h"
#include "core/os_interface/windows/windows_wrapper.h"
#include "runtime/os_interface/os_interface.h"
#include "runtime/os_interface/windows/os_interface.h"
#include "runtime/os_interface/windows/windows_wrapper.h"
#include "unit_tests/mocks/mock_wddm.h"
#include "unit_tests/os_interface/windows/mock_os_time_win.h"

4
unit_tests/os_interface/windows/mock_registry_reader.cpp
View File

@ -1,11 +1,11 @@
/*
* Copyright (C) 2017-2018 Intel Corporation
* Copyright (C) 2017-2019 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "windows_wrapper.h"
#include "core/os_interface/windows/windows_wrapper.h"
LSTATUS APIENTRY RegOpenKeyExA(
HKEY hKey,

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

@ -5,7 +5,7 @@
*
*/
#include "runtime/os_interface/windows/registry_reader.h"
#include "core/os_interface/windows/debug_registry_reader.h"
namespace NEO {
class TestedRegistryReader : public RegistryReader {

2
unit_tests/utilities/debug_file_reader_tests.inl
View File

@ -5,8 +5,8 @@
*
*/
#include "core/utilities/debug_file_reader.h"
#include "runtime/helpers/file_io.h"
#include "runtime/utilities/debug_file_reader.h"
#include "test.h"
#include "gtest/gtest.h"

2
unit_tests/utilities/debug_settings_reader_creator.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "runtime/utilities/debug_settings_reader_creator.h"
#include "core/utilities/debug_settings_reader_creator.h"
namespace NEO {
std::unique_ptr<SettingsReader> SettingsReaderCreator::create() {

2
unit_tests/utilities/debug_settings_reader_tests.cpp
View File

@ -5,9 +5,9 @@
*
*/
#include "core/utilities/debug_settings_reader.h"
#include "runtime/helpers/file_io.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/utilities/debug_settings_reader.h"
#include "test.h"
#include "gtest/gtest.h"