From a8e2bd3f988ec3599f94efabf119bc500ee02163 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Tue, 28 Jun 2022 22:23:39 +0000 Subject: [PATCH] hw_cmds.h usage cleanup Signed-off-by: Artur Harasimiuk --- .../test_metric_ip_sampling_linux_pvc_prelim.cpp | 3 --- ...test_metric_ip_sampling_linux_pvc_upstream.cpp | 2 -- manifests/manifest.yml | 2 +- opencl/source/mem_obj/buffer_base.inl | 15 +++------------ opencl/source/mem_obj/image.inl | 1 - .../source/xe_hp_core/gpgpu_walker_xe_hp_core.cpp | 4 +++- .../xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp | 4 +++- .../xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp | 4 +++- .../cl_mem_locally_uncached_resource_tests.cpp | 2 -- .../unit_test/kernel/kernel_arg_buffer_tests.cpp | 1 - .../unit_test/kernel/kernel_image_arg_tests.cpp | 1 - .../offline_compiler/offline_compiler_tests.cpp | 1 - .../unit_test/perf_tests/options_perf_tests.cpp | 4 +--- .../command_encoder_raytracing_xehp_and_later.inl | 2 -- .../source/helpers/cache_flush_xehp_and_later.inl | 4 +--- shared/source/helpers/hw_info.cpp | 2 -- .../os_interface/linux/hw_info_config_drm.cpp | 2 -- shared/test/common/helpers/unit_test_helper.inl | 2 -- .../compiler_interface_tests.cpp | 1 - .../encoders/test_encode_dispatch_kernel.cpp | 2 -- .../test_encode_dispatch_kernel_dg2_and_later.cpp | 1 - .../test_encode_dispatch_kernel_pvc_and_later.cpp | 2 -- ...test_encode_dispatch_kernel_xehp_and_later.cpp | 2 -- 23 files changed, 15 insertions(+), 49 deletions(-) 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 index d7ea250041..fa05461793 100644 --- 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 index 5efce6bc05..80476f1130 100644 --- 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 index 221a1c6a1a..087607baf7 100644 --- 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 index eb8f43b540..a448dc28f1 100644 --- 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 index ed75718941..0854b050c5 100644 --- 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 index 096316f920..871f8475d2 100644 --- 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 index 624e6cfeae..6fc6d481e6 100644 --- 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 index 8b781c0fd5..88ee2b95db 100644 --- 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 index c660098a9a..1dce839226 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 @@ -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 index 04629032a9..871520182b 100644 --- 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 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 b42df78da8..8a4e554288 100644 --- 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 index 726a9d52f1..34c5444414 100644 --- 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 index d2880d9442..b551b6f5b6 100644 --- a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp +++ b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,6 @@ #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 index 956c6b497c..9e30583de8 100644 --- 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 diff --git a/shared/source/helpers/cache_flush_xehp_and_later.inl b/shared/source/helpers/cache_flush_xehp_and_later.inl index e294182e89..1177e91e60 100644 --- 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 diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index 8de21c893b..9b11b566a8 100644 --- 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 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 index 3f9bbca073..1535115f55 100644 --- 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 namespace NEO { diff --git a/shared/test/common/helpers/unit_test_helper.inl b/shared/test/common/helpers/unit_test_helper.inl index cbb32f0bd2..f440368fa3 100644 --- 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 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 9f2345de71..809c64e637 100644 --- 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 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 8c96654341..d2e5caed81 100644 --- 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; 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 index 4132bac8cf..2c20b195ff 100644 --- 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 index 07619e513d..84491e3999 100644 --- 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; 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 index 841cfdebfa..57d0c6c64c 100644 --- 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 using namespace NEO;