Remove runtime/gen_common from include paths

Change-Id: I4d1f9e64e0f4099e7903234e62b070ad4235347a Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2026-01-05 09:09:04 +08:00 · 2019-11-18 16:48:41 +01:00
parent 3e1b15c31d
commit e7ee6daaa0
79 changed files with 26 additions and 137 deletions
--- a/unit_tests/accelerators/media_image_arg_tests.cpp
+++ b/unit_tests/accelerators/media_image_arg_tests.cpp
@@ -17,8 +17,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 class MediaImageSetArgTest : public DeviceFixture,
--- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
+++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
@@ -11,11 +11,10 @@
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
+#include "runtime/gen_common/aub_mapper.h"
 #include "runtime/helpers/options.h"
 #include "test.h"

-#include "aub_mapper.h"
-
 namespace Os {
 extern const char *fileSeparator;
 }
--- a/unit_tests/built_ins/built_in_kernels_tests.cpp
+++ b/unit_tests/built_ins/built_in_kernels_tests.cpp
@@ -9,8 +9,6 @@

 #include "gtest/gtest.h"

-//#include "unit_tests/test_files/4265157215134882557.cl"
-
 namespace BuiltinKernelsSimulation {

 __kernel void CopyImage3dToBuffer16Bytes(__read_only image3d_t input,
--- a/unit_tests/command_queue/command_queue_fixture.cpp
+++ b/unit_tests/command_queue/command_queue_fixture.cpp
@@ -13,7 +13,6 @@
 #include "unit_tests/mocks/mock_device.h"

 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 namespace NEO {

--- a/unit_tests/command_queue/dispatch_walker_tests.cpp
+++ b/unit_tests/command_queue/dispatch_walker_tests.cpp
@@ -26,8 +26,6 @@
 #include "unit_tests/mocks/mock_mdi.h"
 #include "unit_tests/mocks/mock_program.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test {
--- a/unit_tests/command_queue/work_group_size_tests.cpp
+++ b/unit_tests/command_queue/work_group_size_tests.cpp
@@ -10,7 +10,6 @@
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

-#include "hw_cmds.h"
 #include "patch_shared.h"

 using namespace NEO;
--- a/unit_tests/context/context_multi_device_tests.cpp
+++ b/unit_tests/context/context_multi_device_tests.cpp
@@ -11,7 +11,6 @@
 #include "unit_tests/fixtures/device_fixture.h"

 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 using namespace NEO;

--- a/unit_tests/context/context_negative_tests.cpp
+++ b/unit_tests/context/context_negative_tests.cpp
@@ -13,7 +13,6 @@

 #include "CL/cl_gl.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 #include <memory>

--- a/unit_tests/device/gl/device_caps_gl_tests.cpp
+++ b/unit_tests/device/gl/device_caps_gl_tests.cpp
@@ -15,7 +15,6 @@
 #include "unit_tests/fixtures/device_fixture.h"

 #include "gmock/gmock.h"
-#include "hw_cmds.h"

 #include <memory>

--- a/unit_tests/device_queue/device_queue_hw_tests.cpp
+++ b/unit_tests/device_queue/device_queue_hw_tests.cpp
@@ -7,6 +7,7 @@

 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/gpgpu_walker.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/utilities/tag_allocator.h"
@@ -18,8 +19,6 @@
 #include "unit_tests/mocks/mock_device_queue.h"
 #include "unit_tests/mocks/mock_kernel.h"

-#include "hw_cmds.h"
-
 #include <memory>

 using namespace NEO;
--- a/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
+++ b/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
+++ b/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
+++ b/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
+++ b/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
+++ b/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp
+++ b/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
+++ b/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp
+++ b/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
+++ b/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp
+++ b/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <array>

 using namespace NEO;
--- a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp
+++ b/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp
@@ -5,10 +5,9 @@
 *
 */

+#include "runtime/helpers/hw_info.h"
 #include "test.h"

-#include "hw_cmds.h"
-
 #include <type_traits>

 template <uint32_t prohibitedValue>
--- a/unit_tests/helpers/hardware_commands_helper_tests.cpp
+++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp
@@ -23,8 +23,6 @@
 #include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 void HardwareCommandsTest::SetUp() {
--- a/unit_tests/helpers/unit_test_helper.h
+++ b/unit_tests/helpers/unit_test_helper.h
@@ -7,7 +7,7 @@

 #pragma once

-#include "hw_cmds.h"
+#include "runtime/gen_common/hw_cmds.h"

 namespace NEO {

--- a/unit_tests/kernel/kernel_slm_tests.cpp
+++ b/unit_tests/kernel/kernel_slm_tests.cpp
@@ -14,8 +14,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 struct KernelSLMAndBarrierTest : public DeviceFixture,
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -23,7 +23,6 @@
 #include "global_environment.h"
 #include "gmock/gmock.h"
 #include "helpers/test_files.h"
-#include "hw_cmds.h"
 #include "mock_gmm_client_context.h"

 #include <algorithm>
--- a/unit_tests/mem_obj/image1d_tests.cpp
+++ b/unit_tests/mem_obj/image1d_tests.cpp
@@ -12,8 +12,6 @@
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_context.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 static const unsigned int testImageDimensions = 32;
--- a/unit_tests/mem_obj/image2d_tests.cpp
+++ b/unit_tests/mem_obj/image2d_tests.cpp
@@ -12,8 +12,6 @@
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/mock_context.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 static const unsigned int testImageDimensions = 32;
--- a/unit_tests/mem_obj/image3d_tests.cpp
+++ b/unit_tests/mem_obj/image3d_tests.cpp
@@ -14,8 +14,6 @@
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_gmm.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 static const unsigned int testImageDimensions = 31;
--- a/unit_tests/mem_obj/image_array_size_tests.cpp
+++ b/unit_tests/mem_obj/image_array_size_tests.cpp
@@ -13,8 +13,6 @@
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/mock_context.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 static const unsigned int testImageDimensions = 17;
--- a/unit_tests/mem_obj/image_set_arg_tests.cpp
+++ b/unit_tests/mem_obj/image_set_arg_tests.cpp
@@ -25,7 +25,6 @@
 #include "unit_tests/mocks/mock_program.h"

 #include "gmock/gmock.h"
-#include "hw_cmds.h"

 using namespace NEO;
 using namespace ::testing;
--- a/unit_tests/memory_manager/surface_tests.cpp
+++ b/unit_tests/memory_manager/surface_tests.cpp
@@ -15,7 +15,6 @@
 #include "unit_tests/mocks/mock_csr.h"

 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 #include <type_traits>

--- a/unit_tests/os_interface/linux/device_command_stream_tests.cpp
+++ b/unit_tests/os_interface/linux/device_command_stream_tests.cpp
@@ -19,7 +19,6 @@
 #include "unit_tests/os_interface/linux/device_command_stream_fixture.h"

 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 #include <memory>

--- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
@@ -21,7 +21,6 @@
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 #include <iostream>
 #include <memory>
--- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
@@ -38,7 +38,6 @@
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 #include <iostream>
 #include <memory>
--- a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
+++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
@@ -12,7 +12,6 @@
 #include "runtime/device/device.h"

 #include "gtest/gtest.h"
-#include "hw_cmds.h"

 namespace NEO {

--- a/unit_tests/perf_tests/options.cpp
+++ b/unit_tests/perf_tests/options.cpp
@@ -5,11 +5,9 @@
 *
 */

+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/array_count.h"

-#include "hw_cmds.h"
-#include "hw_info.h"
-
 namespace NEO {
 // IP address for TBX server
 const char *tbxServerIp = "127.0.0.1";
--- a/unit_tests/sampler/sampler_set_arg_tests.cpp
+++ b/unit_tests/sampler/sampler_set_arg_tests.cpp
@@ -17,8 +17,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"

-#include "hw_cmds.h"
-
 using namespace NEO;

 namespace NEO {
--- a/unit_tests/scheduler/scheduler_source_tests.cpp
+++ b/unit_tests/scheduler/scheduler_source_tests.cpp
@@ -8,6 +8,7 @@
 #include "unit_tests/scheduler/scheduler_source_tests.h"

 #include "runtime/device_queue/device_queue_hw.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"
 #include "unit_tests/fixtures/execution_model_fixture.h"
@@ -15,7 +16,6 @@
 #include "unit_tests/mocks/mock_device_queue.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 "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"