From b31e25dbb6c126639e7f7afdb7f9a271cf94f00b Mon Sep 17 00:00:00 2001 From: Zbigniew Zdanowicz Date: Fri, 15 Nov 2019 16:20:45 +0100 Subject: [PATCH] Move PreemptionHelper class to core Change-Id: I172c4beb8ea2576505d6192585d45cfa3d00da34 Signed-off-by: Zbigniew Zdanowicz --- core/command_stream/CMakeLists.txt | 3 +++ {runtime => core}/command_stream/preemption.cpp | 2 +- {runtime => core}/command_stream/preemption.h | 0 {runtime => core}/command_stream/preemption.inl | 2 +- {runtime => core}/gen11/preemption_gen11.cpp | 4 ++-- {runtime => core}/gen12lp/preemption_gen12lp.cpp | 5 ++--- {runtime => core}/gen8/preemption_gen8.cpp | 4 ++-- {runtime => core}/gen9/preemption_gen9.cpp | 4 ++-- core/helpers/preamble_base.inl | 2 +- core/unit_tests/gen11/test_preamble_gen11.cpp | 2 +- core/unit_tests/gen12lp/test_preamble_gen12lp.cpp | 2 +- core/unit_tests/gen9/skl/test_preamble_skl.cpp | 2 +- core/unit_tests/preamble/preamble_tests.cpp | 2 +- .../source_level_debugger_preamble_test.h | 2 +- runtime/command_queue/command_queue_hw.h | 2 +- runtime/command_queue/gpgpu_walker.h | 2 +- runtime/command_stream/CMakeLists.txt | 3 --- runtime/command_stream/command_stream_receiver.cpp | 2 +- .../command_stream_receiver_hw_base.inl | 2 +- runtime/device/device.cpp | 2 +- runtime/enable_gens.cmake | 12 ++++++++---- runtime/helpers/hardware_commands_helper.inl | 2 +- runtime/os_interface/linux/hw_info_config.cpp | 2 +- runtime/os_interface/windows/hw_info_config.cpp | 2 +- runtime/os_interface/windows/wddm/wddm.cpp | 2 +- .../windows/wddm_device_command_stream.inl | 2 +- ...ommand_stream_receiver_flush_task_gmock_tests.cpp | 2 +- .../command_stream_receiver_hw_tests.cpp | 2 +- .../command_stream/command_stream_receiver_tests.cpp | 2 +- .../command_stream_receiver_with_aub_dump_tests.cpp | 2 +- .../execution_environment_tests.cpp | 2 +- unit_tests/fixtures/memory_allocator_fixture.h | 2 +- unit_tests/fixtures/memory_manager_fixture.cpp | 2 +- unit_tests/fixtures/preemption_fixture.cpp | 2 +- .../fixtures/ult_command_stream_receiver_fixture.h | 2 +- unit_tests/gen8/test_preemption_gen8.cpp | 2 +- unit_tests/gen9/test_preemption_gen9.cpp | 2 +- unit_tests/memory_manager/memory_manager_tests.cpp | 2 +- unit_tests/memory_manager/surface_tests.cpp | 2 +- unit_tests/mocks/mock_aub_csr.h | 2 +- unit_tests/mocks/mock_tbx_csr.h | 2 +- .../os_interface/linux/drm_command_stream_fixture.h | 2 +- .../os_interface/linux/drm_command_stream_tests.cpp | 2 +- .../os_interface/linux/drm_memory_manager_tests.cpp | 2 +- .../os_interface/linux/os_interface_linux_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 2 +- .../os_interface/windows/driver_info_tests.cpp | 2 +- unit_tests/os_interface/windows/wddm23_tests.cpp | 2 +- .../windows/wddm_address_space_tests.cpp | 2 +- unit_tests/os_interface/windows/wddm_fixture.h | 2 +- .../windows/wddm_kmdaf_listener_tests.cpp | 2 +- .../os_interface/windows/wddm_preemption_tests.cpp | 2 +- .../windows/wddm_residency_controller_tests.cpp | 2 +- unit_tests/preemption/preemption_tests.cpp | 2 +- 54 files changed, 65 insertions(+), 62 deletions(-) rename {runtime => core}/command_stream/preemption.cpp (98%) rename {runtime => core}/command_stream/preemption.h (100%) rename {runtime => core}/command_stream/preemption.inl (99%) rename {runtime => core}/gen11/preemption_gen11.cpp (95%) rename {runtime => core}/gen12lp/preemption_gen12lp.cpp (93%) rename {runtime => core}/gen8/preemption_gen8.cpp (96%) rename {runtime => core}/gen9/preemption_gen9.cpp (94%) diff --git a/core/command_stream/CMakeLists.txt b/core/command_stream/CMakeLists.txt index b7da9e0741..a515862345 100644 --- a/core/command_stream/CMakeLists.txt +++ b/core/command_stream/CMakeLists.txt @@ -9,6 +9,9 @@ set(NEO_CORE_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/preemption_mode.h + ${CMAKE_CURRENT_SOURCE_DIR}/preemption.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/preemption.h + ${CMAKE_CURRENT_SOURCE_DIR}/preemption.inl ) set_property(GLOBAL PROPERTY NEO_CORE_COMMAND_STREAM ${NEO_CORE_COMMAND_STREAM}) diff --git a/runtime/command_stream/preemption.cpp b/core/command_stream/preemption.cpp similarity index 98% rename from runtime/command_stream/preemption.cpp rename to core/command_stream/preemption.cpp index a9a31021f8..5e3008a731 100644 --- a/runtime/command_stream/preemption.cpp +++ b/core/command_stream/preemption.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/command_stream/preemption.h" +#include "core/command_stream/preemption.h" #include "core/helpers/string.h" #include "runtime/built_ins/built_ins.h" diff --git a/runtime/command_stream/preemption.h b/core/command_stream/preemption.h similarity index 100% rename from runtime/command_stream/preemption.h rename to core/command_stream/preemption.h diff --git a/runtime/command_stream/preemption.inl b/core/command_stream/preemption.inl similarity index 99% rename from runtime/command_stream/preemption.inl rename to core/command_stream/preemption.inl index 106b75af89..2c1db01118 100644 --- a/runtime/command_stream/preemption.inl +++ b/core/command_stream/preemption.inl @@ -5,12 +5,12 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/sip.h" #include "runtime/command_queue/gpgpu_walker.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device/device.h" namespace NEO { diff --git a/runtime/gen11/preemption_gen11.cpp b/core/gen11/preemption_gen11.cpp similarity index 95% rename from runtime/gen11/preemption_gen11.cpp rename to core/gen11/preemption_gen11.cpp index d25f9aec41..083d2ef513 100644 --- a/runtime/gen11/preemption_gen11.cpp +++ b/core/gen11/preemption_gen11.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" +#include "core/command_stream/preemption.inl" #include "core/memory_manager/graphics_allocation.h" -#include "runtime/command_stream/preemption.h" -#include "runtime/command_stream/preemption.inl" namespace NEO { diff --git a/runtime/gen12lp/preemption_gen12lp.cpp b/core/gen12lp/preemption_gen12lp.cpp similarity index 93% rename from runtime/gen12lp/preemption_gen12lp.cpp rename to core/gen12lp/preemption_gen12lp.cpp index 91674328d1..2aa85ba266 100644 --- a/runtime/gen12lp/preemption_gen12lp.cpp +++ b/core/gen12lp/preemption_gen12lp.cpp @@ -5,9 +5,8 @@ * */ -#include "runtime/command_stream/preemption.h" -#include "runtime/command_stream/preemption.inl" -#include "runtime/gen12lp/hw_cmds.h" +#include "core/command_stream/preemption.h" +#include "core/command_stream/preemption.inl" namespace NEO { diff --git a/runtime/gen8/preemption_gen8.cpp b/core/gen8/preemption_gen8.cpp similarity index 96% rename from runtime/gen8/preemption_gen8.cpp rename to core/gen8/preemption_gen8.cpp index 3565275395..f4ef85ae16 100644 --- a/runtime/gen8/preemption_gen8.cpp +++ b/core/gen8/preemption_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "runtime/command_stream/preemption.h" -#include "runtime/command_stream/preemption.inl" +#include "core/command_stream/preemption.h" +#include "core/command_stream/preemption.inl" namespace NEO { diff --git a/runtime/gen9/preemption_gen9.cpp b/core/gen9/preemption_gen9.cpp similarity index 94% rename from runtime/gen9/preemption_gen9.cpp rename to core/gen9/preemption_gen9.cpp index bae5e5f5c9..ede34b03e3 100644 --- a/runtime/gen9/preemption_gen9.cpp +++ b/core/gen9/preemption_gen9.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" +#include "core/command_stream/preemption.inl" #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/csr_definitions.h" -#include "runtime/command_stream/preemption.h" -#include "runtime/command_stream/preemption.inl" #include diff --git a/core/helpers/preamble_base.inl b/core/helpers/preamble_base.inl index ed16c3a2af..a71939bb2e 100644 --- a/core/helpers/preamble_base.inl +++ b/core/helpers/preamble_base.inl @@ -6,9 +6,9 @@ */ #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/preamble.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device/device.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/kernel/kernel.h" diff --git a/core/unit_tests/gen11/test_preamble_gen11.cpp b/core/unit_tests/gen11/test_preamble_gen11.cpp index 0b1764d787..2b0d8dfc5f 100644 --- a/core/unit_tests/gen11/test_preamble_gen11.cpp +++ b/core/unit_tests/gen11/test_preamble_gen11.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/preamble/preamble_fixture.h" -#include "runtime/command_stream/preemption.h" #include "reg_configs_common.h" diff --git a/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp b/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp index 690d35f547..33af2377a0 100644 --- a/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp +++ b/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/preamble/preamble_fixture.h" -#include "runtime/command_stream/preemption.h" #include "reg_configs_common.h" diff --git a/core/unit_tests/gen9/skl/test_preamble_skl.cpp b/core/unit_tests/gen9/skl/test_preamble_skl.cpp index aadb4cffa5..2bbdb444ad 100644 --- a/core/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/core/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/preamble.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/preamble/preamble_fixture.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/thread_arbitration_policy.h" #include "runtime/gen9/reg_configs.h" #include "unit_tests/gen_common/gen_cmd_parse.h" diff --git a/core/unit_tests/preamble/preamble_tests.cpp b/core/unit_tests/preamble/preamble_tests.cpp index 1dc9498e63..1cbaca8df8 100644 --- a/core/unit_tests/preamble/preamble_tests.cpp +++ b/core/unit_tests/preamble/preamble_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/preamble.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/utilities/stackvec.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gen11/reg_configs.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "test.h" diff --git a/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h index dedac363e1..671127d944 100644 --- a/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h +++ b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/command_stream/preemption.h" #include "core/helpers/preamble.h" #include "runtime/built_ins/built_ins.h" -#include "runtime/command_stream/preemption.h" #include "test.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device.h" diff --git a/runtime/command_queue/command_queue_hw.h b/runtime/command_queue/command_queue_hw.h index 26317a8e5f..f15830b861 100644 --- a/runtime/command_queue/command_queue_hw.h +++ b/runtime/command_queue/command_queue_hw.h @@ -6,12 +6,12 @@ */ #pragma once +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/engine_control.h" diff --git a/runtime/command_queue/gpgpu_walker.h b/runtime/command_queue/gpgpu_walker.h index 780a5e1fc5..92d6356eb3 100644 --- a/runtime/command_queue/gpgpu_walker.h +++ b/runtime/command_queue/gpgpu_walker.h @@ -8,11 +8,11 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/register_offsets.h" #include "core/helpers/vec.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue.h" -#include "runtime/command_stream/preemption.h" #include "runtime/context/context.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/event/hw_timestamps.h" diff --git a/runtime/command_stream/CMakeLists.txt b/runtime/command_stream/CMakeLists.txt index 4139ac8e97..bc6c01e63e 100644 --- a/runtime/command_stream/CMakeLists.txt +++ b/runtime/command_stream/CMakeLists.txt @@ -34,9 +34,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.inl ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/preemption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/preemption.h - ${CMAKE_CURRENT_SOURCE_DIR}/preemption.inl ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.cpp ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.h ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.cpp diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp index 89af07db96..8af668879c 100644 --- a/runtime/command_stream/command_stream_receiver.cpp +++ b/runtime/command_stream/command_stream_receiver.cpp @@ -7,11 +7,11 @@ #include "runtime/command_stream/command_stream_receiver.h" +#include "core/command_stream/preemption.h" #include "core/helpers/string.h" #include "runtime/aub_mem_dump/aub_services.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/experimental_command_buffer.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/context/context.h" #include "runtime/device/device.h" diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl index 4ce95e2669..b29be5e47b 100644 --- a/runtime/command_stream/command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_hw_base.inl @@ -6,13 +6,13 @@ */ #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/command_stream/experimental_command_buffer.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/scratch_space_controller_base.h" #include "runtime/device/device.h" #include "runtime/event/event.h" diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp index ebdad035e6..cc61f22c7b 100644 --- a/runtime/device/device.cpp +++ b/runtime/device/device.cpp @@ -7,10 +7,10 @@ #include "runtime/device/device.h" +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/experimental_command_buffer.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device/device_vector.h" #include "runtime/device/driver_info.h" #include "runtime/execution_environment/execution_environment.h" diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index 966abcdb3e..4079458c55 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -32,12 +32,16 @@ set(RUNTIME_SRCS_GENX_CPP_BASE hw_helper hw_info image - preemption sampler state_base_address tbx_command_stream_receiver ) +set(CORE_RUNTIME_SRCS_GENX_CPP_BASE + preamble + preemption +) + macro(macro_for_each_platform) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) @@ -69,9 +73,6 @@ macro(macro_for_each_gen) if(EXISTS "${CORE_GENX_PREFIX}/hw_cmds_generated.inl") list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${CORE_GENX_PREFIX}/hw_cmds_generated.inl") endif() - if(EXISTS "${CORE_GENX_PREFIX}/preamble_${GEN_TYPE_LOWER}.cpp") - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${CORE_GENX_PREFIX}/preamble_${GEN_TYPE_LOWER}.cpp") - endif() if(EXISTS "${CORE_GENX_PREFIX}/hw_cmds_generated_patched.inl") list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${CORE_GENX_PREFIX}/hw_cmds_generated_patched.inl") endif() @@ -97,6 +98,9 @@ macro(macro_for_each_gen) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) endforeach() endforeach() + foreach(SRC_IT ${CORE_RUNTIME_SRCS_GENX_CPP_BASE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${CORE_GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) + endforeach() apply_macro_for_each_platform() diff --git a/runtime/helpers/hardware_commands_helper.inl b/runtime/helpers/hardware_commands_helper.inl index 1507aa1e08..b28a3ead92 100644 --- a/runtime/helpers/hardware_commands_helper.inl +++ b/runtime/helpers/hardware_commands_helper.inl @@ -5,13 +5,13 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/command_queue/local_id_gen.h" #include "runtime/command_stream/csr_definitions.h" -#include "runtime/command_stream/preemption.h" #include "runtime/helpers/address_patch.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/indirect_heap/indirect_heap.h" diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp index 17b994f4cf..ffc87d7f53 100644 --- a/runtime/os_interface/linux/hw_info_config.cpp +++ b/runtime/os_interface/linux/hw_info_config.cpp @@ -7,10 +7,10 @@ #include "runtime/os_interface/hw_info_config.h" +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" #include "core/utilities/cpu_info.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/runtime/os_interface/windows/hw_info_config.cpp b/runtime/os_interface/windows/hw_info_config.cpp index 54864c18a9..67bbddbe86 100644 --- a/runtime/os_interface/windows/hw_info_config.cpp +++ b/runtime/os_interface/windows/hw_info_config.cpp @@ -7,9 +7,9 @@ #include "runtime/os_interface/hw_info_config.h" +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 3d15385c3a..bb8d4afe19 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -7,10 +7,10 @@ #include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/command_stream/preemption.h" #include "core/helpers/interlocked_max.h" #include "core/os_interface/windows/debug_registry_reader.h" #include "core/utilities/stackvec.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index c61c321386..13f9b7d2ab 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -10,8 +10,8 @@ #pragma warning(push) #pragma warning(disable : 4005) #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/ptr_math.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/gmm_callbacks.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 ea9155c562..3d62c4ce91 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/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" @@ -16,7 +17,6 @@ #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/event/user_event.h" #include "runtime/helpers/cache_policy.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 2636874630..d90cc7feb3 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/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" @@ -18,7 +19,6 @@ #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/command_stream/scratch_space_controller_base.h" #include "runtime/event/user_event.h" diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index db562c8e28..d56c3f9f87 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -6,11 +6,11 @@ */ #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/memory_manager/graphics_allocation.h" #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/preemption.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 684253d206..2205b9fa5c 100644 --- a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/dispatch_info.h" diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/unit_tests/execution_environment/execution_environment_tests.cpp index 8f2ff9c161..0574839856 100644 --- a/unit_tests/execution_environment/execution_environment_tests.cpp +++ b/unit_tests/execution_environment/execution_environment_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/command_stream/preemption.h" #include "core/compiler_interface/compiler_interface.h" #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/destructor_counted.h" #include "runtime/aub/aub_center.h" #include "runtime/built_ins/built_ins.h" -#include "runtime/command_stream/preemption.h" #include "runtime/device/device.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm_helper.h" diff --git a/unit_tests/fixtures/memory_allocator_fixture.h b/unit_tests/fixtures/memory_allocator_fixture.h index 2f5069e121..b2fd735189 100644 --- a/unit_tests/fixtures/memory_allocator_fixture.h +++ b/unit_tests/fixtures/memory_allocator_fixture.h @@ -7,8 +7,8 @@ #pragma once +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "unit_tests/fixtures/memory_management_fixture.h" diff --git a/unit_tests/fixtures/memory_manager_fixture.cpp b/unit_tests/fixtures/memory_manager_fixture.cpp index ac5d07d9ff..6362da663f 100644 --- a/unit_tests/fixtures/memory_manager_fixture.cpp +++ b/unit_tests/fixtures/memory_manager_fixture.cpp @@ -7,8 +7,8 @@ #include "unit_tests/fixtures/memory_manager_fixture.h" +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" -#include "runtime/command_stream/preemption.h" #include "runtime/os_interface/os_context.h" #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/fixtures/preemption_fixture.cpp b/unit_tests/fixtures/preemption_fixture.cpp index d822240252..ada357a6d0 100644 --- a/unit_tests/fixtures/preemption_fixture.cpp +++ b/unit_tests/fixtures/preemption_fixture.cpp @@ -7,10 +7,10 @@ #include "unit_tests/fixtures/preemption_fixture.h" +#include "core/command_stream/preemption.h" #include "runtime/command_queue/enqueue_common.h" #include "runtime/command_queue/enqueue_kernel.h" #include "runtime/command_queue/enqueue_marker.h" -#include "runtime/command_stream/preemption.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hw_info.h" #include "runtime/scheduler/scheduler_kernel.h" diff --git a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h index bf474970b7..c5e5efc171 100644 --- a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h +++ b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h @@ -7,9 +7,9 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/cache_policy.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/gen8/test_preemption_gen8.cpp b/unit_tests/gen8/test_preemption_gen8.cpp index b458e7c4b0..7fe81506af 100644 --- a/unit_tests/gen8/test_preemption_gen8.cpp +++ b/unit_tests/gen8/test_preemption_gen8.cpp @@ -5,8 +5,8 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" -#include "runtime/command_stream/preemption.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/fixtures/preemption_fixture.h" diff --git a/unit_tests/gen9/test_preemption_gen9.cpp b/unit_tests/gen9/test_preemption_gen9.cpp index 2eb5928be9..29014cb8a4 100644 --- a/unit_tests/gen9/test_preemption_gen9.cpp +++ b/unit_tests/gen9/test_preemption_gen9.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "runtime/built_ins/built_ins.h" -#include "runtime/command_stream/preemption.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/preemption_fixture.h" #include "unit_tests/helpers/hw_parse.h" diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index c148572512..b7c09b39ba 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/memory_manager/memory_constants.h" #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" #include "runtime/helpers/dispatch_info.h" diff --git a/unit_tests/memory_manager/surface_tests.cpp b/unit_tests/memory_manager/surface_tests.cpp index fe07d59be2..387865df04 100644 --- a/unit_tests/memory_manager/surface_tests.cpp +++ b/unit_tests/memory_manager/surface_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" -#include "runtime/command_stream/preemption.h" #include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" #include "test.h" diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h index 5c8a90f45f..d60c092108 100644 --- a/unit_tests/mocks/mock_aub_csr.h +++ b/unit_tests/mocks/mock_aub_csr.h @@ -7,8 +7,8 @@ #pragma once +#include "core/command_stream/preemption.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/hw_info.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h index 88f1808f10..db157b6aba 100644 --- a/unit_tests/mocks/mock_tbx_csr.h +++ b/unit_tests/mocks/mock_tbx_csr.h @@ -7,8 +7,8 @@ #pragma once +#include "core/command_stream/preemption.h" #include "runtime/aub/aub_center.h" -#include "runtime/command_stream/preemption.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/hw_info.h" diff --git a/unit_tests/os_interface/linux/drm_command_stream_fixture.h b/unit_tests/os_interface/linux/drm_command_stream_fixture.h index 542d2433b9..4bf6ab152b 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_fixture.h +++ b/unit_tests/os_interface/linux/drm_command_stream_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/command_stream/preemption.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/command_stream/preemption.h" #include "runtime/os_interface/linux/drm_command_stream.h" #include "runtime/os_interface/linux/os_context_linux.h" #include "runtime/os_interface/linux/os_interface.h" 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 ce34966828..1866d94f6a 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/command_stream/preemption.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/memory_properties_flags_helpers.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 d4c764192f..d273d4fc84 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -8,13 +8,13 @@ #include "drm_memory_manager_tests.h" #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/host_ptr_manager.h" #include "core/memory_manager/memory_constants.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/command_stream/preemption.h" #include "runtime/event/event.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/timestamp_packet.h" diff --git a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp index 6722a7a7ea..2674a02a4c 100644 --- a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp +++ b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" -#include "runtime/command_stream/preemption.h" #include "runtime/os_interface/linux/os_context_linux.h" #include "runtime/os_interface/linux/os_interface.h" #include "unit_tests/os_interface/linux/drm_mock.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 fe4a4b45d6..be7bd6a456 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/command_stream/linear_stream.h" +#include "core/command_stream/preemption.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.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/command_stream/preemption.h" #include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/built_ins_helper.h" #include "runtime/helpers/flush_stamp.h" diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/unit_tests/os_interface/windows/driver_info_tests.cpp index d4f4fd5efc..3aa5f23985 100644 --- a/unit_tests/os_interface/windows/driver_info_tests.cpp +++ b/unit_tests/os_interface/windows/driver_info_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/command_stream/preemption.h" #include "core/os_interface/windows/debug_registry_reader.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp index ac8844ffcd..0e7aee2806 100644 --- a/unit_tests/os_interface/windows/wddm23_tests.cpp +++ b/unit_tests/os_interface/windows/wddm23_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/command_stream/preemption.h" #include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" diff --git a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp b/unit_tests/os_interface/windows/wddm_address_space_tests.cpp index c051e0b942..2b20fb01bb 100644 --- a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_address_space_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/command_stream/preemption.h" +#include "core/command_stream/preemption.h" #include "runtime/helpers/options.h" #include "test.h" #include "unit_tests/mocks/mock_wddm.h" diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h index b003ad7354..798e727fac 100644 --- a/unit_tests/os_interface/windows/wddm_fixture.h +++ b/unit_tests/os_interface/windows/wddm_fixture.h @@ -7,8 +7,8 @@ #pragma once +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp index b74a05e069..d3565b7c9c 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/command_stream/preemption.h" +#include "core/command_stream/preemption.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp index cb23819bb3..ed2ac663b4 100644 --- a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/command_stream/preemption.h" #include "test.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" diff --git a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp index 94bdee9a2e..c2eb47a6dd 100644 --- a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_operations_handler.h" -#include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/os_interface.h" diff --git a/unit_tests/preemption/preemption_tests.cpp b/unit_tests/preemption/preemption_tests.cpp index ae2a060255..542cb57a31 100644 --- a/unit_tests/preemption/preemption_tests.cpp +++ b/unit_tests/preemption/preemption_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #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/options.h" #include "unit_tests/fixtures/preemption_fixture.h"