hw_cmds.h usage cleanup

ArturHarasimiuk · Compute-Runtime-Automation · commit a8e2bd3f988e · 2022-06-29T11:15:45.000+02:00
Signed-off-by: Artur Harasimiuk &lt;artur.harasimiuk@intel.com&gt;
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp
@@ -17,9 +17,6 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h"
 
-#include "device_ids_configs.h"
-#include "hw_cmds.h"
-
 namespace NEO {
 namespace SysCalls {
 extern int closeFuncRetVal;
diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp
@@ -11,8 +11,6 @@
 #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 
-#include "hw_cmds.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: 8aa8d8b4472d232ef103712de522f63e2ef4c648
+    revision: bc1736dc68a889190ea1503c86447ee7775769b5
     type: git
   internal:
     branch: master
diff --git a/opencl/source/mem_obj/buffer_base.inl b/opencl/source/mem_obj/buffer_base.inl
@@ -8,28 +8,19 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/device/device.h"
-#include "shared/source/execution_environment/execution_environment.h"
-#include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm.h"
-#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/bit_helpers.h"
 #include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/mem_obj/buffer.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 union SURFACE_STATE_BUFFER_LENGTH {
     uint32_t Length;
     struct SurfaceState {
-        uint32_t Width : BITFIELD_RANGE(0, 6);
-        uint32_t Height : BITFIELD_RANGE(7, 20);
-        uint32_t Depth : BITFIELD_RANGE(21, 31);
+        uint32_t Width : 7;
+        uint32_t Height : 14;
+        uint32_t Depth : 11;
     } SurfaceState;
 };
 
diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl
@@ -17,7 +17,6 @@
 #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/xe_hp_core/gpgpu_walker_xe_hp_core.cpp b/opencl/source/xe_hp_core/gpgpu_walker_xe_hp_core.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hp_core/hw_cmds.h"
+
 #include "opencl/source/command_queue/gpgpu_walker_xehp_and_later.inl"
 #include "opencl/source/command_queue/hardware_interface_xehp_and_later.inl"
 
diff --git a/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds.h"
+
 #include "opencl/source/command_queue/gpgpu_walker_xehp_and_later.inl"
 #include "opencl/source/command_queue/hardware_interface_xehp_and_later.inl"
 
diff --git a/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpg_core/hw_cmds.h"
+
 #include "opencl/source/command_queue/gpgpu_walker_xehp_and_later.inl"
 #include "opencl/source/command_queue/hardware_interface_xehp_and_later.inl"
 
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
@@ -20,8 +20,6 @@
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 namespace clMemLocallyUncachedResourceTests {
diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp
@@ -24,7 +24,6 @@
 
 #include "CL/cl.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <memory>
 
diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp
@@ -21,7 +21,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.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
@@ -26,7 +26,6 @@
 #include "compiler_options.h"
 #include "environment.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_multi_command.h"
 #include "mock/mock_offline_compiler.h"
diff --git a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp
@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #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/shared/source/command_container/command_encoder_raytracing_xehp_and_later.inl b/shared/source/command_container/command_encoder_raytracing_xehp_and_later.inl
@@ -8,8 +8,6 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/hw_info.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/helpers/cache_flush_xehp_and_later.inl b/shared/source/helpers/cache_flush_xehp_and_later.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,8 +9,6 @@
 #include "shared/source/helpers/l3_range.h"
 #include "shared/source/utilities/range.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp
@@ -11,8 +11,6 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/hw_helper.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 
 namespace NEO {
diff --git a/shared/source/os_interface/linux/hw_info_config_drm.cpp b/shared/source/os_interface/linux/hw_info_config_drm.cpp
@@ -16,8 +16,6 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/utilities/cpu_info.h"
 
-#include "hw_cmds.h"
-
 #include <cstring>
 
 namespace NEO {
diff --git a/shared/test/common/helpers/unit_test_helper.inl b/shared/test/common/helpers/unit_test_helper.inl
@@ -7,8 +7,6 @@
 
 #include "shared/source/helpers/hw_info.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
@@ -21,7 +21,6 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <memory>
 
diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -22,8 +22,6 @@
 #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
 #include "shared/test/unit_test/helpers/gtest_helpers.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 using CommandEncodeStatesTest = Test<CommandEncodeStatesFixture>;
diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp
@@ -15,7 +15,6 @@
 #include "shared/test/common/mocks/mock_dispatch_kernel_encoder_interface.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds.h"
 #include "test_traits_common.h"
 
 using namespace NEO;
diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp
@@ -15,8 +15,6 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 using CommandEncodeStatesTestPvcAndLater = Test<CommandEncodeStatesFixture>;
diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp
@@ -23,8 +23,6 @@
 #include "shared/test/common/mocks/mock_dispatch_kernel_encoder_interface.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds.h"
-
 #include <memory>
 
 using namespace NEO;

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2021 Intel Corporation`
	`2`	`+ * Copyright (C) 2021-2022 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include "shared/source/xe_hp_core/hw_cmds.h"`
	`9`	`+`
`8`	`10`	`#include "opencl/source/command_queue/gpgpu_walker_xehp_and_later.inl"`
`9`	`11`	`#include "opencl/source/command_queue/hardware_interface_xehp_and_later.inl"`
`10`	`12`