From fe26b0b406d19adbc33ac0c0662898e0fded283b Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Mon, 15 Jul 2019 13:51:08 +0200 Subject: [PATCH] Move debug_manager_state_restore.h to core. Change-Id: I3ef4a1aec40efa4bbc8346a5b517336c42c06519 Signed-off-by: Mrozek, Michal --- .../helpers/debug_manager_state_restore.h | 0 runtime/program/process_gen_binary.cpp | 32 +++++++++---------- unit_tests/api/cl_get_device_ids_tests.inl | 2 +- .../api/cl_set_event_callback_tests.inl | 2 +- unit_tests/aub/aub_center_tests.cpp | 2 +- ...aub_center_using_aubstream_stubs_tests.cpp | 2 +- unit_tests/aub/aub_helper_tests.inl | 2 +- .../aub_mem_dump/aub_alloc_dump_tests.cpp | 2 +- .../enqueue_fill_buffer_aub_tests.cpp | 2 +- .../enqueue_kernel_aub_tests.cpp | 2 +- .../enqueue_read_write_image_aub_fixture.h | 2 +- ...enqueue_verify_memory_buffer_aub_tests.cpp | 2 +- ...nqueue_with_timestamp_packet_aub_tests.cpp | 2 +- .../command_stream/aub_mem_dump_tests.cpp | 2 +- unit_tests/built_ins/built_in_tests.cpp | 2 +- .../command_queue/command_queue_hw_tests.cpp | 2 +- .../command_queue/command_queue_tests.cpp | 2 +- .../command_queue/dispatch_walker_tests.cpp | 2 +- .../command_queue/enqueue_handler_tests.cpp | 2 +- .../command_queue/enqueue_kernel_1_tests.cpp | 2 +- .../command_queue/enqueue_kernel_2_tests.cpp | 2 +- .../enqueue_map_buffer_tests.cpp | 2 +- .../command_queue/enqueue_map_image_tests.cpp | 2 +- .../enqueue_read_buffer_event_tests.cpp | 2 +- .../enqueue_read_buffer_tests.cpp | 2 +- .../enqueue_read_image_tests.cpp | 2 +- .../command_queue/enqueue_svm_tests.cpp | 2 +- .../enqueue_write_buffer_event_tests.cpp | 2 +- .../enqueue_write_buffer_tests.cpp | 2 +- .../command_queue/local_work_size_tests.cpp | 2 +- .../command_queue/work_group_size_tests.cpp | 2 +- .../aub_command_stream_receiver_1_tests.cpp | 2 +- .../aub_command_stream_receiver_2_tests.cpp | 2 +- .../command_stream/aub_file_stream_tests.cpp | 2 +- .../command_stream/aub_subcapture_tests.cpp | 2 +- ...and_stream_receiver_flush_task_1_tests.cpp | 2 +- ...and_stream_receiver_flush_task_2_tests.cpp | 2 +- ...and_stream_receiver_flush_task_3_tests.cpp | 2 +- ...stream_receiver_flush_task_gmock_tests.cpp | 2 +- .../command_stream_receiver_hw_tests.cpp | 2 +- .../command_stream_receiver_tests.cpp | 2 +- .../create_command_stream_receiver_tests.cpp | 2 +- .../experimental_command_buffer_tests.cpp | 2 +- .../command_stream/get_devices_tests.cpp | 2 +- .../tbx_command_stream_tests.cpp | 2 +- .../compiler_interface_tests.cpp | 2 +- unit_tests/context/context_tests.cpp | 2 +- .../driver_diagnostics_enqueue_tests.cpp | 2 +- .../context/driver_diagnostics_tests.cpp | 2 +- unit_tests/context/gl/context_gl_tests.cpp | 2 +- unit_tests/d3d_sharing/d3d9_tests.cpp | 2 +- unit_tests/d3d_sharing/d3d_tests_part1.cpp | 2 +- unit_tests/d3d_sharing/d3d_tests_part2.cpp | 2 +- unit_tests/device/device_caps_tests.cpp | 2 +- unit_tests/device/device_tests.cpp | 2 +- unit_tests/device/gl/device_caps_gl_tests.cpp | 2 +- .../device_queue/device_queue_hw_tests.cpp | 2 +- .../event/async_events_handler_tests.cpp | 2 +- unit_tests/event/event_tests.cpp | 2 +- unit_tests/event/event_tests_mt.cpp | 2 +- unit_tests/event/event_tracker_tests.cpp | 2 +- unit_tests/event/user_events_tests.cpp | 2 +- .../execution_environment_tests.cpp | 2 +- .../enqueue_execution_model_kernel_tests.cpp | 2 +- .../parent_kernel_dispatch_tests.cpp | 2 +- .../scheduler_dispatch_tests.cpp | 2 +- unit_tests/fixtures/d3d_test_fixture.h | 2 +- unit_tests/fixtures/execution_model_fixture.h | 2 +- unit_tests/fixtures/preemption_fixture.h | 2 +- unit_tests/fixtures/scenario_test_fixture.h | 2 +- unit_tests/gen11/preamble_tests_gen11.cpp | 2 +- .../program_media_sampler_tests_gen11.cpp | 2 +- unit_tests/gen11/test_preamble_gen11.cpp | 2 +- unit_tests/gen9/preamble_tests_gen9.cpp | 2 +- unit_tests/gen9/skl/test_preamble_skl.cpp | 2 +- unit_tests/gmm_helper/gmm_helper_tests.cpp | 2 +- unit_tests/helpers/CMakeLists.txt | 2 +- .../hardware_commands_helper_tests.cpp | 2 +- unit_tests/helpers/hw_helper_tests.cpp | 2 +- unit_tests/helpers/kmd_notify_tests.cpp | 2 +- unit_tests/helpers/timestamp_packet_tests.cpp | 2 +- .../helpers/transfer_properties_tests.cpp | 2 +- .../kernel_cache_flush_requirements_tests.cpp | 2 +- .../kernel_reflection_surface_tests.cpp | 2 +- unit_tests/kernel/kernel_tests.cpp | 2 +- unit_tests/linux/drm_null_device_tests.cpp | 2 +- unit_tests/linux/main_linux_dll.cpp | 2 +- unit_tests/linux/mock_os_layer.cpp | 4 +-- unit_tests/mem_obj/buffer_set_arg_tests.cpp | 2 +- unit_tests/mem_obj/buffer_tests.cpp | 2 +- .../mem_obj/get_mem_object_info_tests.cpp | 2 +- unit_tests/mem_obj/image_tests.cpp | 2 +- unit_tests/mem_obj/image_transfer_tests.cpp | 2 +- unit_tests/mem_obj/nv12_image_tests.cpp | 2 +- unit_tests/mem_obj/zero_copy_tests.cpp | 2 +- .../internal_allocation_storage_tests.cpp | 2 +- .../memory_manager/memory_manager_tests.cpp | 2 +- .../unified_memory_manager_tests.cpp | 2 +- .../offline_compiler_tests.cpp | 2 +- .../debug_settings_manager_tests.cpp | 2 +- .../os_interface/device_factory_tests.cpp | 2 +- .../os_interface/linux/device_os_tests.cpp | 2 +- .../linux/drm_command_stream_mm_tests.cpp | 2 +- .../linux/drm_command_stream_tests.cpp | 2 +- .../linux/drm_memory_manager_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 2 +- .../os_interface/windows/device_os_tests.cpp | 2 +- .../windows/gdi_interface_tests.cpp | 2 +- .../windows/hw_info_config_win_tests.cpp | 2 +- .../os_interface/windows/wddm20_tests.cpp | 2 +- .../os_interface/windows/wddm23_tests.cpp | 2 +- .../windows/wddm_memory_manager_tests.cpp | 2 +- .../windows/wddm_preemption_tests.cpp | 2 +- unit_tests/platform/platform_tests.cpp | 2 +- unit_tests/preemption/preemption_tests.cpp | 2 +- unit_tests/profiling/profiling_tests.cpp | 2 +- unit_tests/program/program_tests.cpp | 2 +- .../scheduler/scheduler_kernel_tests.cpp | 2 +- unit_tests/sharings/gl/gl_sharing_tests.cpp | 2 +- unit_tests/sharings/sharing_factory_tests.cpp | 2 +- ...l_get_extension_function_address_tests.cpp | 2 +- unit_tests/sharings/va/context_va_tests.cpp | 2 +- .../sharings/va/va_sharing_linux_tests.cpp | 2 +- unit_tests/sharings/va/va_sharing_tests.cpp | 2 +- .../source_level_debugger_device_tests.cpp | 2 +- unit_tests/tbx/main_tbx.cpp | 2 +- unit_tests/windows/wddm_create_tests.cpp | 2 +- 127 files changed, 141 insertions(+), 143 deletions(-) rename {unit_tests => core/unit_tests}/helpers/debug_manager_state_restore.h (100%) diff --git a/unit_tests/helpers/debug_manager_state_restore.h b/core/unit_tests/helpers/debug_manager_state_restore.h similarity index 100% rename from unit_tests/helpers/debug_manager_state_restore.h rename to core/unit_tests/helpers/debug_manager_state_restore.h diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index 71ea7d8eba..f2e67d19c9 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -969,25 +969,23 @@ cl_int Program::parseProgramScopePatchList() { "\n .GlobalPointerOffset", patch.GlobalPointerOffset, "\n .BufferType", patch.BufferType, "\n .BufferIndex", patch.BufferIndex); - } - break; + } break; - case PATCH_TOKEN_CONSTANT_POINTER_PROGRAM_BINARY_INFO: { - auto patch = *(SPatchConstantPointerProgramBinaryInfo *)pPatch; - if ((patch.ConstantBufferIndex == 0) && (patch.BufferIndex == 0) && (patch.BufferType == PROGRAM_SCOPE_CONSTANT_BUFFER)) { - globalConstantsSelfPatches.push_back(readMisalignedUint64(&patch.ConstantPointerOffset)); - } else { - printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "Program::parseProgramScopePatchList. Unhandled Data parameter: %d\n", pPatch->Token); - } - DBG_LOG(LogPatchTokens, - "\n .CONSTANT_POINTER_PROGRAM_BINARY_INFO", pPatch->Token, - "\n .Size", pPatch->Size, - "\n .ConstantBufferIndex", patch.ConstantBufferIndex, - "\n .ConstantPointerOffset", patch.ConstantPointerOffset, - "\n .BufferType", patch.BufferType, - "\n .BufferIndex", patch.BufferIndex); + case PATCH_TOKEN_CONSTANT_POINTER_PROGRAM_BINARY_INFO: { + auto patch = *(SPatchConstantPointerProgramBinaryInfo *)pPatch; + if ((patch.ConstantBufferIndex == 0) && (patch.BufferIndex == 0) && (patch.BufferType == PROGRAM_SCOPE_CONSTANT_BUFFER)) { + globalConstantsSelfPatches.push_back(readMisalignedUint64(&patch.ConstantPointerOffset)); + } else { + printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "Program::parseProgramScopePatchList. Unhandled Data parameter: %d\n", pPatch->Token); } - break; + DBG_LOG(LogPatchTokens, + "\n .CONSTANT_POINTER_PROGRAM_BINARY_INFO", pPatch->Token, + "\n .Size", pPatch->Size, + "\n .ConstantBufferIndex", patch.ConstantBufferIndex, + "\n .ConstantPointerOffset", patch.ConstantPointerOffset, + "\n .BufferType", patch.BufferType, + "\n .BufferIndex", patch.BufferIndex); + } break; case PATCH_TOKEN_PROGRAM_SYMBOL_TABLE: { const auto patch = reinterpret_cast(pPatch); diff --git a/unit_tests/api/cl_get_device_ids_tests.inl b/unit_tests/api/cl_get_device_ids_tests.inl index 357286b4d4..01690fda5d 100644 --- a/unit_tests/api/cl_get_device_ids_tests.inl +++ b/unit_tests/api/cl_get_device_ids_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/platform/platform.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_set_event_callback_tests.inl b/unit_tests/api/cl_set_event_callback_tests.inl index da4ab35924..fe071e49cd 100644 --- a/unit_tests/api/cl_set_event_callback_tests.inl +++ b/unit_tests/api/cl_set_event_callback_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/event.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "cl_api_tests.h" using namespace NEO; diff --git a/unit_tests/aub/aub_center_tests.cpp b/unit_tests/aub/aub_center_tests.cpp index cf9a7298a6..5f51c95233 100644 --- a/unit_tests/aub/aub_center_tests.cpp +++ b/unit_tests/aub/aub_center_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_center.h" #include "unit_tests/mocks/mock_aub_manager.h" diff --git a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp index ed8c701c1f..408ace27cb 100644 --- a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_aub_center.h" diff --git a/unit_tests/aub/aub_helper_tests.inl b/unit_tests/aub/aub_helper_tests.inl index 90c050a9bd..223fa4b493 100644 --- a/unit_tests/aub/aub_helper_tests.inl +++ b/unit_tests/aub/aub_helper_tests.inl @@ -6,6 +6,7 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub/aub_helper.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" @@ -13,7 +14,6 @@ #include "runtime/helpers/device_helpers.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_lrca_helper.h" #include "gtest/gtest.h" diff --git a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp index 3658224ceb..8d3e63eccd 100644 --- a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/aub_alloc_dump.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/buffer.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_gmm.h" #include "unit_tests/mocks/mock_gmm_resource_info.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index 5e2a95e145..7f63a2431d 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/buffer.h" #include "test.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" using namespace NEO; diff --git a/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 1f914c1140..c9247dede2 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/event/event.h" #include "runtime/helpers/hardware_commands_helper.h" @@ -16,7 +17,6 @@ #include "unit_tests/fixtures/simple_arg_fixture.h" #include "unit_tests/fixtures/two_walker_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" using namespace NEO; diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h index 270de83844..e72b32d2b1 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h +++ b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h @@ -6,11 +6,11 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "test.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" using namespace NEO; diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index b3ea66535f..071f358ad8 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/mem_obj/buffer.h" #include "test.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp index 4050a6fcb9..183d39840d 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/event.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/timestamp_packet.h" @@ -12,7 +13,6 @@ #include "runtime/utilities/tag_allocator.h" #include "test.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" using namespace NEO; diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp index 8c73a9602d..bb5257a3d4 100644 --- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -7,10 +7,10 @@ #include "aub_mem_dump_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub/aub_helper.h" #include "runtime/helpers/hw_helper.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_csr.h" using NEO::AUBCommandStreamReceiver; diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index 75ffe7b077..0ed4195445 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/aux_translation_builtin.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" @@ -22,7 +23,6 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/fixtures/run_kernel_fixture.h" #include "unit_tests/global_environment.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_builtins.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/command_queue_hw_tests.cpp b/unit_tests/command_queue/command_queue_hw_tests.cpp index 45edef36d2..0cbb1d754f 100644 --- a/unit_tests/command_queue/command_queue_hw_tests.cpp +++ b/unit_tests/command_queue/command_queue_hw_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/dispatch_info_builder.h" #include "test.h" @@ -12,7 +13,6 @@ #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp index 4d0261004c..43d5ebb4a6 100644 --- a/unit_tests/command_queue/command_queue_tests.cpp +++ b/unit_tests/command_queue/command_queue_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/event.h" @@ -22,7 +23,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/unit_tests/command_queue/dispatch_walker_tests.cpp index 08c579f7fa..7a5f4d927d 100644 --- a/unit_tests/command_queue/dispatch_walker_tests.cpp +++ b/unit_tests/command_queue/dispatch_walker_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/aux_translation_builtin.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_queue/hardware_interface.h" @@ -17,7 +18,6 @@ #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/enqueue_handler_tests.cpp b/unit_tests/command_queue/enqueue_handler_tests.cpp index 477d3c7604..71ceb509ac 100644 --- a/unit_tests/command_queue/enqueue_handler_tests.cpp +++ b/unit_tests/command_queue/enqueue_handler_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_subcapture.h" #include "runtime/event/user_event.h" #include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/enqueue_handler_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_csr.h" #include "unit_tests/mocks/mock_aub_subcapture_manager.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/enqueue_kernel_1_tests.cpp b/unit_tests/command_queue/enqueue_kernel_1_tests.cpp index 67a03ae98d..e61a5d4db9 100644 --- a/unit_tests/command_queue/enqueue_kernel_1_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_1_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp index ad15683e2b..4f270ff311 100644 --- a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/allocations_list.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp index 762cc7659b..a17742cdc5 100644 --- a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/aligned_memory.h" #include "test.h" @@ -12,7 +13,6 @@ #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/command_queue/enqueue_map_image_tests.cpp b/unit_tests/command_queue/enqueue_map_image_tests.cpp index 248cbbea7f..8dd795365b 100644 --- a/unit_tests/command_queue/enqueue_map_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_map_image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" #include "runtime/os_interface/os_context.h" @@ -13,7 +14,6 @@ #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp index a0f77beb97..1d1eee4f76 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/event/event.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp index 3320e8dc45..62ef5f86e3 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/cache_policy.h" @@ -14,7 +15,6 @@ #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/command_queue/enqueue_read_buffer_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/command_queue/enqueue_read_image_tests.cpp b/unit_tests/command_queue/enqueue_read_image_tests.cpp index d8c32cd2b3..c609819584 100644 --- a/unit_tests/command_queue/enqueue_read_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_image_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/memory_manager/allocations_list.h" #include "test.h" #include "unit_tests/command_queue/enqueue_read_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index baa5860d04..0229d24d3e 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" #include "runtime/helpers/aligned_memory.h" @@ -17,7 +18,6 @@ #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp index e6b9f5c167..46b085e31d 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/event/event.h" #include "unit_tests/command_queue/buffer_operations_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp index 7b22268f14..1d3c430198 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/dispatch_info.h" @@ -13,7 +14,6 @@ #include "unit_tests/command_queue/buffer_operations_fixture.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/command_queue/local_work_size_tests.cpp b/unit_tests/command_queue/local_work_size_tests.cpp index b142b33584..ffe467a10d 100644 --- a/unit_tests/command_queue/local_work_size_tests.cpp +++ b/unit_tests/command_queue/local_work_size_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/helpers/options.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/command_queue/work_group_size_tests.cpp b/unit_tests/command_queue/work_group_size_tests.cpp index d833aa73ca..d16999f80c 100644 --- a/unit_tests/command_queue/work_group_size_tests.cpp +++ b/unit_tests/command_queue/work_group_size_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "hw_cmds.h" #include "patch_shared.h" diff --git a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp index 059733a1c9..343e9253f8 100644 --- a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/aub_alloc_dump.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/helpers/hardware_context_controller.h" @@ -14,7 +15,6 @@ #include "unit_tests/fixtures/aub_command_stream_receiver_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_center.h" #include "unit_tests/mocks/mock_aub_csr.h" #include "unit_tests/mocks/mock_aub_manager.h" diff --git a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp index c5c3e40f66..dc55e47879 100644 --- a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/aub_alloc_dump.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/helpers/hardware_context_controller.h" @@ -15,7 +16,6 @@ #include "unit_tests/fixtures/aub_command_stream_receiver_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_center.h" #include "unit_tests/mocks/mock_aub_csr.h" #include "unit_tests/mocks/mock_aub_file_stream.h" diff --git a/unit_tests/command_stream/aub_file_stream_tests.cpp b/unit_tests/command_stream/aub_file_stream_tests.cpp index 15821ce9d5..5ad680688b 100644 --- a/unit_tests/command_stream/aub_file_stream_tests.cpp +++ b/unit_tests/command_stream/aub_file_stream_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" #include "runtime/helpers/hardware_context_controller.h" @@ -13,7 +14,6 @@ #include "test.h" #include "unit_tests/fixtures/aub_command_stream_receiver_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_center.h" #include "unit_tests/mocks/mock_aub_csr.h" #include "unit_tests/mocks/mock_aub_file_stream.h" diff --git a/unit_tests/command_stream/aub_subcapture_tests.cpp b/unit_tests/command_stream/aub_subcapture_tests.cpp index ea0e98a016..2bdef7daf8 100644 --- a/unit_tests/command_stream/aub_subcapture_tests.cpp +++ b/unit_tests/command_stream/aub_subcapture_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_subcapture.h" #include "runtime/helpers/dispatch_info.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_subcapture_manager.h" #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp index a34f53d233..de41a10564 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/os_interface/os_context.h" #include "test.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp index 9df3bc6dbb..930b09134e 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/csr_definitions.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/gmm_helper/gmm_helper.h" @@ -14,7 +15,6 @@ #include "runtime/os_interface/os_context.h" #include "test.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_allocation_properties.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp index c4bb221de6..c6f302caf8 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/internal_allocation_storage.h" @@ -12,7 +13,6 @@ #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index 801abdfda8..8e347c2894 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.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" #include "runtime/command_queue/gpgpu_walker.h" @@ -25,7 +26,6 @@ #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/libult/ult_command_stream_receiver.h" diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index 19cd9ec43b..84c1e61555 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.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" #include "runtime/command_queue/gpgpu_walker.h" @@ -29,7 +30,6 @@ #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/libult/create_command_stream.h" diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index 6233f7dd7d..a0cc2e0cb3 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/aub_services.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/linear_stream.h" @@ -21,7 +22,6 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/gen_common/matchers.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_builtins.h" diff --git a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp index 03df29279a..34786c54cd 100644 --- a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/execution_environment/execution_environment.h" @@ -12,7 +13,6 @@ #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" diff --git a/unit_tests/command_stream/experimental_command_buffer_tests.cpp b/unit_tests/command_stream/experimental_command_buffer_tests.cpp index 102328a6e9..9e014a48b8 100644 --- a/unit_tests/command_stream/experimental_command_buffer_tests.cpp +++ b/unit_tests/command_stream/experimental_command_buffer_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_constants.h" #include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_experimental_command_buffer.h" #include "gtest/gtest.h" diff --git a/unit_tests/command_stream/get_devices_tests.cpp b/unit_tests/command_stream/get_devices_tests.cpp index 57f2ea9dc0..1cc3d50773 100644 --- a/unit_tests/command_stream/get_devices_tests.cpp +++ b/unit_tests/command_stream/get_devices_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/options.h" @@ -13,7 +14,6 @@ #include "runtime/os_interface/hw_info_config.h" #include "runtime/platform/platform.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/libult/create_command_stream.h" namespace NEO { diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/unit_tests/command_stream/tbx_command_stream_tests.cpp index 72552dce29..b877d7117a 100644 --- a/unit_tests/command_stream/tbx_command_stream_tests.cpp +++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" @@ -21,7 +22,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_aub_center.h" #include "unit_tests/mocks/mock_aub_manager.h" diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index 9667cbcd1f..4105d59e80 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/compiler_interface/compiler_interface.inl" #include "runtime/context/context.h" @@ -15,7 +16,6 @@ #include "runtime/platform/platform.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/global_environment.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/test_files.h" #include "unit_tests/mocks/mock_cif.h" #include "unit_tests/mocks/mock_compilers.h" diff --git a/unit_tests/context/context_tests.cpp b/unit_tests/context/context_tests.cpp index f07971d4c4..fe33eb16f1 100644 --- a/unit_tests/context/context_tests.cpp +++ b/unit_tests/context/context_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/context/context.inl" #include "runtime/device/device.h" @@ -12,7 +13,6 @@ #include "runtime/helpers/options.h" #include "runtime/sharings/sharing.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_deferred_deleter.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp index 08420452a7..f74550279b 100644 --- a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp +++ b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/user_event.h" #include "runtime/memory_manager/unified_memory_manager.h" #include "unit_tests/context/driver_diagnostics_tests.h" #include "unit_tests/fixtures/buffer_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" using namespace NEO; diff --git a/unit_tests/context/driver_diagnostics_tests.cpp b/unit_tests/context/driver_diagnostics_tests.cpp index f26021c47a..73ace6e1d4 100644 --- a/unit_tests/context/driver_diagnostics_tests.cpp +++ b/unit_tests/context/driver_diagnostics_tests.cpp @@ -7,8 +7,8 @@ #include "driver_diagnostics_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_gmm.h" #include diff --git a/unit_tests/context/gl/context_gl_tests.cpp b/unit_tests/context/gl/context_gl_tests.cpp index 3d7404c0a0..588844d617 100644 --- a/unit_tests/context/gl/context_gl_tests.cpp +++ b/unit_tests/context/gl/context_gl_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/device_queue/device_queue.h" @@ -12,7 +13,6 @@ #include "runtime/os_interface/windows/gl/gl_sharing_os.h" #include "runtime/sharings/gl/gl_sharing.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_deferred_deleter.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/d3d_sharing/d3d9_tests.cpp b/unit_tests/d3d_sharing/d3d9_tests.cpp index 61230250df..24552e2b98 100644 --- a/unit_tests/d3d_sharing/d3d9_tests.cpp +++ b/unit_tests/d3d_sharing/d3d9_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -14,7 +15,6 @@ #include "runtime/sharings/d3d/d3d_surface.h" #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_d3d_objects.h" diff --git a/unit_tests/d3d_sharing/d3d_tests_part1.cpp b/unit_tests/d3d_sharing/d3d_tests_part1.cpp index bc0542870c..72981e111b 100644 --- a/unit_tests/d3d_sharing/d3d_tests_part1.cpp +++ b/unit_tests/d3d_sharing/d3d_tests_part1.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -18,7 +19,6 @@ #include "runtime/sharings/d3d/enable_d3d.h" #include "runtime/utilities/arrayref.h" #include "unit_tests/fixtures/d3d_test_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_sharing_factory.h" diff --git a/unit_tests/d3d_sharing/d3d_tests_part2.cpp b/unit_tests/d3d_sharing/d3d_tests_part2.cpp index 5d152095d1..ed5b907ae1 100644 --- a/unit_tests/d3d_sharing/d3d_tests_part2.cpp +++ b/unit_tests/d3d_sharing/d3d_tests_part2.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -17,7 +18,6 @@ #include "runtime/sharings/d3d/d3d_texture.h" #include "runtime/utilities/arrayref.h" #include "unit_tests/fixtures/d3d_test_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/unit_tests/device/device_caps_tests.cpp b/unit_tests/device/device_caps_tests.cpp index bb31624a1b..e2485d7eca 100644 --- a/unit_tests/device/device_caps_tests.cpp +++ b/unit_tests/device/device_caps_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/driver_info.h" #include "runtime/helpers/hw_info.h" @@ -16,7 +17,6 @@ #include "runtime/source_level_debugger/source_level_debugger.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_helper_tests.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_builtins.h" diff --git a/unit_tests/device/device_tests.cpp b/unit_tests/device/device_tests.cpp index c1f730bc87..7d94feed1e 100644 --- a/unit_tests/device/device_tests.cpp +++ b/unit_tests/device/device_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/device/device.h" #include "runtime/helpers/device_helpers.h" #include "runtime/helpers/hw_helper.h" @@ -14,7 +15,6 @@ #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/libult/ult_command_stream_receiver.h" diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/unit_tests/device/gl/device_caps_gl_tests.cpp index cf5a6d8557..2f0c13c57f 100644 --- a/unit_tests/device/gl/device_caps_gl_tests.cpp +++ b/unit_tests/device/gl/device_caps_gl_tests.cpp @@ -6,13 +6,13 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gmock/gmock.h" #include "hw_cmds.h" diff --git a/unit_tests/device_queue/device_queue_hw_tests.cpp b/unit_tests/device_queue/device_queue_hw_tests.cpp index 60a0f0a5c9..6dbad5add0 100644 --- a/unit_tests/device_queue/device_queue_hw_tests.cpp +++ b/unit_tests/device_queue/device_queue_hw_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/options.h" #include "runtime/utilities/tag_allocator.h" #include "unit_tests/fixtures/device_host_queue_fixture.h" #include "unit_tests/fixtures/execution_model_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/event/async_events_handler_tests.cpp b/unit_tests/event/async_events_handler_tests.cpp index 86d7fa6789..d6e14293ff 100644 --- a/unit_tests/event/async_events_handler_tests.cpp +++ b/unit_tests/event/async_events_handler_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/async_events_handler.h" #include "runtime/event/event.h" #include "runtime/event/user_event.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/platform/platform.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_async_event_handler.h" #include "gmock/gmock.h" diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index 917f264971..d42eb7e08e 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/perf_counter.h" @@ -16,7 +17,6 @@ #include "runtime/utilities/tag_allocator.h" #include "test.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/event/event_tests_mt.cpp b/unit_tests/event/event_tests_mt.cpp index 92baf0d9ce..62d64be8ba 100644 --- a/unit_tests/event/event_tests_mt.cpp +++ b/unit_tests/event/event_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_event.h" #include "event_fixture.h" diff --git a/unit_tests/event/event_tracker_tests.cpp b/unit_tests/event/event_tracker_tests.cpp index fe263fe923..0241d12656 100644 --- a/unit_tests/event/event_tracker_tests.cpp +++ b/unit_tests/event/event_tracker_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/event.h" #include "runtime/event/event_tracker.h" #include "runtime/helpers/file_io.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "event_fixture.h" diff --git a/unit_tests/event/user_events_tests.cpp b/unit_tests/event/user_events_tests.cpp index 306b377ac6..b5052d2c9d 100644 --- a/unit_tests/event/user_events_tests.cpp +++ b/unit_tests/event/user_events_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" #include "unit_tests/command_queue/enqueue_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_event.h" #include "event_fixture.h" diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/unit_tests/execution_environment/execution_environment_tests.cpp index 16aa1e7b7b..e6958eadfb 100644 --- a/unit_tests/execution_environment/execution_environment_tests.cpp +++ b/unit_tests/execution_environment/execution_environment_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub/aub_center.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/preemption.h" @@ -19,7 +20,6 @@ #include "runtime/platform/platform.h" #include "runtime/source_level_debugger/source_level_debugger.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp index 0631246b3c..02db938355 100644 --- a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" #include "runtime/command_queue/gpgpu_walker.h" @@ -15,7 +16,6 @@ #include "runtime/kernel/kernel.h" #include "unit_tests/fixtures/device_host_queue_fixture.h" #include "unit_tests/fixtures/execution_model_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp index 8bfc166b92..f64b0eeceb 100644 --- a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp +++ b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/enqueue_kernel.h" #include "runtime/command_queue/hardware_interface.h" #include "runtime/event/perf_counter.h" #include "runtime/kernel/kernel.h" #include "runtime/sampler/sampler.h" #include "unit_tests/fixtures/execution_model_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/execution_model/scheduler_dispatch_tests.cpp b/unit_tests/execution_model/scheduler_dispatch_tests.cpp index 76bcd82313..5718ae426b 100644 --- a/unit_tests/execution_model/scheduler_dispatch_tests.cpp +++ b/unit_tests/execution_model/scheduler_dispatch_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/enqueue_kernel.h" #include "runtime/device_queue/device_queue.h" #include "runtime/memory_manager/surface.h" #include "runtime/scheduler/scheduler_kernel.h" #include "unit_tests/fixtures/execution_model_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/fixtures/d3d_test_fixture.h b/unit_tests/fixtures/d3d_test_fixture.h index 8ac0c1b416..78ea08032e 100644 --- a/unit_tests/fixtures/d3d_test_fixture.h +++ b/unit_tests/fixtures/d3d_test_fixture.h @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_d3d_objects.h" diff --git a/unit_tests/fixtures/execution_model_fixture.h b/unit_tests/fixtures/execution_model_fixture.h index 478579a82a..4266bd0e49 100644 --- a/unit_tests/fixtures/execution_model_fixture.h +++ b/unit_tests/fixtures/execution_model_fixture.h @@ -7,10 +7,10 @@ #pragma once +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/device_queue/device_queue.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/execution_model_kernel_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_kernel.h" class DeviceQueueFixture { diff --git a/unit_tests/fixtures/preemption_fixture.h b/unit_tests/fixtures/preemption_fixture.h index f554685b3f..8d33a1cfaa 100644 --- a/unit_tests/fixtures/preemption_fixture.h +++ b/unit_tests/fixtures/preemption_fixture.h @@ -7,9 +7,9 @@ #pragma once +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "test.h" #include "unit_tests/fixtures/hello_world_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/unit_tests/fixtures/scenario_test_fixture.h b/unit_tests/fixtures/scenario_test_fixture.h index bc361017c8..5ec0ed425b 100644 --- a/unit_tests/fixtures/scenario_test_fixture.h +++ b/unit_tests/fixtures/scenario_test_fixture.h @@ -7,10 +7,10 @@ #pragma once +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/options.h" #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/gen11/preamble_tests_gen11.cpp b/unit_tests/gen11/preamble_tests_gen11.cpp index 25b899211f..73f1135c48 100644 --- a/unit_tests/gen11/preamble_tests_gen11.cpp +++ b/unit_tests/gen11/preamble_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" diff --git a/unit_tests/gen11/program_media_sampler_tests_gen11.cpp b/unit_tests/gen11/program_media_sampler_tests_gen11.cpp index dbf5687ea2..4a207e568a 100644 --- a/unit_tests/gen11/program_media_sampler_tests_gen11.cpp +++ b/unit_tests/gen11/program_media_sampler_tests_gen11.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/gen11/reg_configs.h" #include "runtime/helpers/hw_helper.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/gen11/test_preamble_gen11.cpp b/unit_tests/gen11/test_preamble_gen11.cpp index 7c2379d35a..039c04936d 100644 --- a/unit_tests/gen11/test_preamble_gen11.cpp +++ b/unit_tests/gen11/test_preamble_gen11.cpp @@ -5,8 +5,8 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/preamble/preamble_fixture.h" #include "reg_configs_common.h" diff --git a/unit_tests/gen9/preamble_tests_gen9.cpp b/unit_tests/gen9/preamble_tests_gen9.cpp index 1cfde5cd95..65556bc0b6 100644 --- a/unit_tests/gen9/preamble_tests_gen9.cpp +++ b/unit_tests/gen9/preamble_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" diff --git a/unit_tests/gen9/skl/test_preamble_skl.cpp b/unit_tests/gen9/skl/test_preamble_skl.cpp index 010b183f67..0d5eacd7e2 100644 --- a/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" #include "runtime/command_stream/thread_arbitration_policy.h" #include "runtime/gen9/reg_configs.h" #include "runtime/helpers/preamble.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/preamble/preamble_fixture.h" using namespace NEO; diff --git a/unit_tests/gmm_helper/gmm_helper_tests.cpp b/unit_tests/gmm_helper/gmm_helper_tests.cpp index d6105f4e72..86ece4123e 100644 --- a/unit_tests/gmm_helper/gmm_helper_tests.cpp +++ b/unit_tests/gmm_helper/gmm_helper_tests.cpp @@ -6,13 +6,13 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/platform/platform.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_gmm.h" diff --git a/unit_tests/helpers/CMakeLists.txt b/unit_tests/helpers/CMakeLists.txt index 19564866d8..fda3c8817c 100644 --- a/unit_tests/helpers/CMakeLists.txt +++ b/unit_tests/helpers/CMakeLists.txt @@ -16,7 +16,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager_state_restore.h ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder_tests.cpp @@ -54,6 +53,7 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl ${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h + ${NEO_CORE_DIRECTORY}/unit_tests/helpers/debug_manager_state_restore.h ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_helpers}) diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp index ffb6cb0374..0ce0ff6d63 100644 --- a/unit_tests/helpers/hardware_commands_helper_tests.cpp +++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp @@ -8,6 +8,7 @@ #include "unit_tests/helpers/hardware_commands_helper_tests.h" #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue_hw.h" @@ -16,7 +17,6 @@ #include "unit_tests/fixtures/execution_model_kernel_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index 464085a01a..1681dcef1d 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/helpers/hw_helper_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" @@ -16,7 +17,6 @@ #include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/os_interface.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/variable_backup.h" diff --git a/unit_tests/helpers/kmd_notify_tests.cpp b/unit_tests/helpers/kmd_notify_tests.cpp index f2fee49bd1..60de6f03ab 100644 --- a/unit_tests/helpers/kmd_notify_tests.cpp +++ b/unit_tests/helpers/kmd_notify_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/os_interface/os_context.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/helpers/timestamp_packet_tests.cpp b/unit_tests/helpers/timestamp_packet_tests.cpp index 6bf16d6550..2eca7ea705 100644 --- a/unit_tests/helpers/timestamp_packet_tests.cpp +++ b/unit_tests/helpers/timestamp_packet_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_queue/hardware_interface.h" #include "runtime/event/user_event.h" @@ -13,7 +14,6 @@ #include "runtime/platform/platform.h" #include "runtime/utilities/tag_allocator.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/helpers/transfer_properties_tests.cpp b/unit_tests/helpers/transfer_properties_tests.cpp index eebbba4898..36286f6aec 100644 --- a/unit_tests/helpers/transfer_properties_tests.cpp +++ b/unit_tests/helpers/transfer_properties_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/properties_helper.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp b/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp index a4c8216139..66f6881abd 100644 --- a/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/kernel/kernel_reflection_surface_tests.cpp b/unit_tests/kernel/kernel_reflection_surface_tests.cpp index ab0ac6e06f..79f9ca5e7c 100644 --- a/unit_tests/kernel/kernel_reflection_surface_tests.cpp +++ b/unit_tests/kernel/kernel_reflection_surface_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_model/device_enqueue.h" #include "runtime/kernel/kernel.h" #include "runtime/program/printf_handler.h" @@ -13,7 +14,6 @@ #include "unit_tests/fixtures/execution_model_kernel_fixture.h" #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/gen_common/matchers.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device_queue.h" diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 68c0e1a2e9..3c5ff8b054 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/gmm_helper/gmm_helper.h" @@ -23,7 +24,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/execution_model_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/linux/drm_null_device_tests.cpp b/unit_tests/linux/drm_null_device_tests.cpp index 4dce32f92a..60dbb0aa14 100644 --- a/unit_tests/linux/drm_null_device_tests.cpp +++ b/unit_tests/linux/drm_null_device_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/os_interface/linux/drm_null_device.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/linux/drm_wrap.h" #include "unit_tests/linux/mock_os_layer.h" diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp index c0b3f60d03..7e8a223b9f 100644 --- a/unit_tests/linux/main_linux_dll.cpp +++ b/unit_tests/linux/main_linux_dll.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/basic_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_manager.h" @@ -13,7 +14,6 @@ #include "runtime/os_interface/linux/os_interface.h" #include "test.h" #include "unit_tests/custom_event_listener.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/linux/drm_wrap.h" #include "unit_tests/linux/mock_os_layer.h" diff --git a/unit_tests/linux/mock_os_layer.cpp b/unit_tests/linux/mock_os_layer.cpp index 9642cb8c90..52f9e95067 100644 --- a/unit_tests/linux/mock_os_layer.cpp +++ b/unit_tests/linux/mock_os_layer.cpp @@ -14,8 +14,8 @@ int (*c_open)(const char *pathname, int flags, ...) = nullptr; int (*c_ioctl)(int fd, unsigned long int request, ...) = nullptr; int fakeFd = 1023; -int haveDri = 0; // index of dri to serve, -1 - none -int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID +int haveDri = 0; // index of dri to serve, -1 - none +int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID int haveSoftPin = 1; int havePreemption = I915_SCHEDULER_CAP_ENABLED | I915_SCHEDULER_CAP_PRIORITY | diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index 149cde9b94..4f13fdf946 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/kernel/kernel.h" #include "runtime/memory_manager/surface.h" @@ -14,7 +15,6 @@ #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index f474c1baff..24bc040202 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/event/user_event.h" @@ -22,7 +23,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/gen_common/matchers.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_tests.cpp index bcf712c7fe..652243c6e1 100644 --- a/unit_tests/mem_obj/get_mem_object_info_tests.cpp +++ b/unit_tests/mem_obj/get_mem_object_info_tests.cpp @@ -6,13 +6,13 @@ */ #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "gtest/gtest.h" diff --git a/unit_tests/mem_obj/image_tests.cpp b/unit_tests/mem_obj/image_tests.cpp index fdc7afce67..a23bcddc7f 100644 --- a/unit_tests/mem_obj/image_tests.cpp +++ b/unit_tests/mem_obj/image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/helpers/aligned_memory.h" @@ -17,7 +18,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/mem_obj/image_compression_fixture.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/mem_obj/image_transfer_tests.cpp b/unit_tests/mem_obj/image_transfer_tests.cpp index 9b150a2f04..9815e7f826 100644 --- a/unit_tests/mem_obj/image_transfer_tests.cpp +++ b/unit_tests/mem_obj/image_transfer_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/mem_obj/nv12_image_tests.cpp b/unit_tests/mem_obj/nv12_image_tests.cpp index 225fab04c3..40c360a944 100644 --- a/unit_tests/mem_obj/nv12_image_tests.cpp +++ b/unit_tests/mem_obj/nv12_image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" @@ -12,7 +13,6 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/mem_obj/zero_copy_tests.cpp b/unit_tests/mem_obj/zero_copy_tests.cpp index 1f24c12d00..180ff90519 100644 --- a/unit_tests/mem_obj/zero_copy_tests.cpp +++ b/unit_tests/mem_obj/zero_copy_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "gtest/gtest.h" diff --git a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp b/unit_tests/memory_manager/internal_allocation_storage_tests.cpp index 401a20722b..a4eac60499 100644 --- a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp +++ b/unit_tests/memory_manager/internal_allocation_storage_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" #include "test.h" #include "unit_tests/fixtures/memory_allocator_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_allocation_properties.h" #include "unit_tests/utilities/containers_tests_helpers.h" diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index b6a1055644..fefba060ee 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" #include "runtime/event/event.h" #include "runtime/helpers/cache_policy.h" @@ -23,7 +24,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/memory_allocator_fixture.h" #include "unit_tests/fixtures/memory_manager_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/memory_manager/unified_memory_manager_tests.cpp b/unit_tests/memory_manager/unified_memory_manager_tests.cpp index fb401d9169..265ae14373 100644 --- a/unit_tests/memory_manager/unified_memory_manager_tests.cpp +++ b/unit_tests/memory_manager/unified_memory_manager_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/mem_obj/mem_obj_helper.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/mocks/mock_svm_manager.h" diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp index dd88cf2727..de25e6658c 100644 --- a/unit_tests/offline_compiler/offline_compiler_tests.cpp +++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp @@ -7,11 +7,11 @@ #include "offline_compiler_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_compilers.h" #include "environment.h" diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp index c881fc084b..5a445e5646 100644 --- a/unit_tests/os_interface/debug_settings_manager_tests.cpp +++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/utilities/debug_file_reader.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp index dcfdb5b1de..2615f45e07 100644 --- a/unit_tests/os_interface/device_factory_tests.cpp +++ b/unit_tests/os_interface/device_factory_tests.cpp @@ -5,6 +5,7 @@ * */ +#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" @@ -12,7 +13,6 @@ #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/os_library.h" #include "runtime/platform/platform.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/unit_tests/os_interface/linux/device_os_tests.cpp b/unit_tests/os_interface/linux/device_os_tests.cpp index 14b7afc2af..8f0be03914 100644 --- a/unit_tests/os_interface/linux/device_os_tests.cpp +++ b/unit_tests/os_interface/linux/device_os_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/device/device.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/options.h" #include "runtime/platform/platform.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp index b0918cbda6..190b4f3644 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/os_interface/linux/drm_command_stream.h" #include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/os_interface/linux/os_interface.h" #include "runtime/platform/platform.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/os_interface/linux/device_command_stream_fixture.h" using namespace NEO; diff --git a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp index 82eaff88b3..a3c383d3b2 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/mem_obj/buffer.h" @@ -16,7 +17,6 @@ #include "runtime/os_interface/os_context.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/linux/mock_drm_command_stream_receiver.h" diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index 07760086e4..b8f116728c 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -8,6 +8,7 @@ #include "drm_memory_manager_tests.h" #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/preemption.h" @@ -28,7 +29,6 @@ #include "runtime/os_interface/os_context.h" #include "runtime/utilities/tag_allocator.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/linux/mock_drm_command_stream_receiver.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_gmm.h" diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index 2b13bed110..4db3cef31d 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" @@ -29,7 +30,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_builtins.h" diff --git a/unit_tests/os_interface/windows/device_os_tests.cpp b/unit_tests/os_interface/windows/device_os_tests.cpp index 5e7dada894..5318b3fb20 100644 --- a/unit_tests/os_interface/windows/device_os_tests.cpp +++ b/unit_tests/os_interface/windows/device_os_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/device/device.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/options.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_device.h" #include "gmock/gmock.h" diff --git a/unit_tests/os_interface/windows/gdi_interface_tests.cpp b/unit_tests/os_interface/windows/gdi_interface_tests.cpp index 099babeacf..c4c71ad38b 100644 --- a/unit_tests/os_interface/windows/gdi_interface_tests.cpp +++ b/unit_tests/os_interface/windows/gdi_interface_tests.cpp @@ -6,10 +6,10 @@ */ #if defined(_WIN32) +#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" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp index fb6b90fd64..f25c87e6c4 100644 --- a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp +++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp @@ -7,9 +7,9 @@ #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm/wddm.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "instrumentation.h" diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index 1436eaf40a..97f3c64a85 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" @@ -19,7 +20,6 @@ #include "runtime/os_interface/windows/wddm_allocation.h" #include "runtime/os_interface/windows/wddm_engine_mapper.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_gfx_partition.h" #include "unit_tests/mocks/mock_gmm_resource_info.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp index 09be906d26..8a39194035 100644 --- a/unit_tests/os_interface/windows/wddm23_tests.cpp +++ b/unit_tests/os_interface/windows/wddm23_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/memory_constants.h" @@ -13,7 +14,6 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/platform/platform.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_wddm.h" #include "unit_tests/mocks/mock_wddm_interface23.h" #include "unit_tests/os_interface/windows/gdi_dll_fixture.h" diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index 55625045c9..d0fe0f322a 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/aligned_memory.h" @@ -19,7 +20,6 @@ #include "runtime/os_interface/windows/wddm_residency_controller.h" #include "runtime/platform/platform.h" #include "runtime/utilities/tag_allocator.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/mocks/mock_deferred_deleter.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp index 6f3b11014d..67089b2b42 100644 --- a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/preemption.h" #include "runtime/helpers/hw_helper.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" using namespace NEO; diff --git a/unit_tests/platform/platform_tests.cpp b/unit_tests/platform/platform_tests.cpp index c92f238972..a51a619c5d 100644 --- a/unit_tests/platform/platform_tests.cpp +++ b/unit_tests/platform/platform_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/device/device.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" @@ -12,7 +13,6 @@ #include "runtime/sharings/sharing_factory.h" #include "unit_tests/fixtures/mock_aub_center_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/mocks/mock_async_event_handler.h" diff --git a/unit_tests/preemption/preemption_tests.cpp b/unit_tests/preemption/preemption_tests.cpp index b40b06fde4..60c286f08e 100644 --- a/unit_tests/preemption/preemption_tests.cpp +++ b/unit_tests/preemption/preemption_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/preemption.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/options.h" #include "unit_tests/fixtures/preemption_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_builtins.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/profiling/profiling_tests.cpp b/unit_tests/profiling/profiling_tests.cpp index 21f474f3a2..4286a0e4fc 100644 --- a/unit_tests/profiling/profiling_tests.cpp +++ b/unit_tests/profiling/profiling_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/enqueue_common.h" #include "runtime/command_queue/enqueue_kernel.h" @@ -18,7 +19,6 @@ #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/event/event_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_event.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index ccf4074e92..cbc20edc76 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -8,6 +8,7 @@ #include "unit_tests/program/program_tests.h" #include "core/helpers/ptr_math.h" +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "elf/reader.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/compiler_interface/compiler_options.h" @@ -28,7 +29,6 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/program_fixture.inl" #include "unit_tests/global_environment.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/scheduler/scheduler_kernel_tests.cpp b/unit_tests/scheduler/scheduler_kernel_tests.cpp index 20b6d04183..37270cd374 100644 --- a/unit_tests/scheduler/scheduler_kernel_tests.cpp +++ b/unit_tests/scheduler/scheduler_kernel_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/options.h" #include "runtime/scheduler/scheduler_kernel.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/sharings/gl/gl_sharing_tests.cpp b/unit_tests/sharings/gl/gl_sharing_tests.cpp index 3dcf30d4b5..079de47e21 100644 --- a/unit_tests/sharings/gl/gl_sharing_tests.cpp +++ b/unit_tests/sharings/gl/gl_sharing_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/device/device.h" #include "runtime/event/user_event.h" @@ -21,7 +22,6 @@ #include "runtime/sharings/gl/gl_texture.h" #include "runtime/sharings/sharing.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/gl/mock_gl_arb_sync_event.h" diff --git a/unit_tests/sharings/sharing_factory_tests.cpp b/unit_tests/sharings/sharing_factory_tests.cpp index da3f4340e3..bb777c749d 100644 --- a/unit_tests/sharings/sharing_factory_tests.cpp +++ b/unit_tests/sharings/sharing_factory_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/device.h" @@ -14,7 +15,6 @@ #include "runtime/sharings/sharing.h" #include "runtime/sharings/sharing_factory.h" #include "unit_tests/fixtures/memory_management_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_sharing_factory.h" diff --git a/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp b/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp index c40ac301c6..e670801290 100644 --- a/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp +++ b/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/sharings/va/cl_va_api.h" #include "unit_tests/api/cl_api_tests.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" using namespace NEO; diff --git a/unit_tests/sharings/va/context_va_tests.cpp b/unit_tests/sharings/va/context_va_tests.cpp index 15c62f9c75..da3039cd77 100644 --- a/unit_tests/sharings/va/context_va_tests.cpp +++ b/unit_tests/sharings/va/context_va_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/options.h" #include "runtime/sharings/va/va_sharing.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" #include "gtest/gtest.h" diff --git a/unit_tests/sharings/va/va_sharing_linux_tests.cpp b/unit_tests/sharings/va/va_sharing_linux_tests.cpp index 3181ad4be9..dc08be6b54 100644 --- a/unit_tests/sharings/va/va_sharing_linux_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_linux_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/array_count.h" #include "runtime/sharings/va/va_sharing_functions.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/sharings/va/mock_va_sharing.h" diff --git a/unit_tests/sharings/va/va_sharing_tests.cpp b/unit_tests/sharings/va/va_sharing_tests.cpp index a81a5ef856..438f7ad28e 100644 --- a/unit_tests/sharings/va/va_sharing_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" @@ -15,7 +16,6 @@ #include "runtime/sharings/va/va_sharing.h" #include "runtime/sharings/va/va_surface.h" #include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp b/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp index 1757c5da61..870af4548e 100644 --- a/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/platform/platform.h" #include "runtime/source_level_debugger/source_level_debugger.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_builtins.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_source_level_debugger.h" diff --git a/unit_tests/tbx/main_tbx.cpp b/unit_tests/tbx/main_tbx.cpp index 01e70b4cea..d39efca183 100644 --- a/unit_tests/tbx/main_tbx.cpp +++ b/unit_tests/tbx/main_tbx.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/hw_info.h" #include "unit_tests/custom_event_listener.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/gtest_helpers.h" using namespace NEO; diff --git a/unit_tests/windows/wddm_create_tests.cpp b/unit_tests/windows/wddm_create_tests.cpp index ac62e99735..a88c26755d 100644 --- a/unit_tests/windows/wddm_create_tests.cpp +++ b/unit_tests/windows/wddm_create_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/windows/wddm/wddm.h" #include "test.h" -#include "unit_tests/helpers/debug_manager_state_restore.h" #include