From fa6b1811204724cf3d0cb9c18db852698e6ebb84 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Thu, 30 Jul 2020 15:02:11 +0200 Subject: [PATCH] do not use absolute path when including hw_cmds.h Change-Id: I59a825f25d6572f7dfb0c80211a6e3652e2827c5 Signed-off-by: Artur Harasimiuk --- level_zero/core/source/debugger/debugger_l0.inl | 5 +++-- opencl/source/device_queue/device_queue_hw.h | 3 ++- opencl/source/dll/linux/drm_neo_create.cpp | 2 +- opencl/source/gen9/linux/hw_info_config_skl.inl | 3 ++- opencl/source/gtpin/gtpin_hw_helper.h | 2 +- opencl/source/gtpin/gtpin_hw_helper.inl | 3 ++- opencl/source/mem_obj/buffer_base.inl | 2 +- opencl/source/mem_obj/image.inl | 2 +- opencl/source/os_interface/windows/device_command_stream.inl | 3 ++- .../os_interface/windows/wddm_device_command_stream.inl | 3 ++- opencl/source/program/kernel_info.cpp | 3 ++- .../unit_test/api/cl_mem_locally_uncached_resource_tests.cpp | 3 ++- .../aub_tests/gen11/aub_tests_configuration_gen11.cpp | 4 ++-- .../aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp | 4 ++-- .../aub_tests/gen8/aub_tests_configuration_gen8.cpp | 4 ++-- .../aub_tests/gen9/aub_tests_configuration_gen9.cpp | 4 ++-- opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp | 3 ++- opencl/test/unit_test/helpers/unit_test_helper.h | 3 ++- opencl/test/unit_test/igdrcl_tests_pch.h | 2 +- opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp | 2 +- .../unit_test/offline_compiler/offline_compiler_tests.cpp | 2 +- .../os_interface/windows/device_command_stream_tests.cpp | 3 ++- opencl/test/unit_test/perf_tests/options_perf_tests.cpp | 4 ++-- opencl/test/unit_test/scheduler/scheduler_source_tests.cpp | 2 +- shared/source/command_stream/command_stream_receiver_hw.h | 3 ++- shared/source/gen11/linux/direct_submission_gen11.cpp | 3 ++- shared/source/gen11/windows/direct_submission_gen11.cpp | 3 ++- shared/source/gen12lp/linux/direct_submission_gen12lp.cpp | 3 ++- shared/source/gen12lp/windows/direct_submission_gen12lp.cpp | 3 ++- shared/source/gen8/linux/direct_submission_gen8.cpp | 3 ++- shared/source/gen8/windows/direct_submission_gen8.cpp | 3 ++- shared/source/gen9/linux/direct_submission_gen9.cpp | 3 ++- shared/source/gen9/windows/direct_submission_gen9.cpp | 3 ++- shared/source/helpers/CMakeLists.txt | 2 +- shared/source/helpers/{ => definitions}/hw_cmds.h | 0 shared/source/helpers/hw_helper.h | 3 ++- shared/source/helpers/hw_info.cpp | 3 ++- shared/source/helpers/preamble_base.inl | 2 +- shared/source/helpers/state_base_address_base.inl | 3 ++- shared/source/helpers/state_compute_mode_helper.h | 3 ++- shared/source/os_interface/linux/hw_info_config.cpp | 3 ++- shared/source/os_interface/windows/hw_info_config.cpp | 3 ++- shared/test/unit_test/cmd_parse/gen_cmd_parse.h | 2 +- .../compiler_interface/compiler_interface_tests.cpp | 2 +- .../test/unit_test/encoders/test_encode_dispatch_kernel.cpp | 3 ++- shared/test/unit_test/test_macros/header/test.h | 2 +- 47 files changed, 79 insertions(+), 52 deletions(-) rename shared/source/helpers/{ => definitions}/hw_cmds.h (100%) diff --git a/level_zero/core/source/debugger/debugger_l0.inl b/level_zero/core/source/debugger/debugger_l0.inl index 74dbd78d0f..9314c7037d 100644 --- a/level_zero/core/source/debugger/debugger_l0.inl +++ b/level_zero/core/source/debugger/debugger_l0.inl @@ -7,10 +7,11 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/helpers/hw_cmds.h" #include "level_zero/core/source/debugger/debugger_l0.h" +#include "hw_cmds.h" + namespace L0 { template @@ -51,4 +52,4 @@ DebuggerL0 *DebuggerL0Hw::allocate(NEO::Device *device) { return new DebuggerL0Hw(device); } -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/opencl/source/device_queue/device_queue_hw.h b/opencl/source/device_queue/device_queue_hw.h index f2a8236dc7..b60edf0d14 100644 --- a/opencl/source/device_queue/device_queue_hw.h +++ b/opencl/source/device_queue/device_queue_hw.h @@ -7,7 +7,6 @@ #pragma once #include "shared/source/command_stream/linear_stream.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/indirect_heap/indirect_heap.h" @@ -16,6 +15,8 @@ #include "opencl/source/program/program.h" #include "opencl/source/scheduler/scheduler_kernel.h" +#include "hw_cmds.h" + namespace NEO { template diff --git a/opencl/source/dll/linux/drm_neo_create.cpp b/opencl/source/dll/linux/drm_neo_create.cpp index c03222a630..0c1ba64641 100644 --- a/opencl/source/dll/linux/drm_neo_create.cpp +++ b/opencl/source/dll/linux/drm_neo_create.cpp @@ -9,13 +9,13 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/drm_null_device.h" #include "drm/i915_drm.h" +#include "hw_cmds.h" #include #include diff --git a/opencl/source/gen9/linux/hw_info_config_skl.inl b/opencl/source/gen9/linux/hw_info_config_skl.inl index e4ecf87540..f99d9831ba 100644 --- a/opencl/source/gen9/linux/hw_info_config_skl.inl +++ b/opencl/source/gen9/linux/hw_info_config_skl.inl @@ -5,10 +5,11 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" +#include "hw_cmds.h" + namespace NEO { template <> diff --git a/opencl/source/gtpin/gtpin_hw_helper.h b/opencl/source/gtpin/gtpin_hw_helper.h index 251f187206..7ff896be0f 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.h +++ b/opencl/source/gtpin/gtpin_hw_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "shared/source/helpers/hw_cmds.h" +#include "hw_cmds.h" namespace NEO { class Kernel; diff --git a/opencl/source/gtpin/gtpin_hw_helper.inl b/opencl/source/gtpin/gtpin_hw_helper.inl index dc7935b950..a74719ef8a 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.inl +++ b/opencl/source/gtpin/gtpin_hw_helper.inl @@ -5,12 +5,13 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/string.h" #include "opencl/source/gtpin/gtpin_hw_helper.h" #include "opencl/source/kernel/kernel.h" +#include "hw_cmds.h" + namespace NEO { template diff --git a/opencl/source/mem_obj/buffer_base.inl b/opencl/source/mem_obj/buffer_base.inl index 0150f621bd..87ac674d0a 100644 --- a/opencl/source/mem_obj/buffer_base.inl +++ b/opencl/source/mem_obj/buffer_base.inl @@ -14,12 +14,12 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/bit_helpers.h" -#include "shared/source/helpers/hw_cmds.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/buffer.h" #include "buffer_ext.inl" +#include "hw_cmds.h" namespace NEO { diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl index 906fc2083b..7c0865dd65 100644 --- a/opencl/source/mem_obj/image.inl +++ b/opencl/source/mem_obj/image.inl @@ -10,11 +10,11 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/hw_cmds.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" +#include "hw_cmds.h" #include "image_ext.inl" namespace NEO { diff --git a/opencl/source/os_interface/windows/device_command_stream.inl b/opencl/source/os_interface/windows/device_command_stream.inl index ea3797fdf0..faff074215 100644 --- a/opencl/source/os_interface/windows/device_command_stream.inl +++ b/opencl/source/os_interface/windows/device_command_stream.inl @@ -10,10 +10,11 @@ #pragma warning(push) #pragma warning(disable : 4005) #include "shared/source/command_stream/device_command_stream.h" -#include "shared/source/helpers/hw_cmds.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" + +#include "hw_cmds.h" #pragma warning(pop) namespace NEO { diff --git a/opencl/source/os_interface/windows/wddm_device_command_stream.inl b/opencl/source/os_interface/windows/wddm_device_command_stream.inl index 1a2ccb7adc..cbf2b1f3ff 100644 --- a/opencl/source/os_interface/windows/wddm_device_command_stream.inl +++ b/opencl/source/os_interface/windows/wddm_device_command_stream.inl @@ -16,13 +16,14 @@ #include "shared/source/direct_submission/windows/wddm_direct_submission.h" #include "shared/source/gmm_helper/page_table_mngr.h" #include "shared/source/helpers/flush_stamp.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/os_interface/windows/wddm/wddm.h" #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" + +#include "hw_cmds.h" #pragma warning(pop) #include "shared/source/os_interface/windows/gdi_interface.h" diff --git a/opencl/source/program/kernel_info.cpp b/opencl/source/program/kernel_info.cpp index b5840f94cd..ff3804835a 100644 --- a/opencl/source/program/kernel_info.cpp +++ b/opencl/source/program/kernel_info.cpp @@ -7,7 +7,6 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/memory_manager.h" @@ -19,6 +18,8 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" +#include "hw_cmds.h" + #include #include #include diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index e8ff837cb9..eb892ce28c 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -8,7 +8,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/state_base_address.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -20,6 +19,8 @@ #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "test.h" +#include "hw_cmds.h" + using namespace NEO; namespace clMemLocallyUncachedResourceTests { diff --git a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp index 660ccf8bcb..36c19b09f7 100644 --- a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp @@ -5,10 +5,10 @@ * */ -#include "shared/source/helpers/hw_cmds.h" - #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" +#include "hw_cmds.h" + using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp index 13449533de..cfac7c5e27 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp @@ -5,10 +5,10 @@ * */ -#include "shared/source/helpers/hw_cmds.h" - #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" +#include "hw_cmds.h" + using namespace NEO; template <> diff --git a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp index d02381412f..5d2874b8d9 100644 --- a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -5,10 +5,10 @@ * */ -#include "shared/source/helpers/hw_cmds.h" - #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" +#include "hw_cmds.h" + using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp index 47ef67c452..beefd1431c 100644 --- a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -5,10 +5,10 @@ * */ -#include "shared/source/helpers/hw_cmds.h" - #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" +#include "hw_cmds.h" + using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp index ca9a010609..1433cd6c87 100644 --- a/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp +++ b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/utilities/tag_allocator.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" @@ -19,6 +18,8 @@ #include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "hw_cmds.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/helpers/unit_test_helper.h b/opencl/test/unit_test/helpers/unit_test_helper.h index 2eb156992e..eff6b87da8 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.h +++ b/opencl/test/unit_test/helpers/unit_test_helper.h @@ -7,10 +7,11 @@ #pragma once #include "shared/source/helpers/aux_translation.h" -#include "shared/source/helpers/hw_cmds.h" #include "opencl/source/helpers/properties_helper.h" +#include "hw_cmds.h" + namespace NEO { class Kernel; diff --git a/opencl/test/unit_test/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h index bfac0c13e3..2159379a69 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.h +++ b/opencl/test/unit_test/igdrcl_tests_pch.h @@ -10,7 +10,6 @@ #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/debug_helpers.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/kmd_notify_properties.h" #include "shared/source/helpers/ptr_math.h" @@ -19,6 +18,7 @@ #include "test.h" +#include "hw_cmds.h" #include "third_party/opencl_headers/CL/cl.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index 4deed776bd..56e5a859dd 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/kernel/kernel.h" @@ -22,6 +21,7 @@ #include "CL/cl.h" #include "gtest/gtest.h" +#include "hw_cmds.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index e84483f9a4..6b08fc2667 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" @@ -22,6 +21,7 @@ #include "test.h" #include "gtest/gtest.h" +#include "hw_cmds.h" using namespace NEO; diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index 4c2b5ec805..de067aba2f 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -9,7 +9,6 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/file_io.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" @@ -19,6 +18,7 @@ #include "compiler_options.h" #include "environment.h" #include "gmock/gmock.h" +#include "hw_cmds.h" #include "mock/mock_offline_compiler.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 135bdf3bf6..e880000019 100644 --- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -12,7 +12,6 @@ #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" #include "shared/source/direct_submission/windows/wddm_direct_submission.h" #include "shared/source/helpers/flush_stamp.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" @@ -50,6 +49,8 @@ #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" +#include "hw_cmds.h" + using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp index 1ccb00cfc2..789b38049c 100644 --- a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp +++ b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "shared/source/helpers/hw_cmds.h" - #include "opencl/source/helpers/array_count.h" +#include "hw_cmds.h" + namespace NEO { // IP address for TBX server const char *tbxServerIp = "127.0.0.1"; diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp index b3019e3dd1..bdf33d8374 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp @@ -7,7 +7,6 @@ #include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "opencl/source/device_queue/device_queue_hw.h" @@ -17,6 +16,7 @@ #include "test.h" #include "gtest/gtest.h" +#include "hw_cmds.h" // Keep this include after execution_model_fixture.h otherwise there is high chance of conflict with macros #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" diff --git a/shared/source/command_stream/command_stream_receiver_hw.h b/shared/source/command_stream/command_stream_receiver_hw.h index 7aaa1a2740..2591b0507a 100644 --- a/shared/source/command_stream/command_stream_receiver_hw.h +++ b/shared/source/command_stream/command_stream_receiver_hw.h @@ -12,9 +12,10 @@ #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/dirty_state_helpers.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" +#include "hw_cmds.h" + namespace NEO { template class DeviceCommandStreamReceiver; diff --git a/shared/source/gen11/linux/direct_submission_gen11.cpp b/shared/source/gen11/linux/direct_submission_gen11.cpp index 5b713b5a42..b3b29f7ebe 100644 --- a/shared/source/gen11/linux/direct_submission_gen11.cpp +++ b/shared/source/gen11/linux/direct_submission_gen11.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/linux/drm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = ICLFamily; diff --git a/shared/source/gen11/windows/direct_submission_gen11.cpp b/shared/source/gen11/windows/direct_submission_gen11.cpp index 37a8ce4c0f..9618bcd7d0 100644 --- a/shared/source/gen11/windows/direct_submission_gen11.cpp +++ b/shared/source/gen11/windows/direct_submission_gen11.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = ICLFamily; diff --git a/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp b/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp index c3ba94216a..49ddef3601 100644 --- a/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp +++ b/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/linux/drm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = TGLLPFamily; diff --git a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp index 75c251d68e..9c2306441b 100644 --- a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp +++ b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = TGLLPFamily; diff --git a/shared/source/gen8/linux/direct_submission_gen8.cpp b/shared/source/gen8/linux/direct_submission_gen8.cpp index b9b4fc1f31..e145960075 100644 --- a/shared/source/gen8/linux/direct_submission_gen8.cpp +++ b/shared/source/gen8/linux/direct_submission_gen8.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/linux/drm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = BDWFamily; diff --git a/shared/source/gen8/windows/direct_submission_gen8.cpp b/shared/source/gen8/windows/direct_submission_gen8.cpp index 9d8e8f0131..3eca676c32 100644 --- a/shared/source/gen8/windows/direct_submission_gen8.cpp +++ b/shared/source/gen8/windows/direct_submission_gen8.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = BDWFamily; diff --git a/shared/source/gen9/linux/direct_submission_gen9.cpp b/shared/source/gen9/linux/direct_submission_gen9.cpp index 1adce3534d..b9553bd325 100644 --- a/shared/source/gen9/linux/direct_submission_gen9.cpp +++ b/shared/source/gen9/linux/direct_submission_gen9.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/linux/drm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = SKLFamily; diff --git a/shared/source/gen9/windows/direct_submission_gen9.cpp b/shared/source/gen9/windows/direct_submission_gen9.cpp index dff289823a..8cd7208bc7 100644 --- a/shared/source/gen9/windows/direct_submission_gen9.cpp +++ b/shared/source/gen9/windows/direct_submission_gen9.cpp @@ -10,7 +10,8 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { using GfxFamily = SKLFamily; diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt index 51e36980e2..3325b079b7 100644 --- a/shared/source/helpers/CMakeLists.txt +++ b/shared/source/helpers/CMakeLists.txt @@ -44,7 +44,6 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/hash.h ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_base.inl @@ -84,6 +83,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/timestamp_packet_extra.cpp ${CMAKE_CURRENT_SOURCE_DIR}/vec.h + ${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/hw_cmds.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/pipe_control_args.h ) diff --git a/shared/source/helpers/hw_cmds.h b/shared/source/helpers/definitions/hw_cmds.h similarity index 100% rename from shared/source/helpers/hw_cmds.h rename to shared/source/helpers/definitions/hw_cmds.h diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 90bbef9d45..e259876b2e 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -10,12 +10,13 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/commands/bxml_generator_glue.h" #include "shared/source/helpers/aux_translation.h" -#include "shared/source/helpers/hw_cmds.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/gen_common/aub_mapper.h" #include "opencl/source/mem_obj/buffer.h" +#include "hw_cmds.h" + #include #include #include diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index f9594a280c..ba35dd3362 100644 --- a/shared/source/helpers/hw_info.cpp +++ b/shared/source/helpers/hw_info.cpp @@ -8,7 +8,8 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" #include diff --git a/shared/source/helpers/preamble_base.inl b/shared/source/helpers/preamble_base.inl index 10875c98aa..e5b007d16e 100644 --- a/shared/source/helpers/preamble_base.inl +++ b/shared/source/helpers/preamble_base.inl @@ -9,13 +9,13 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/preamble.h" #include "shared/source/helpers/register_offsets.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "hw_cmds.h" #include "reg_configs_common.h" #include diff --git a/shared/source/helpers/state_base_address_base.inl b/shared/source/helpers/state_base_address_base.inl index ecf4041864..7ef0685602 100644 --- a/shared/source/helpers/state_base_address_base.inl +++ b/shared/source/helpers/state_base_address_base.inl @@ -8,10 +8,11 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/constants.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/state_base_address.h" #include "shared/source/indirect_heap/indirect_heap.h" +#include "hw_cmds.h" + namespace NEO { template void StateBaseAddressHelper::programStateBaseAddress( diff --git a/shared/source/helpers/state_compute_mode_helper.h b/shared/source/helpers/state_compute_mode_helper.h index 427e40bed4..bcb2af2424 100644 --- a/shared/source/helpers/state_compute_mode_helper.h +++ b/shared/source/helpers/state_compute_mode_helper.h @@ -7,7 +7,8 @@ #pragma once #include "shared/source/command_stream/csr_definitions.h" -#include "shared/source/helpers/hw_cmds.h" + +#include "hw_cmds.h" namespace NEO { template diff --git a/shared/source/os_interface/linux/hw_info_config.cpp b/shared/source/os_interface/linux/hw_info_config.cpp index ad69cfecb7..9824f4d305 100644 --- a/shared/source/os_interface/linux/hw_info_config.cpp +++ b/shared/source/os_interface/linux/hw_info_config.cpp @@ -10,13 +10,14 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/constants.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" #include "shared/source/utilities/cpu_info.h" +#include "hw_cmds.h" + #include namespace NEO { diff --git a/shared/source/os_interface/windows/hw_info_config.cpp b/shared/source/os_interface/windows/hw_info_config.cpp index f93aa4e638..c91798b8ba 100644 --- a/shared/source/os_interface/windows/hw_info_config.cpp +++ b/shared/source/os_interface/windows/hw_info_config.cpp @@ -10,10 +10,11 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/constants.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" +#include "hw_cmds.h" + namespace NEO { HwInfoConfig *hwInfoConfigFactory[IGFX_MAX_PRODUCT] = {}; diff --git a/shared/test/unit_test/cmd_parse/gen_cmd_parse.h b/shared/test/unit_test/cmd_parse/gen_cmd_parse.h index 9646138c43..26f1263469 100644 --- a/shared/test/unit_test/cmd_parse/gen_cmd_parse.h +++ b/shared/test/unit_test/cmd_parse/gen_cmd_parse.h @@ -6,7 +6,7 @@ */ #pragma once -#include "shared/source/helpers/hw_cmds.h" +#include "hw_cmds.h" #include #include diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 2f2ffdd5cd..ca6add64dd 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -8,7 +8,6 @@ #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/compiler_interface/compiler_interface.inl" #include "shared/source/helpers/file_io.h" -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/test_files.h" @@ -20,6 +19,7 @@ #include "opencl/test/unit_test/mocks/mock_compilers.h" #include "gmock/gmock.h" +#include "hw_cmds.h" #include diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp index d527838e13..d4bd1bd8a1 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/kernel/kernel_descriptor.h" @@ -21,6 +20,8 @@ #include "opencl/test/unit_test/gen_common/matchers.h" #include "test.h" +#include "hw_cmds.h" + using namespace NEO; using CommandEncodeStatesTest = Test; diff --git a/shared/test/unit_test/test_macros/header/test.h b/shared/test/unit_test/test_macros/header/test.h index ec08d7688d..700b004d27 100644 --- a/shared/test/unit_test/test_macros/header/test.h +++ b/shared/test/unit_test/test_macros/header/test.h @@ -6,10 +6,10 @@ */ #pragma once -#include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" #include "gtest/gtest.h" +#include "hw_cmds.h" #include "igfxfmid.h" #include "test_mode.h"