From e2455237304f3ac6743a9e715a1adb7c9d9147a9 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Wed, 29 Jun 2022 19:17:47 +0000 Subject: [PATCH] per gen/per sku TEST_F/TEST_P refactor In gen/sku specific tests include only required files to reduce dependency on not related HW scpecific headers and improve build performance. This is achieved by reduce in usage of hw_test.h and related collateral, like shared/source/helpers/definitions/hw_cmds.h which can be replaced by sku specific hw_cmds_.h Signed-off-by: Artur Harasimiuk --- .../source/gen11/icllp/cmdqueue_icllp.cpp | 4 +- .../core/source/gen11/icllp/image_icllp.cpp | 4 +- .../core/source/gen11/icllp/sampler_icllp.cpp | 4 +- .../source/gen12lp/adln/cmdqueue_adln.cpp | 2 +- .../source/gen12lp/adlp/cmdqueue_adlp.cpp | 2 +- .../source/gen12lp/adls/cmdqueue_adls.cpp | 2 +- .../core/source/gen12lp/dg1/cmdqueue_dg1.cpp | 4 +- .../core/source/gen12lp/dg1/image_dg1.cpp | 4 +- .../core/source/gen12lp/dg1/sampler_dg1.cpp | 4 +- .../core/source/gen12lp/rkl/cmdqueue_rkl.cpp | 2 +- .../source/gen12lp/tgllp/cmdqueue_tgllp.cpp | 4 +- .../core/source/gen12lp/tgllp/image_tgllp.cpp | 4 +- .../source/gen12lp/tgllp/sampler_tgllp.cpp | 4 +- .../core/source/gen9/cfl/cmdqueue_cfl.cpp | 4 +- level_zero/core/source/gen9/cfl/image_cfl.cpp | 4 +- .../core/source/gen9/cfl/sampler_cfl.cpp | 4 +- .../core/source/gen9/kbl/cmdqueue_kbl.cpp | 4 +- level_zero/core/source/gen9/kbl/image_kbl.cpp | 4 +- .../core/source/gen9/kbl/sampler_kbl.cpp | 4 +- .../core/source/gen9/skl/cmdqueue_skl.cpp | 4 +- level_zero/core/source/gen9/skl/image_skl.cpp | 4 +- .../core/source/gen9/skl/sampler_skl.cpp | 4 +- .../enable_family_full_l0_xe_hpc_core.cpp | 4 +- .../xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp | 2 +- .../source/xe_hpc_core/pvc/cmdqueue_pvc.cpp | 2 +- .../source/xe_hpg_core/dg2/cmdqueue_dg2.cpp | 4 +- .../enable_family_full_l0_xe_hpg_core.cpp | 4 +- .../xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp | 2 +- .../gen9/test_cmdlist_create_gen9.cpp | 4 +- .../test_cmdqueue_enqueuecommandlist_gen9.cpp | 4 +- .../cmdlist/test_cmdlist_memory_extension.cpp | 1 + .../test_cmdqueue_debugger_xe_hp_core.cpp | 4 +- .../test_l0_hw_helper_xe_hp_core.cpp | 4 +- .../xe_hpc_core/pvc/test_cmdlist_pvc.cpp | 4 +- .../xe_hpc_core/pvc/test_device_pvc.cpp | 4 +- .../test_l0_hw_helper_xe_hpc_core.cpp | 4 +- ...mdqueue_enqueuecommandlist_xe_hpg_core.cpp | 4 +- .../test_l0_hw_helper_xe_hpg_core.cpp | 4 +- .../pvc/test_debug_session_pvc.cpp | 4 +- .../test_metric_ip_sampling_enumeration.cpp | 2 + .../test_metric_ip_sampling_streamer.cpp | 2 + .../metrics/test_metric_oa_query_pool_1.cpp | 2 + .../metrics/test_metric_oa_query_pool_2.cpp | 1 + .../metrics/test_metric_oa_query_pool_3.cpp | 1 + .../metrics/test_metric_oa_query_pool_4.cpp | 2 + .../metrics/test_metric_oa_streamer_1.cpp | 1 + .../metrics/test_metric_oa_streamer_2.cpp | 1 + .../metrics/test_metric_oa_streamer_3.cpp | 1 + .../source/xe_hpc_core/buffer_xe_hpc_core.cpp | 4 +- .../xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/command_queue_xe_hpc_core.cpp | 2 +- .../enable_family_full_ocl_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp | 2 +- .../hardware_commands_helper_xe_hpc_core.cpp | 4 +- .../source/xe_hpg_core/buffer_xe_hpg_core.cpp | 4 +- .../xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/command_queue_xe_hpg_core.cpp | 2 +- .../enable_family_full_ocl_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp | 2 +- .../hardware_commands_helper_xe_hpg_core.cpp | 4 +- .../system_memfence_aub_tests_xe_hpc_core.cpp | 4 +- ...ateless_compression_in_sba_xe_hpg_core.cpp | 4 +- .../unit_test/device/device_caps_tests.cpp | 1 + ...command_stream_receiver_hw_tests_gen11.cpp | 4 +- .../gen11/ehl/test_device_caps_ehl.cpp | 4 +- .../unit_test/gen11/enqueue_kernel_gen11.cpp | 4 +- .../unit_test/gen11/hw_helper_tests_gen11.cpp | 2 + .../gen11/icllp/test_device_caps_icllp.cpp | 4 +- .../unit_test/gen11/kernel_tests_gen11.cpp | 4 +- .../gen11/lkf/test_device_caps_lkf.cpp | 4 +- .../unit_test/gen11/sampler_tests_gen11.cpp | 4 +- ...bx_command_stream_receiver_tests_gen11.cpp | 4 +- .../gen11/test_device_caps_gen11.cpp | 4 +- .../gen11/test_platform_caps_gen11.cpp | 4 +- .../unit_test/gen11/test_sample_gen11.cpp | 4 +- .../gen12lp/adln/excludes_ocl_adln.cpp | 2 +- .../gen12lp/adlp/test_device_caps_adlp.cpp | 4 +- .../gen12lp/adls/test_device_caps_adls.cpp | 4 +- .../gen12lp/dg1/hw_helper_tests_dg1.cpp | 2 + .../gen12lp/dg1/test_device_caps_dg1.cpp | 4 +- .../gen12lp/rkl/test_hw_helper_rkl.cpp | 2 + .../gen12lp/rkl/test_hw_info_config_rkl.cpp | 4 +- .../gen12lp/tgllp/kernel_tests_tgllp.cpp | 4 +- .../gen12lp/tgllp/test_hw_helper_tgllp.cpp | 2 + .../tgllp/test_hw_info_config_tgllp.cpp | 4 +- .../gen8/cl_hw_helper_tests_gen8.cpp | 4 +- .../command_stream_receiver_hw_tests_gen8.cpp | 4 +- .../test/unit_test/gen8/kernel_tests_gen8.cpp | 4 +- .../gen8/test_cl_device_caps_gen8.cpp | 4 +- .../gen8/test_platform_caps_gen8.cpp | 4 +- .../unit_test/gen9/bxt/device_tests_bxt.cpp | 4 +- .../gen9/bxt/test_device_caps_bxt.cpp | 4 +- .../gen9/bxt/test_hw_info_config_bxt.cpp | 4 +- .../windows/test_device_caps_bxt_windows.cpp | 4 +- .../gen9/cfl/test_device_caps_cfl.cpp | 4 +- .../gen9/cfl/test_hw_info_config_cfl.cpp | 4 +- .../windows/test_device_caps_cfl_windows.cpp | 4 +- .../unit_test/gen9/coherency_tests_gen9.cpp | 4 +- .../command_stream_receiver_hw_tests_gen9.cpp | 4 +- .../unit_test/gen9/enqueue_kernel_gen9.cpp | 4 +- .../gen9/glk/test_device_caps_glk.cpp | 4 +- .../gen9/glk/test_hw_info_config_glk.cpp | 4 +- .../windows/test_device_caps_glk_windows.cpp | 4 +- .../unit_test/gen9/hw_helper_tests_gen9.cpp | 2 + .../test/unit_test/gen9/kernel_tests_gen9.cpp | 4 +- .../unit_test/gen9/sampler_tests_gen9.cpp | 4 +- opencl/test/unit_test/gen9/sip_tests_gen9.cpp | 4 +- .../unit_test/gen9/skl/device_tests_skl.cpp | 4 +- .../gen9/skl/test_device_caps_skl.cpp | 4 +- .../gen9/skl/test_hw_info_config_skl.cpp | 4 +- .../unit_test/gen9/skl/test_sample_skl.cpp | 4 +- .../windows/test_device_caps_skl_windows.cpp | 4 +- .../unit_test/gen9/test_device_caps_gen9.cpp | 4 +- .../gen9/test_platform_caps_gen9.cpp | 4 +- .../test/unit_test/gen9/test_sample_gen9.cpp | 4 +- .../helpers/hw_helper_default_tests.cpp | 3 +- .../unit_test/helpers/hw_helper_tests.cpp | 3 +- .../helpers/hw_helper_tests_dg2_and_later.cpp | 2 +- .../helpers/hw_helper_tests_pvc_and_later.cpp | 4 +- .../hw_helper_tests_xehp_and_later.cpp | 1 + .../rkl/offline_compiler_tests_rkl.cpp | 4 +- .../gen8/bdw/offline_compiler_tests_bdw.cpp | 4 +- .../gen9/skl/offline_compiler_tests_skl.cpp | 4 +- .../linux/cl_mem_cache_clos_tests_xe_hpc.cpp | 4 +- .../xe_hp_core/hw_helper_tests_xe_hp_core.cpp | 2 + .../source_level_debugger_csr_tests_xehp.cpp | 4 +- .../built_in_xe_hpc_core_tests_ocl.cpp | 4 +- .../copy_engine_tests_xe_hpc_core.cpp | 4 +- .../xe_hpc_core/enqueue_tests_xe_hpc_core.cpp | 4 +- .../hw_helper_tests_xe_hpc_core.cpp | 58 +------- .../command_stream_receiver_hw_tests_pvc.cpp | 4 +- .../pvc/engine_node_helper_tests_pvc.cpp | 4 +- .../xe_hpc_core/pvc/get_device_info_pvc.cpp | 4 +- .../xe_hpc_core/pvc/hw_helper_tests_pvc.cpp | 65 ++++++++- .../xe_hpc_core/pvc/sampler_tests_pvc.cpp | 4 +- .../xe_hpc_core/pvc/test_device_caps_pvc.cpp | 4 +- .../pvc/test_hw_info_config_pvc.cpp | 4 +- .../test_cmds_programming_xe_hpc_core.cpp | 4 +- .../test_device_caps_xe_hpc_core.cpp | 4 +- .../test_platform_caps_xe_hpc_core.cpp | 4 +- .../cl_hw_helper_tests_xe_hpg_core.cpp | 4 +- ...d_stream_receiver_hw_tests_xe_hpg_core.cpp | 4 +- .../copy_engine_tests_xe_hpg_core.cpp | 4 +- .../xe_hpg_core/dg2/get_device_info_dg2.cpp | 4 +- .../dg2/memory_manager_tests_dg2.cpp | 4 +- .../dg2/test_cmds_programming_dg2.cpp | 4 +- .../xe_hpg_core/dg2/test_device_caps_dg2.cpp | 2 + .../test_device_caps_xe_hpg_core.cpp | 4 +- .../gen11/enable_hw_info_config_ehl.cpp | 4 +- .../gen11/enable_hw_info_config_icllp.cpp | 4 +- .../gen11/enable_hw_info_config_lkf.cpp | 4 +- shared/source/gen11/hw_info_ehl.cpp | 2 +- shared/source/gen11/hw_info_icllp.cpp | 2 +- .../gen12lp/enable_hw_info_config_adln.cpp | 2 +- .../gen12lp/enable_hw_info_config_adlp.cpp | 4 +- .../gen12lp/enable_hw_info_config_adls.cpp | 4 +- .../gen12lp/enable_hw_info_config_dg1.cpp | 4 +- .../gen12lp/enable_hw_info_config_rkl.cpp | 4 +- .../gen12lp/enable_hw_info_config_tgllp.cpp | 4 +- shared/source/gen12lp/hw_info_adln.cpp | 2 +- shared/source/gen12lp/hw_info_adlp.cpp | 2 +- shared/source/gen12lp/hw_info_adls.cpp | 2 +- shared/source/gen12lp/hw_info_tgllp.cpp | 2 +- .../source/gen8/enable_hw_info_config_bdw.cpp | 4 +- shared/source/gen8/hw_info_bdw.cpp | 2 +- .../source/gen9/enable_hw_info_config_bxt.cpp | 4 +- .../source/gen9/enable_hw_info_config_cfl.cpp | 4 +- .../source/gen9/enable_hw_info_config_glk.cpp | 4 +- .../source/gen9/enable_hw_info_config_kbl.cpp | 4 +- .../source/gen9/enable_hw_info_config_skl.cpp | 4 +- shared/source/gen9/hw_info_bxt.cpp | 2 +- shared/source/gen9/hw_info_cfl.cpp | 2 +- shared/source/gen9/hw_info_glk.cpp | 2 +- shared/source/gen9/hw_info_kbl.cpp | 2 +- shared/source/gen9/hw_info_skl.cpp | 2 +- .../source/gen9/linux/hw_info_config_skl.cpp | 2 +- ...command_stream_receiver_hw_xe_hpc_core.cpp | 2 +- ...ce_command_stream_receiver_xe_hpc_core.cpp | 2 +- .../enable_family_full_core_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/enable_hw_info_config_pvc.cpp | 4 +- ...xperimental_command_buffer_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/hw_helper_xe_hpc_core.cpp | 2 +- shared/source/xe_hpc_core/hw_info_pvc.cpp | 2 +- .../command_stream_receiver_xe_hpc_core.cpp | 2 +- .../linux/direct_submission_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/linux/hw_info_config_pvc.cpp | 2 +- ...bx_command_stream_receiver_xe_hpc_core.cpp | 4 +- .../windows/hw_info_config_pvc.cpp | 2 +- ...command_stream_receiver_hw_xe_hpg_core.cpp | 2 +- ...ce_command_stream_receiver_xe_hpg_core.cpp | 2 +- .../enable_family_full_core_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/enable_hw_info_config_dg2.cpp | 4 +- ...xperimental_command_buffer_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/hw_helper_xe_hpg_core.cpp | 2 +- shared/source/xe_hpg_core/hw_info_dg2.cpp | 2 +- .../command_stream_receiver_xe_hpg_core.cpp | 2 +- .../linux/direct_submission_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/linux/hw_info_config_dg2.cpp | 2 +- ...bx_command_stream_receiver_xe_hpg_core.cpp | 4 +- .../windows/hw_info_config_dg2.cpp | 2 +- .../gen11/command_encoder_tests_gen11.cpp | 4 +- .../gen11/image_surface_state_tests_gen11.cpp | 3 + .../common/gen11/test_encode_math_gen11.cpp | 4 +- .../gen12lp/adln/test_hw_info_config_adln.cpp | 4 +- .../adlp/preamble_helper_tests_adlp.cpp | 4 +- .../gen12lp/adlp/test_hw_info_config_adlp.cpp | 4 +- .../gen12lp/adls/test_hw_info_config_adls.cpp | 4 +- .../image_surface_state_tests_gen12lp.cpp | 1 + .../gen12lp/rkl/test_hw_info_config_rkl.cpp | 4 +- .../gen8/command_encoder_tests_gen8.cpp | 4 +- .../gen8/image_surface_state_tests_gen8.cpp | 3 + .../gen8/state_base_address_tests_gen8.cpp | 5 +- .../common/gen8/test_encode_math_gen8.cpp | 4 +- .../gen9/command_encoder_tests_gen9.cpp | 4 +- .../gen9/image_surface_state_tests_gen9.cpp | 3 + .../common/gen9/test_command_encoder_gen9.cpp | 4 +- .../common/gen9/test_encode_math_gen9.cpp | 4 +- shared/test/common/helpers/hw_helper_tests.h | 4 +- .../helpers/state_base_address_tests.cpp | 1 + .../common/helpers/state_base_address_tests.h | 3 +- .../aub_tests_configuration_xe_hpc_core.cpp | 2 +- .../aub_tests_configuration_xe_hpg_core.cpp | 2 +- .../header/per_product_test_definitions.h | 4 + shared/test/common/test_macros/hw_test.h | 113 +-------------- shared/test/common/test_macros/hw_test_base.h | 133 ++++++++++++++++++ shared/test/common/test_macros/test.h | 14 -- shared/test/common/test_macros/test_base.h | 13 ++ .../image_surface_state_tests_xe_hp_core.cpp | 1 + .../test_hw_info_config_xe_hp_core.cpp | 4 +- .../xe_hpg_core/cmd_parse_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/dg2/test_encode_dg2.cpp | 5 +- .../dg2/test_encode_dispatch_kernel_dg2.cpp | 5 +- .../xe_hpg_core/dg2/test_hw_helper_dg2.cpp | 4 +- .../dg2/test_hw_info_config_dg2.cpp | 4 +- .../image_surface_state_tests_xe_hpg_core.cpp | 3 + ...d_stream_receiver_tests_xehp_and_later.cpp | 2 +- ...ommand_stream_receiver_simulated_tests.cpp | 2 +- ...d_stream_receiver_tests_xehp_and_later.cpp | 2 +- .../device_binary_format_ar_tests.cpp | 1 + .../unit_test/gen11/coherency_tests_gen11.cpp | 4 +- .../gen11/ehl/test_hw_info_config_ehl.cpp | 4 +- .../unit_test/gen11/hw_cmds_gen11_tests.cpp | 5 +- .../gen11/icllp/test_hw_info_config_icllp.cpp | 4 +- .../test_program_media_sampler_icllp.cpp | 4 +- .../gen11/lkf/test_hw_info_config_lkf.cpp | 4 +- .../windows/gmm_callbacks_tests_gen11.cpp | 4 +- .../gen12lp/adln/test_device_caps_adln.cpp | 4 +- ..._command_stream_receiver_tests_gen12lp.inl | 3 +- ...iver_simulated_common_hw_tests_gen12lp.inl | 3 +- .../dg1/linux/hw_info_config_tests_dg1.cpp | 3 + .../gen12lp/dg1/test_hw_info_config_dg1.cpp | 4 +- .../gen8/bdw/test_device_caps_bdw.cpp | 4 +- .../gen8/bdw/test_hw_info_config_bdw.cpp | 4 +- .../unit_test/gen8/coherency_tests_gen8.cpp | 4 +- .../unit_test/gen8/hw_helper_tests_gen8.cpp | 2 + .../unit_test/gen8/sampler_tests_gen8.cpp | 4 +- .../unit_test/gen8/test_device_caps_gen8.cpp | 4 +- .../test/unit_test/gen8/test_sample_gen8.cpp | 4 +- .../gen8/windows/gmm_callbacks_tests_gen8.cpp | 4 +- .../unit_test/gen9/hw_cmds_gen9_tests.cpp | 5 +- .../gen9/windows/gmm_callbacks_tests_gen9.cpp | 4 +- .../image/image_surface_state_fixture.h | 1 - .../image/image_surface_state_tests.cpp | 1 + .../linux/ioctl_helper_tests_dg1.cpp | 4 +- .../xe_hp_sdv/test_preamble_xe_hp_sdv.cpp | 4 +- .../xe_hp_sdv/test_preemption_xe_hp_sdv.cpp | 4 +- ..._using_aubstream_lib_tests_xe_hpc_core.cpp | 4 +- ...nd_stream_receiver_2_tests_xe_hpc_core.cpp | 4 +- .../cmd_parse_tests_xe_hpc_core.cpp | 3 +- .../dispatch_walker_tests_xe_hpc_core.cpp | 4 +- .../xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp | 3 +- .../hw_helper_xe_hpc_core_tests.cpp | 2 + .../image_surface_state_tests_xe_hpc_core.cpp | 3 + .../pvc/device_binary_format_ar_tests_pvc.cpp | 4 +- .../pvc/dispatch_walker_tests_pvc.cpp | 4 +- .../xe_hpc_core/pvc/hw_info_tests_pvc.cpp | 4 +- .../pvc/product_config_helper_tests_pvc.cpp | 4 +- .../pvc/test_encode_dispatch_kernel_pvc.cpp | 2 +- .../pvc/test_hw_info_config_pvc.cpp | 4 +- .../xe_hpc_core/pvc/test_sample_pvc.cpp | 4 +- .../xe_hpc_core/test_encode_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/test_sample_xe_hpc_core.cpp | 4 +- ..._using_aubstream_lib_tests_xe_hpg_core.cpp | 4 +- .../dg2/device_binary_format_ar_tests_dg2.cpp | 4 +- .../xe_hpg_core/dg2/hw_helper_tests_dg2.cpp | 4 +- .../dg2/product_config_helper_tests_dg2.cpp | 4 +- .../xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp | 3 +- .../hw_helper_tests_xe_hpg_core.cpp | 2 + 288 files changed, 845 insertions(+), 482 deletions(-) create mode 100644 shared/test/common/test_macros/hw_test_base.h create mode 100644 shared/test/common/test_macros/test_base.h diff --git a/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp b/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp index 6f82a8d50a..4341e5b933 100644 --- a/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/gen11/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen11/icllp/image_icllp.cpp b/level_zero/core/source/gen11/icllp/image_icllp.cpp index 644a38401c..c9cdd8da0d 100644 --- a/level_zero/core/source/gen11/icllp/image_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/image_icllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/gen11/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen11/icllp/sampler_icllp.cpp b/level_zero/core/source/gen11/icllp/sampler_icllp.cpp index 2ecb67b8a0..c4f4baa9be 100644 --- a/level_zero/core/source/gen11/icllp/sampler_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/sampler_icllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/gen11/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/gen12lp/adln/cmdqueue_adln.cpp b/level_zero/core/source/gen12lp/adln/cmdqueue_adln.cpp index f753ca552c..29f512fc29 100644 --- a/level_zero/core/source/gen12lp/adln/cmdqueue_adln.cpp +++ b/level_zero/core/source/gen12lp/adln/cmdqueue_adln.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adln.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" #include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" diff --git a/level_zero/core/source/gen12lp/adlp/cmdqueue_adlp.cpp b/level_zero/core/source/gen12lp/adlp/cmdqueue_adlp.cpp index 95a94f4157..95109d41f3 100644 --- a/level_zero/core/source/gen12lp/adlp/cmdqueue_adlp.cpp +++ b/level_zero/core/source/gen12lp/adlp/cmdqueue_adlp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adlp.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" #include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" diff --git a/level_zero/core/source/gen12lp/adls/cmdqueue_adls.cpp b/level_zero/core/source/gen12lp/adls/cmdqueue_adls.cpp index 6e130c1c5b..d91df38f3c 100644 --- a/level_zero/core/source/gen12lp/adls/cmdqueue_adls.cpp +++ b/level_zero/core/source/gen12lp/adls/cmdqueue_adls.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adls.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" #include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" diff --git a/level_zero/core/source/gen12lp/dg1/cmdqueue_dg1.cpp b/level_zero/core/source/gen12lp/dg1/cmdqueue_dg1.cpp index 1440639708..37e9a70f88 100644 --- a/level_zero/core/source/gen12lp/dg1/cmdqueue_dg1.cpp +++ b/level_zero/core/source/gen12lp/dg1/cmdqueue_dg1.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen12lp/dg1/image_dg1.cpp b/level_zero/core/source/gen12lp/dg1/image_dg1.cpp index 5c91b25b35..591ccef1f3 100644 --- a/level_zero/core/source/gen12lp/dg1/image_dg1.cpp +++ b/level_zero/core/source/gen12lp/dg1/image_dg1.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen12lp/dg1/sampler_dg1.cpp b/level_zero/core/source/gen12lp/dg1/sampler_dg1.cpp index c87be86ff0..8895a6b424 100644 --- a/level_zero/core/source/gen12lp/dg1/sampler_dg1.cpp +++ b/level_zero/core/source/gen12lp/dg1/sampler_dg1.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/gen12lp/rkl/cmdqueue_rkl.cpp b/level_zero/core/source/gen12lp/rkl/cmdqueue_rkl.cpp index 3f2ccddbcd..2747ab0fb2 100644 --- a/level_zero/core/source/gen12lp/rkl/cmdqueue_rkl.cpp +++ b/level_zero/core/source/gen12lp/rkl/cmdqueue_rkl.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_rkl.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" #include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" diff --git a/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp index b5f6b49b69..7eb4cdaaed 100644 --- a/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp index e79e17ad0c..95421a1480 100644 --- a/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp index fd12cf619d..0c39d776cb 100644 --- a/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/gen12lp/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp b/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp index bc9ef8551b..5fbc8093ac 100644 --- a/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen9/cfl/image_cfl.cpp b/level_zero/core/source/gen9/cfl/image_cfl.cpp index 7fc971f20b..bddf60b775 100644 --- a/level_zero/core/source/gen9/cfl/image_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/image_cfl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen9/cfl/sampler_cfl.cpp b/level_zero/core/source/gen9/cfl/sampler_cfl.cpp index 8110eb8e05..3c27fbbec1 100644 --- a/level_zero/core/source/gen9/cfl/sampler_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/sampler_cfl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp b/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp index 44e8520692..288e52a736 100644 --- a/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen9/kbl/image_kbl.cpp b/level_zero/core/source/gen9/kbl/image_kbl.cpp index e63059d77b..9b501d93bc 100644 --- a/level_zero/core/source/gen9/kbl/image_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/image_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen9/kbl/sampler_kbl.cpp b/level_zero/core/source/gen9/kbl/sampler_kbl.cpp index b380e5ae91..c97d033981 100644 --- a/level_zero/core/source/gen9/kbl/sampler_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/sampler_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp b/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp index 3ee19f9770..07ade06f6d 100644 --- a/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp +++ b/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/gen9/skl/image_skl.cpp b/level_zero/core/source/gen9/skl/image_skl.cpp index 9a6b4e300f..c01b436d9c 100644 --- a/level_zero/core/source/gen9/skl/image_skl.cpp +++ b/level_zero/core/source/gen9/skl/image_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/image/image_hw.inl" diff --git a/level_zero/core/source/gen9/skl/sampler_skl.cpp b/level_zero/core/source/gen9/skl/sampler_skl.cpp index 32a3c3ca9e..6769b3c092 100644 --- a/level_zero/core/source/gen9/skl/sampler_skl.cpp +++ b/level_zero/core/source/gen9/skl/sampler_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/gen9/hw_info.h" #include "level_zero/core/source/sampler/sampler_hw.inl" diff --git a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp index e5e3d25d4f..78291cf848 100644 --- a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp +++ b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp @@ -1,11 +1,11 @@ /* - * 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 "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp index d43b76994c..44bcb743e6 100644 --- a/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp +++ b/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper_base.inl" diff --git a/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp b/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp index cc11c3fe4b..622175b2dc 100644 --- a/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp +++ b/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/source/xe_hpc_core/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/xe_hpg_core/dg2/cmdqueue_dg2.cpp b/level_zero/core/source/xe_hpg_core/dg2/cmdqueue_dg2.cpp index 14c7610f00..576389bf14 100644 --- a/level_zero/core/source/xe_hpg_core/dg2/cmdqueue_dg2.cpp +++ b/level_zero/core/source/xe_hpg_core/dg2/cmdqueue_dg2.cpp @@ -1,11 +1,11 @@ /* - * 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 "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/source/xe_hpg_core/hw_info.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" diff --git a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp index 16e0ec1e18..5c43bca222 100644 --- a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp +++ b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp @@ -1,11 +1,11 @@ /* - * 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 "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp index 071b1f31fb..530861a10f 100644 --- a/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp +++ b/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper_base.inl" diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp index 5f9c60deaa..69468f3d64 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp @@ -6,10 +6,12 @@ */ #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/string.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp index c32a33e5d6..736a387ea2 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp @@ -7,10 +7,12 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/command_stream/preemption.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp index a117c48017..c0f00a9f7b 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp index 3262c0f750..bb5aa72bac 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp @@ -9,8 +9,10 @@ #include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/preamble.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_l0_hw_helper_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_l0_hw_helper_xe_hp_core.cpp index 59e031df56..4a43b94784 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_l0_hw_helper_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_l0_hw_helper_xe_hp_core.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hp_core/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp index 8ec61aef08..fa1b73cb40 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp index ac39292976..57735258a8 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp @@ -6,9 +6,11 @@ */ #include "shared/source/command_container/implicit_scaling.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/cmdlist/cmdlist_imp.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp index e432c0f4b4..8830bbb068 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp index 5dada4e296..7387fc3d38 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp @@ -7,8 +7,10 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp index 59361ac21b..ec479afedc 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/xe_hpc_core/pvc/test_debug_session_pvc.cpp b/level_zero/tools/test/unit_tests/sources/debug/xe_hpc_core/pvc/test_debug_session_pvc.cpp index 41f1bb2ba5..58873e406a 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/xe_hpc_core/pvc/test_debug_session_pvc.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/xe_hpc_core/pvc/test_debug_session_pvc.cpp @@ -6,9 +6,11 @@ */ #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/mock.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp index 8949dd5c42..7e5c1d89df 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test_base.h" + #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer.cpp index 8e1a72bcbf..b7e9e6cfe5 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test_base.h" + #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp index 2c79068853..749c249d43 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test_base.h" + #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp index cc1d22ed64..23e2a3d43a 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp index 414cc9fa88..a1a112ad2f 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp index 6589bea6ba..aed455573d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test_base.h" + #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp index 8d1da039b4..6cf44f871d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp index 585fcc7b28..2640f8a3e5 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp index ab1bd4007c..47323aa4db 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" diff --git a/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp index aa2200bb58..c8d5ad76df 100644 --- a/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp @@ -1,11 +1,11 @@ /* - * 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 "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "opencl/source/mem_obj/buffer_base.inl" diff --git a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp index f5ae249d5f..d62d6dc673 100644 --- a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/populate_factory.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "opencl/source/helpers/cl_hw_helper_base.inl" #include "opencl/source/helpers/cl_hw_helper_xehp_and_later.inl" diff --git a/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp index 34ad183981..ba2417691d 100644 --- a/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_resource_barrier.h" diff --git a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp index b1932ddae4..6e348848f5 100644 --- a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/populate_factory.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/cl_hw_helper.h" 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 6fc6d481e6..ffab73a304 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 @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.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/hardware_commands_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp index dc48f42f90..1ec2908cbf 100644 --- a/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/cache_flush_xehp_and_later.inl" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/hardware_commands_helper_base.inl" diff --git a/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp index 6853f14e47..7d3a14c6cb 100644 --- a/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp @@ -1,11 +1,11 @@ /* - * 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 "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "opencl/source/mem_obj/buffer_base.inl" diff --git a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp index 3270e934e3..6b5af235cf 100644 --- a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/populate_factory.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "opencl/source/helpers/cl_hw_helper_base.inl" #include "opencl/source/helpers/cl_hw_helper_xehp_and_later.inl" diff --git a/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp index bced3118ae..ff9e0eef0e 100644 --- a/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_resource_barrier.h" diff --git a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp index 754ca1a4f7..414300d2cc 100644 --- a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/populate_factory.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/cl_hw_helper.h" 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 88ee2b95db..586be00090 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 @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.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/hardware_commands_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp index ad45c6d1b9..3525d28790 100644 --- a/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/cache_flush_xehp_and_later.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/hardware_commands_helper_base.inl" diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp index 4cb1b0280b..e01286cd5c 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/api/api.h" diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp index 9ef48b3af0..7c788f3be1 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp @@ -7,8 +7,10 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/extensions/public/cl_ext_private.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 922bf72629..90aff90bbe 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/mocks/mock_driver_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_sip.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" diff --git a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index 232ac69ddd..7a8714a28a 100644 --- a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp @@ -7,9 +7,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen11/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp index 4d1b8b32cb..a298c40339 100644 --- a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds_ehl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index 1692c20545..20f7f5c845 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/static_size3.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp index 1dff0ec988..26a35fcf74 100644 --- a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index 1a0973fa58..e6d1045534 100644 --- a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds_icllp.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index 6902dc95d9..2dd8c07e9c 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp index 5f1040d50d..b44c042079 100644 --- a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds_lkf.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index b88c26dd81..21f2779af7 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index 7d83973b2b..68612285b8 100644 --- a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index 3fab6acc3f..c94021a05d 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp index 8ef2521afc..580a408054 100644 --- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp index 955cd7e11e..567586321b 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen12lp/adln/excludes_ocl_adln.cpp b/opencl/test/unit_test/gen12lp/adln/excludes_ocl_adln.cpp index a6b4074394..0723ad0011 100644 --- a/opencl/test/unit_test/gen12lp/adln/excludes_ocl_adln.cpp +++ b/opencl/test/unit_test/gen12lp/adln/excludes_ocl_adln.cpp @@ -5,6 +5,6 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/hw_test_base.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_N); diff --git a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp index b4a18290ac..ed0376f0c0 100644 --- a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen12lp/hw_cmds_adlp.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp index fe9f4797e7..cacc28f56d 100644 --- a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen12lp/hw_cmds_adls.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp index 78cac7322c..5447d12fc6 100644 --- a/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp index ab896af5be..3400a72366 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/os_interface/driver_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp index 10f35432c7..c7854b4d41 100644 --- a/opencl/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" using HwHelperTestRkl = HwHelperTest; diff --git a/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp index f7ebd45522..35d622f77d 100644 --- a/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -5,10 +5,12 @@ * */ +#include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include diff --git a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp index e78fe95cbd..dd29b44b58 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp index f4f261f886..8dc4af77e3 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" using HwHelperTestGen12Lp = HwHelperTest; diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index 7facc9bf0d..3ce0f505b3 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp @@ -5,11 +5,13 @@ * */ +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp index da6f5efd58..2029dc42d1 100644 --- a/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" diff --git a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp index 3bef97e1ad..fbebd4a7a0 100644 --- a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -7,10 +7,12 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen8/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp index 61406fd935..180f0b2a00 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen8/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp index adfdd83537..66e7b48286 100644 --- a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen8/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp index 943df4c20b..a4ddc62147 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen8/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp index adfb186f10..e0f55ac258 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_bxt.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index c2aa346560..8181a1613e 100644 --- a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_bxt.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index 406c21773c..1ca8fc8da2 100644 --- a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds_bxt.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(BxtHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) { diff --git a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index b1765d0f3f..fffbcb512b 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_bxt.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index 31c428bd43..1f85b77244 100644 --- a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_cfl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index 36fe80b266..f7e55f091d 100644 --- a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(CflHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index c6e0e94922..8b5cd4ca54 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_cfl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp index f1c0477209..9bc6d1b43a 100644 --- a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp @@ -5,12 +5,14 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index 0f69581fce..9afe92458c 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -8,11 +8,13 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index 074aa4f554..ee4c401ba7 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/reg_configs.h" #include "shared/test/common/fixtures/memory_management_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/static_size3.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp index 21145ed7d0..5c78d25673 100644 --- a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_glk.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp index 228267360e..77b289b2c2 100644 --- a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds_glk.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(GlkHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp index 498b7df758..a23eab67fd 100644 --- a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_glk.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp index b75ba89627..2597f55ab2 100644 --- a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index 3b5c47873e..a0c69efc06 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp index 8c2106c8a8..0d21787c3a 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index bde187258d..d7e7e401ba 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -7,10 +7,12 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/built_ins/sip.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp index d8c523607e..17be7e7f9e 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_skl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index 495112617b..630dc5fb8e 100644 --- a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_skl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 81bff2cb12..2942409912 100644 --- a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(SklHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp index 677ec1dbfd..e237977c15 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_skl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index 31f69201cc..3713a3eca4 100644 --- a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds_skl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index 74037bad0d..72e88dd508 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 9289805dc9..4f8bcc4991 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp index 7ee9de0b4a..4e660e7c90 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp index ddd08691a2..677451ab13 100644 --- a/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/hw_test.h" HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenAskedForHvAlign4RequiredThenReturnTrue) { auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily); diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index 887d3cc8c2..37bd5654fb 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -22,6 +22,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/helpers/cl_hw_helper.h" @@ -1480,4 +1481,4 @@ using LogicalStateHelperTest = ::testing::Test; HWTEST_F(LogicalStateHelperTest, whenCreatingLogicalStateHelperThenReturnNullptr) { EXPECT_EQ(nullptr, LogicalStateHelper::create(true)); EXPECT_EQ(nullptr, LogicalStateHelper::create(false)); -} \ No newline at end of file +} diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp index 21481364a9..350ab10739 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/unit_test_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp index 14c3aa801a..174a296c4b 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/mock_hw_info_config_hw.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using HwHelperTestPvcAndLater = HwHelperTest; @@ -205,4 +205,4 @@ HWTEST2_F(HwHelperTestCooperativeEngine, givenCooperativeContextSupportedWhenGet EXPECT_EQ(0u, cooperativeCcsCount); } } -} \ No newline at end of file +} diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp index df8cd6b5c1..9fefe1dc31 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/ult_hw_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp b/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp index 25b69cc79c..ba9f5bfcd0 100644 --- a/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp +++ b/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen12lp/hw_cmds_rkl.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" #include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h" diff --git a/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp b/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp index 2d713bf8dc..185395907a 100644 --- a/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp +++ b/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" +#include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/test/common/helpers/test_files.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" diff --git a/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp b/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp index 19fce5c307..c5eac4a390 100644 --- a/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp +++ b/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp @@ -7,8 +7,10 @@ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" #include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h" diff --git a/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp b/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp index f21f2a3871..7261d40cbf 100644 --- a/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp +++ b/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp @@ -6,11 +6,13 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/source/xe_hpc_core/hw_cmds.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h" #include "shared/test/common/os_interface/linux/drm_mock_cache_info.h" #include "shared/test/common/os_interface/linux/drm_mock_memory_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp index 3bf1dbe95f..10e80acaef 100644 --- a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp @@ -7,12 +7,14 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/program/kernel_info.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" diff --git a/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp b/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp index 6be9629f70..5e8d0d3b15 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp +++ b/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp @@ -7,11 +7,13 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp index 1fc4eacac8..747e1c1e0b 100644 --- a/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp +++ b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_builtinslib.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using XeHpcCoreBuiltInTests = Test; diff --git a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp index d57296bffb..d99d81297f 100644 --- a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp @@ -9,12 +9,14 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/timestamp_packet.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp index 673264eca4..54f5086d9e 100644 --- a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp @@ -6,12 +6,14 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp index d7c1b316f7..a1e68ee41d 100644 --- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp @@ -7,12 +7,14 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -636,62 +638,6 @@ XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenProgramGlobalFenceAsMiMemFenceCom EXPECT_EQ(sizeof(MI_MEM_FENCE), MemorySynchronizationCommands::getSizeForAdditonalSynchronization(hardwareInfo)); } -HWTEST2_F(HwHelperTestsXeHpcCore, givenMemorySynchronizationCommandsWhenAddingSynchronizationThenCorrectMethodIsUsed, IsPVC) { - using MI_MEM_FENCE = typename FamilyType::MI_MEM_FENCE; - using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; - - struct { - unsigned short revisionId; - int32_t programGlobalFenceAsMiMemFenceCommandInCommandStream; - bool expectMiSemaphoreWait; - } testInputs[] = { - {0x0, -1, true}, - {0x3, -1, false}, - {0x0, 0, true}, - {0x3, 0, true}, - {0x0, 1, false}, - {0x3, 1, false}, - }; - - DebugManagerStateRestore debugRestorer; - auto hardwareInfo = *defaultHwInfo; - - hardwareInfo.featureTable.flags.ftrLocalMemory = true; - uint8_t buffer[128] = {}; - uint64_t gpuAddress = 0x12345678; - - for (auto &testInput : testInputs) { - hardwareInfo.platform.usRevId = testInput.revisionId; - DebugManager.flags.ProgramGlobalFenceAsMiMemFenceCommandInCommandStream.set( - testInput.programGlobalFenceAsMiMemFenceCommandInCommandStream); - - LinearStream commandStream(buffer, 128); - auto synchronizationSize = MemorySynchronizationCommands::getSizeForSingleAdditionalSynchronization(hardwareInfo); - - MemorySynchronizationCommands::addAdditionalSynchronization(commandStream, gpuAddress, false, hardwareInfo); - - HardwareParse hwParser; - hwParser.parseCommands(commandStream); - EXPECT_EQ(1u, hwParser.cmdList.size()); - - if (testInput.expectMiSemaphoreWait) { - EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), synchronizationSize); - - auto semaphoreCmd = genCmdCast(*hwParser.cmdList.begin()); - ASSERT_NE(nullptr, semaphoreCmd); - EXPECT_EQ(static_cast(-2), semaphoreCmd->getSemaphoreDataDword()); - EXPECT_EQ(gpuAddress, semaphoreCmd->getSemaphoreGraphicsAddress()); - EXPECT_EQ(MI_SEMAPHORE_WAIT::COMPARE_OPERATION_SAD_NOT_EQUAL_SDD, semaphoreCmd->getCompareOperation()); - } else { - EXPECT_EQ(sizeof(MI_MEM_FENCE), synchronizationSize); - - auto fenceCmd = genCmdCast(*hwParser.cmdList.begin()); - ASSERT_NE(nullptr, fenceCmd); - EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType()); - } - } -} - XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenHwHelperWhenGettingThreadsPerEUConfigsThenCorrectConfigsAreReturned) { auto &helper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily); EXPECT_NE(nullptr, &helper); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp index 4cf777674b..df48c4edac 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp @@ -13,10 +13,12 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/preamble.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/ult_aub_command_stream_receiver.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp index b4aee15980..fc7d39be91 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/helpers/engine_node_helper.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp index 56680b19cf..a8aa2a6ed1 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp index 090ccbc1aa..d41efdd19f 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp @@ -5,14 +5,19 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" +#include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/ult_hw_config.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/xe_hpc_core/xe_hpc_core_test_ocl_fixtures.h" + namespace NEO { using HwHelperTestsPvcXt = Test; + PVCTEST_F(HwHelperTestsPvcXt, givenSingleTileCsrOnPvcXtWhenAllocatingCsrSpecificAllocationsAndIsNotBaseDieA0ThenStoredInProperMemoryPool) { auto hwInfo = *defaultHwInfo; const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); @@ -108,4 +113,60 @@ PVCTEST_F(HwHelperTestsPvc, givenRevisionIdWhenGetComputeUnitsUsedForScratchThen EXPECT_EQ(expectedValue * testInput.expectedRatio, helper.getComputeUnitsUsedForScratch(&hwInfo)); } } -} // namespace NEO \ No newline at end of file + +PVCTEST_F(HwHelperTestsPvcXt, givenMemorySynchronizationCommandsWhenAddingSynchronizationThenCorrectMethodIsUsed) { + using MI_MEM_FENCE = typename FamilyType::MI_MEM_FENCE; + using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; + + struct { + unsigned short revisionId; + int32_t programGlobalFenceAsMiMemFenceCommandInCommandStream; + bool expectMiSemaphoreWait; + } testInputs[] = { + {0x0, -1, true}, + {0x3, -1, false}, + {0x0, 0, true}, + {0x3, 0, true}, + {0x0, 1, false}, + {0x3, 1, false}, + }; + + DebugManagerStateRestore debugRestorer; + auto hardwareInfo = *defaultHwInfo; + + hardwareInfo.featureTable.flags.ftrLocalMemory = true; + uint8_t buffer[128] = {}; + uint64_t gpuAddress = 0x12345678; + + for (auto &testInput : testInputs) { + hardwareInfo.platform.usRevId = testInput.revisionId; + DebugManager.flags.ProgramGlobalFenceAsMiMemFenceCommandInCommandStream.set( + testInput.programGlobalFenceAsMiMemFenceCommandInCommandStream); + + LinearStream commandStream(buffer, 128); + auto synchronizationSize = MemorySynchronizationCommands::getSizeForSingleAdditionalSynchronization(hardwareInfo); + + MemorySynchronizationCommands::addAdditionalSynchronization(commandStream, gpuAddress, false, hardwareInfo); + + HardwareParse hwParser; + hwParser.parseCommands(commandStream); + EXPECT_EQ(1u, hwParser.cmdList.size()); + + if (testInput.expectMiSemaphoreWait) { + EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), synchronizationSize); + + auto semaphoreCmd = genCmdCast(*hwParser.cmdList.begin()); + ASSERT_NE(nullptr, semaphoreCmd); + EXPECT_EQ(static_cast(-2), semaphoreCmd->getSemaphoreDataDword()); + EXPECT_EQ(gpuAddress, semaphoreCmd->getSemaphoreGraphicsAddress()); + EXPECT_EQ(MI_SEMAPHORE_WAIT::COMPARE_OPERATION_SAD_NOT_EQUAL_SDD, semaphoreCmd->getCompareOperation()); + } else { + EXPECT_EQ(sizeof(MI_MEM_FENCE), synchronizationSize); + + auto fenceCmd = genCmdCast(*hwParser.cmdList.begin()); + ASSERT_NE(nullptr, fenceCmd); + EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType()); + } + } +} +} // namespace NEO diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp index bf25dca55b..150029e6f2 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp @@ -7,8 +7,10 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp index 0aab390f96..b5d5c7c37b 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index 3c1e926c20..7104a14a37 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -8,9 +8,11 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "device_ids_configs_pvc.h" diff --git a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp index e1698d26c1..501bbd4576 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp @@ -8,8 +8,10 @@ #include "shared/source/gmm_helper/client_context/gmm_client_context.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/state_base_address.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index 32d69c4fb2..c4d7a0aba9 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp index 46182d5a72..8e9dbff09d 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp index d0e0ac6944..099e158203 100644 --- a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp @@ -6,9 +6,11 @@ */ #include "shared/source/program/kernel_info.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" diff --git a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp index d39ffb2e80..7db9e9e184 100644 --- a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp index b13a019bf4..7dcdbafa65 100644 --- a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp @@ -10,12 +10,14 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp index d5587854f1..d1ac8dda86 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp @@ -5,7 +5,9 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp index a6aacf0a84..dbd03c3831 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp @@ -5,10 +5,12 @@ * */ +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp index b59fd7012d..b705c5558f 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp @@ -9,8 +9,10 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/state_base_address.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp index 6d9c29a5ef..1136eccde6 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp @@ -7,7 +7,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp index c7e582c9ec..ddcc4ab370 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/shared/source/gen11/enable_hw_info_config_ehl.cpp b/shared/source/gen11/enable_hw_info_config_ehl.cpp index eb2a3e1de2..9d5602834b 100644 --- a/shared/source/gen11/enable_hw_info_config_ehl.cpp +++ b/shared/source/gen11/enable_hw_info_config_ehl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_ehl.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen11/enable_hw_info_config_icllp.cpp b/shared/source/gen11/enable_hw_info_config_icllp.cpp index 2ab963f30f..1595f58929 100644 --- a/shared/source/gen11/enable_hw_info_config_icllp.cpp +++ b/shared/source/gen11/enable_hw_info_config_icllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen11/enable_hw_info_config_lkf.cpp b/shared/source/gen11/enable_hw_info_config_lkf.cpp index 5760a05425..5f11ac5b9a 100644 --- a/shared/source/gen11/enable_hw_info_config_lkf.cpp +++ b/shared/source/gen11/enable_hw_info_config_lkf.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_lkf.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp index 9541cc7084..b1cdaa9661 100644 --- a/shared/source/gen11/hw_info_ehl.cpp +++ b/shared/source/gen11/hw_info_ehl.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_ehl.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp index 50ddcee4a2..e06469f0c9 100644 --- a/shared/source/gen11/hw_info_icllp.cpp +++ b/shared/source/gen11/hw_info_icllp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen12lp/enable_hw_info_config_adln.cpp b/shared/source/gen12lp/enable_hw_info_config_adln.cpp index d6fc68cee1..3da01efbc3 100644 --- a/shared/source/gen12lp/enable_hw_info_config_adln.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_adln.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adln.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_hw_info_config_adlp.cpp b/shared/source/gen12lp/enable_hw_info_config_adlp.cpp index a6931edfa5..281c67b634 100644 --- a/shared/source/gen12lp/enable_hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_adlp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adlp.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_hw_info_config_adls.cpp b/shared/source/gen12lp/enable_hw_info_config_adls.cpp index 4b692199b1..4d47ba4756 100644 --- a/shared/source/gen12lp/enable_hw_info_config_adls.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_adls.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adls.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_hw_info_config_dg1.cpp b/shared/source/gen12lp/enable_hw_info_config_dg1.cpp index a729f5fb07..8f2b562349 100644 --- a/shared/source/gen12lp/enable_hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_dg1.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_hw_info_config_rkl.cpp b/shared/source/gen12lp/enable_hw_info_config_rkl.cpp index 3acc17a8d4..fdbad26787 100644 --- a/shared/source/gen12lp/enable_hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_rkl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_hw_info_config_tgllp.cpp b/shared/source/gen12lp/enable_hw_info_config_tgllp.cpp index 9af4ba3f14..c787e09329 100644 --- a/shared/source/gen12lp/enable_hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/enable_hw_info_config_tgllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index ae287a7a2b..b00496ea29 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adln.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 20e1027493..6f583e5141 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adlp.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 42d3ea7ab6..b5e9b36059 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_adls.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index f74362280d..37f09501d0 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen8/enable_hw_info_config_bdw.cpp b/shared/source/gen8/enable_hw_info_config_bdw.cpp index 9c718e807e..5051aa3195 100644 --- a/shared/source/gen8/enable_hw_info_config_bdw.cpp +++ b/shared/source/gen8/enable_hw_info_config_bdw.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen8/hw_cmds.h" +#include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp index fcd92bb52b..6a9c5f3a69 100644 --- a/shared/source/gen8/hw_info_bdw.cpp +++ b/shared/source/gen8/hw_info_bdw.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen8/hw_cmds.h" +#include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/enable_hw_info_config_bxt.cpp b/shared/source/gen9/enable_hw_info_config_bxt.cpp index 218609643a..1e32c9d87e 100644 --- a/shared/source/gen9/enable_hw_info_config_bxt.cpp +++ b/shared/source/gen9/enable_hw_info_config_bxt.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_bxt.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen9/enable_hw_info_config_cfl.cpp b/shared/source/gen9/enable_hw_info_config_cfl.cpp index 09cf42e4c8..a473e3ae47 100644 --- a/shared/source/gen9/enable_hw_info_config_cfl.cpp +++ b/shared/source/gen9/enable_hw_info_config_cfl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen9/enable_hw_info_config_glk.cpp b/shared/source/gen9/enable_hw_info_config_glk.cpp index 14177d2433..0f478ded1b 100644 --- a/shared/source/gen9/enable_hw_info_config_glk.cpp +++ b/shared/source/gen9/enable_hw_info_config_glk.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_glk.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen9/enable_hw_info_config_kbl.cpp b/shared/source/gen9/enable_hw_info_config_kbl.cpp index b096f3d09a..2820b5337d 100644 --- a/shared/source/gen9/enable_hw_info_config_kbl.cpp +++ b/shared/source/gen9/enable_hw_info_config_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen9/enable_hw_info_config_skl.cpp b/shared/source/gen9/enable_hw_info_config_skl.cpp index 45d370cc80..e842278180 100644 --- a/shared/source/gen9/enable_hw_info_config_skl.cpp +++ b/shared/source/gen9/enable_hw_info_config_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp index be37f610e4..580d19c2ad 100644 --- a/shared/source/gen9/hw_info_bxt.cpp +++ b/shared/source/gen9/hw_info_bxt.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_bxt.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index cf3b092cfa..95420df288 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp index ebe8b9daae..aefa19e7d0 100644 --- a/shared/source/gen9/hw_info_glk.cpp +++ b/shared/source/gen9/hw_info_glk.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_glk.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index 43d70129a9..3a8d761e20 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index 5f9441d329..b93024f95c 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/aub_mem_dump/definitions/aub_services.h" -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/helpers/constants.h" #include "engine_node.h" diff --git a/shared/source/gen9/linux/hw_info_config_skl.cpp b/shared/source/gen9/linux/hw_info_config_skl.cpp index 836a2cb70e..646f77bb67 100644 --- a/shared/source/gen9/linux/hw_info_config_skl.cpp +++ b/shared/source/gen9/linux/hw_info_config_skl.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp index 47c80ef38e..7acdeabd75 100644 --- a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/source/xe_hpc_core/hw_info.h" using Family = NEO::XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp index d60901ad41..8bcc7ebabf 100644 --- a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/device_command_stream.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "create_command_stream_receiver.inl" diff --git a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp index 39be2b8395..2d31d4451d 100644 --- a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp @@ -11,7 +11,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/populate_factory.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp index e97ad9af49..ee694bfcbf 100644 --- a/shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp b/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp index 6d273a58b0..dfab37a535 100644 --- a/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/experimental_command_buffer.inl" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { using GfxFamily = XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp index a7b5d52319..1611c69d29 100644 --- a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/xe_hpc_core/aub_mapper.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" using Family = NEO::XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 46f96ee2d4..47da542433 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -9,7 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/constants.h" #include "shared/source/unified_memory/usm_memory_support.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "engine_node.h" diff --git a/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp index 651c1411f1..8539765ef5 100644 --- a/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/device_command_stream.inl" #include "shared/source/os_interface/linux/drm_command_stream.inl" #include "shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp b/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp index 18199f5217..b2f70d2a8b 100644 --- a/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp @@ -13,7 +13,7 @@ #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/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { using GfxFamily = XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp index 7c493c9628..6ba49a66d8 100644 --- a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp @@ -18,7 +18,7 @@ #include "shared/source/os_interface/linux/pmt_util.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/utilities/directory.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "platforms.h" diff --git a/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp index dd3366e5a6..55923808f4 100644 --- a/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/memory_manager/memory_pool.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { using Family = XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp index 3d1a79a954..ff3b7a02ee 100644 --- a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp @@ -10,7 +10,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "platforms.h" diff --git a/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp b/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp index 42ec5c9b3d..58e93595cb 100644 --- a/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/source/xe_hpg_core/hw_info.h" using Family = NEO::XE_HPG_COREFamily; diff --git a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp index 1b28407e7a..9cc4352aa9 100644 --- a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/device_command_stream.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "create_command_stream_receiver.inl" diff --git a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp index 3213ee19c6..588ddae3fe 100644 --- a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp @@ -11,7 +11,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/populate_factory.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp index 735837e5a6..9e044686df 100644 --- a/shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp b/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp index 94c774774f..98a8a07946 100644 --- a/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/experimental_command_buffer.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { typedef XE_HPG_COREFamily GfxFamily; diff --git a/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp b/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp index 2f14af4dd1..e58c7935cd 100644 --- a/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/xe_hpg_core/aub_mapper.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" using Family = NEO::XE_HPG_COREFamily; diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index a0a0cfe900..7c15c473e1 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -8,7 +8,7 @@ #include "shared/source/aub_mem_dump/definitions/aub_services.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/constants.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "engine_node.h" diff --git a/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp index 3d38fc3bb4..ad5543f335 100644 --- a/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/device_command_stream.inl" #include "shared/source/os_interface/linux/drm_command_stream.inl" #include "shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp b/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp index dd12370862..511fa9500e 100644 --- a/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp @@ -13,7 +13,7 @@ #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/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { using GfxFamily = XE_HPG_COREFamily; diff --git a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp index e02738aa10..e4c69eba3b 100644 --- a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp @@ -14,7 +14,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "platforms.h" diff --git a/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp index 76d66c8b76..60d6c483e5 100644 --- a/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/memory_manager/memory_pool.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { typedef XE_HPG_COREFamily Family; diff --git a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp index f938997737..d6c4c9cf29 100644 --- a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp @@ -13,7 +13,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "platforms.h" diff --git a/shared/test/common/gen11/command_encoder_tests_gen11.cpp b/shared/test/common/gen11/command_encoder_tests_gen11.cpp index 906e0b7792..a05622bd84 100644 --- a/shared/test/common/gen11/command_encoder_tests_gen11.cpp +++ b/shared/test/common/gen11/command_encoder_tests_gen11.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/blit_commands_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen11/image_surface_state_tests_gen11.cpp b/shared/test/common/gen11/image_surface_state_tests_gen11.cpp index 4e6bcc67a9..2ca36a25cc 100644 --- a/shared/test/common/gen11/image_surface_state_tests_gen11.cpp +++ b/shared/test/common/gen11/image_surface_state_tests_gen11.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen11/test_encode_math_gen11.cpp b/shared/test/common/gen11/test_encode_math_gen11.cpp index ed8eb4c832..b187862156 100644 --- a/shared/test/common/gen11/test_encode_math_gen11.cpp +++ b/shared/test/common/gen11/test_encode_math_gen11.cpp @@ -6,10 +6,12 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen12lp/adln/test_hw_info_config_adln.cpp b/shared/test/common/gen12lp/adln/test_hw_info_config_adln.cpp index 18a61346d9..e5db73fc48 100644 --- a/shared/test/common/gen12lp/adln/test_hw_info_config_adln.cpp +++ b/shared/test/common/gen12lp/adln/test_hw_info_config_adln.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adln.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp b/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp index 36deaa0073..1a3a0b9945 100644 --- a/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp +++ b/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp @@ -7,10 +7,12 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen12lp/hw_cmds_adlp.h" #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/helpers/preamble.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen12lp/adlp/test_hw_info_config_adlp.cpp b/shared/test/common/gen12lp/adlp/test_hw_info_config_adlp.cpp index da1b710029..6723f19aec 100644 --- a/shared/test/common/gen12lp/adlp/test_hw_info_config_adlp.cpp +++ b/shared/test/common/gen12lp/adlp/test_hw_info_config_adlp.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adlp.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp index c8747011b3..3aa091e48e 100644 --- a/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp +++ b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adls.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using AdlsHwInfo = ::testing::Test; diff --git a/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp b/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp index d142fba9c0..f52f5bf161 100644 --- a/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp +++ b/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp index 1c36226fa6..435b97cf86 100644 --- a/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen8/command_encoder_tests_gen8.cpp b/shared/test/common/gen8/command_encoder_tests_gen8.cpp index cf6ce574e5..f4376a454d 100644 --- a/shared/test/common/gen8/command_encoder_tests_gen8.cpp +++ b/shared/test/common/gen8/command_encoder_tests_gen8.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/blit_commands_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen8/image_surface_state_tests_gen8.cpp b/shared/test/common/gen8/image_surface_state_tests_gen8.cpp index aa79a7b3aa..12d6cd412c 100644 --- a/shared/test/common/gen8/image_surface_state_tests_gen8.cpp +++ b/shared/test/common/gen8/image_surface_state_tests_gen8.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen8/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen8/state_base_address_tests_gen8.cpp b/shared/test/common/gen8/state_base_address_tests_gen8.cpp index aae8c54941..aa1b8c4167 100644 --- a/shared/test/common/gen8/state_base_address_tests_gen8.cpp +++ b/shared/test/common/gen8/state_base_address_tests_gen8.cpp @@ -1,11 +1,14 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/test/common/helpers/state_base_address_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" BDWTEST_F(SBATest, givenUsedBindlessBuffersWhenAppendStateBaseAddressParametersIsCalledThenSBACmdHasNotBindingSurfaceStateProgrammed) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; diff --git a/shared/test/common/gen8/test_encode_math_gen8.cpp b/shared/test/common/gen8/test_encode_math_gen8.cpp index abe47e22ba..a67325945f 100644 --- a/shared/test/common/gen8/test_encode_math_gen8.cpp +++ b/shared/test/common/gen8/test_encode_math_gen8.cpp @@ -6,10 +6,12 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen9/command_encoder_tests_gen9.cpp b/shared/test/common/gen9/command_encoder_tests_gen9.cpp index 5f4242ba4d..97a8b28345 100644 --- a/shared/test/common/gen9/command_encoder_tests_gen9.cpp +++ b/shared/test/common/gen9/command_encoder_tests_gen9.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/gen9/image_surface_state_tests_gen9.cpp b/shared/test/common/gen9/image_surface_state_tests_gen9.cpp index 225184bb98..5cf5786f6a 100644 --- a/shared/test/common/gen9/image_surface_state_tests_gen9.cpp +++ b/shared/test/common/gen9/image_surface_state_tests_gen9.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen9/test_command_encoder_gen9.cpp b/shared/test/common/gen9/test_command_encoder_gen9.cpp index 1a1a3fd438..1c3cebd2e7 100644 --- a/shared/test/common/gen9/test_command_encoder_gen9.cpp +++ b/shared/test/common/gen9/test_command_encoder_gen9.cpp @@ -7,9 +7,11 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "reg_configs_common.h" diff --git a/shared/test/common/gen9/test_encode_math_gen9.cpp b/shared/test/common/gen9/test_encode_math_gen9.cpp index 46c84648d8..e5fb8e3843 100644 --- a/shared/test/common/gen9/test_encode_math_gen9.cpp +++ b/shared/test/common/gen9/test_encode_math_gen9.cpp @@ -6,10 +6,12 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/helpers/hw_helper_tests.h b/shared/test/common/helpers/hw_helper_tests.h index 249921477a..22c3afea11 100644 --- a/shared/test/common/helpers/hw_helper_tests.h +++ b/shared/test/common/helpers/hw_helper_tests.h @@ -7,11 +7,9 @@ #pragma once -#include "shared/source/device/device.h" #include "shared/source/helpers/constants.h" -#include "shared/source/helpers/hw_helper.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/helpers/state_base_address_tests.cpp b/shared/test/common/helpers/state_base_address_tests.cpp index 6a96f87abf..aa4a8e8212 100644 --- a/shared/test/common/helpers/state_base_address_tests.cpp +++ b/shared/test/common/helpers/state_base_address_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/state_base_address_tests.h" #include "shared/source/command_container/command_encoder.h" +#include "shared/test/common/test_macros/hw_test.h" using IsBetweenSklAndTgllp = IsWithinProducts; diff --git a/shared/test/common/helpers/state_base_address_tests.h b/shared/test/common/helpers/state_base_address_tests.h index 9168ff5af5..63ecfae8b6 100644 --- a/shared/test/common/helpers/state_base_address_tests.h +++ b/shared/test/common/helpers/state_base_address_tests.h @@ -13,7 +13,8 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" + +#include "gtest/gtest.h" struct SBATest : public NEO::DeviceFixture, public ::testing::Test { void SetUp() override { diff --git a/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp b/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp index 6f2dcdefe6..9a40c4c13c 100644 --- a/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp +++ b/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.h" #include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp b/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp index eb3c19e4c7..10628639c5 100644 --- a/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp +++ b/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.h" using namespace NEO; diff --git a/shared/test/common/test_macros/header/per_product_test_definitions.h b/shared/test/common/test_macros/header/per_product_test_definitions.h index 2eef4b9adb..4cd73dfc43 100644 --- a/shared/test/common/test_macros/header/per_product_test_definitions.h +++ b/shared/test/common/test_macros/header/per_product_test_definitions.h @@ -7,6 +7,10 @@ #pragma once +#include "shared/test/common/test_macros/hw_test_base.h" + +#include "gtest/gtest.h" + #ifdef TESTS_GEN8 #define GEN8TEST_F(test_fixture, test_name) GENTEST_F(IGFX_GEN8_CORE, test_fixture, test_name) #define GEN8TEST_P(test_fixture, test_name) GENTEST_P(IGFX_GEN8_CORE, test_fixture, test_name) diff --git a/shared/test/common/test_macros/hw_test.h b/shared/test/common/test_macros/hw_test.h index f1c8e202c2..eae0237c3b 100644 --- a/shared/test/common/test_macros/hw_test.h +++ b/shared/test/common/test_macros/hw_test.h @@ -7,8 +7,8 @@ #pragma once #include "shared/source/helpers/hw_info.h" +#include "shared/test/common/test_macros/hw_test_base.h" #include "shared/test/common/test_macros/test.h" -#include "shared/test/common/test_macros/test_excludes.h" #include "gtest/gtest.h" #include "hw_cmds.h" @@ -280,61 +280,6 @@ HWCMDTEST_TEST_(cmdset_gen_base, test_fixture, test_name, test_fixture, \ ::testing::internal::GetTypeId()) -#define CALL_IF_MATCH(match_core, match_product, expr) \ - auto matchCore = match_core; \ - auto matchProduct = match_product; \ - if ((::renderCoreFamily == matchCore) && \ - (IGFX_MAX_PRODUCT == matchProduct || ::productFamily == matchProduct)) { \ - expr; \ - } - -#define FAMILYTEST_TEST_(test_suite_name, test_name, parent_class, parent_id, match_core, match_product) \ - CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ - \ - class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public parent_class { \ - public: \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ - () {} \ - \ - private: \ - template \ - void testBodyHw(); \ - \ - void TestBody() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_MATCH(match_core, match_product, \ - testBodyHw::GfxFamily>()) \ - } \ - } \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - CALL_IF_MATCH(match_core, match_product, parent_class::SetUp()) \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_MATCH(match_core, match_product, parent_class::TearDown()) \ - } \ - } \ - static ::testing::TestInfo *const test_info_ GTEST_ATTRIBUTE_UNUSED_; \ - GTEST_DISALLOW_COPY_AND_ASSIGN_( \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ - }; \ - \ - ::testing::TestInfo *const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::test_info_ = \ - ::testing::internal::MakeAndRegisterTestInfo( \ - #test_suite_name, #test_name, nullptr, nullptr, \ - ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \ - ::testing::internal::SuiteApiResolver< \ - parent_class>::GetSetUpCaseOrSuite(), \ - ::testing::internal::SuiteApiResolver< \ - parent_class>::GetTearDownCaseOrSuite(), \ - new ::testing::internal::TestFactoryImpl); \ - template \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::testBodyHw() - // Equivalent Hw specific macro for permuted tests // Test can use FamilyType in the test -- equivalent to SKLFamily #define HWTEST_P(test_suite_name, test_name) \ @@ -583,62 +528,6 @@ template \ void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::matchBody() -#define FAMILYTEST_TEST_P(test_suite_name, test_name, match_core, match_product) \ - CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ - class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public test_suite_name { \ - public: \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ - () {} \ - template \ - void testBodyHw(); \ - \ - void TestBody() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_MATCH(match_core, match_product, \ - testBodyHw::GfxFamily>()) \ - } \ - } \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - CALL_IF_MATCH(match_core, match_product, test_suite_name::SetUp()) \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_MATCH(match_core, match_product, test_suite_name::TearDown()) \ - } \ - } \ - \ - private: \ - static int AddToRegistry() { \ - ::testing::UnitTest::GetInstance()->parameterized_test_registry().GetTestCasePatternHolder( \ - #test_suite_name, ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ - ->AddTestPattern( \ - #test_suite_name, \ - #test_name, \ - new ::testing::internal::TestMetaFactory< \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)>()); \ - return 0; \ - } \ - static int gtest_registering_dummy_; \ - GTEST_DISALLOW_COPY_AND_ASSIGN_( \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ - }; \ - int GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::gtest_registering_dummy_ = \ - GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry(); \ - template \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::testBodyHw() - -#define GENTEST_F(gfx_core, test_fixture, test_name) \ - FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \ - ::testing::internal::GetTypeId(), \ - gfx_core, IGFX_MAX_PRODUCT) - -#define GENTEST_P(gfx_core, test_suite_name, test_name) \ - FAMILYTEST_TEST_P(test_suite_name, test_name, gfx_core, IGFX_MAX_PRODUCT) - #include "per_product_test_definitions.h" #define HWTEST_TYPED_TEST(CaseName, TestName) \ diff --git a/shared/test/common/test_macros/hw_test_base.h b/shared/test/common/test_macros/hw_test_base.h new file mode 100644 index 0000000000..b3f9f1f8c8 --- /dev/null +++ b/shared/test/common/test_macros/hw_test_base.h @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2021-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once +#include "shared/source/helpers/hw_info.h" +#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" +#include "shared/test/common/test_macros/test_excludes.h" + +#define HWTEST_EXCLUDE_PRODUCT(test_suite_name, test_name, family) \ + struct test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family { \ + test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family() { \ + NEO::TestExcludes::addTestExclude(#test_suite_name #test_name, family); \ + } \ + } test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family##_init; + +#define IS_TEST_EXCLUDED(test_suite_name, test_name) \ + NEO::TestExcludes::isTestExcluded(#test_suite_name #test_name, ::productFamily, ::renderCoreFamily) + +#define CALL_IF_MATCH(match_core, match_product, expr) \ + auto matchCore = match_core; \ + auto matchProduct = match_product; \ + if ((::renderCoreFamily == matchCore) && \ + (IGFX_MAX_PRODUCT == matchProduct || ::productFamily == matchProduct)) { \ + expr; \ + } + +#define GENTEST_F(gfx_core, test_fixture, test_name) \ + FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \ + ::testing::internal::GetTypeId(), \ + gfx_core, IGFX_MAX_PRODUCT) + +#define GENTEST_P(gfx_core, test_suite_name, test_name) \ + FAMILYTEST_TEST_P(test_suite_name, test_name, gfx_core, IGFX_MAX_PRODUCT) + +#define FAMILYTEST_TEST_(test_suite_name, test_name, parent_class, parent_id, match_core, match_product) \ + CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ + \ + class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public parent_class { \ + public: \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ + () {} \ + \ + private: \ + template \ + void testBodyHw(); \ + \ + void TestBody() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_MATCH(match_core, match_product, \ + testBodyHw::GfxFamily>()) \ + } \ + } \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + CALL_IF_MATCH(match_core, match_product, parent_class::SetUp()) \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_MATCH(match_core, match_product, parent_class::TearDown()) \ + } \ + } \ + static ::testing::TestInfo *const test_info_ GTEST_ATTRIBUTE_UNUSED_; \ + GTEST_DISALLOW_COPY_AND_ASSIGN_( \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ + }; \ + \ + ::testing::TestInfo *const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::test_info_ = \ + ::testing::internal::MakeAndRegisterTestInfo( \ + #test_suite_name, #test_name, nullptr, nullptr, \ + ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \ + ::testing::internal::SuiteApiResolver< \ + parent_class>::GetSetUpCaseOrSuite(), \ + ::testing::internal::SuiteApiResolver< \ + parent_class>::GetTearDownCaseOrSuite(), \ + new ::testing::internal::TestFactoryImpl); \ + template \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::testBodyHw() + +#define FAMILYTEST_TEST_P(test_suite_name, test_name, match_core, match_product) \ + CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ + class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public test_suite_name { \ + public: \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ + () {} \ + template \ + void testBodyHw(); \ + \ + void TestBody() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_MATCH(match_core, match_product, \ + testBodyHw::GfxFamily>()) \ + } \ + } \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + CALL_IF_MATCH(match_core, match_product, test_suite_name::SetUp()) \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_MATCH(match_core, match_product, test_suite_name::TearDown()) \ + } \ + } \ + \ + private: \ + static int AddToRegistry() { \ + ::testing::UnitTest::GetInstance()->parameterized_test_registry().GetTestCasePatternHolder( \ + #test_suite_name, ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ + ->AddTestPattern( \ + #test_suite_name, \ + #test_name, \ + new ::testing::internal::TestMetaFactory< \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)>()); \ + return 0; \ + } \ + static int gtest_registering_dummy_; \ + GTEST_DISALLOW_COPY_AND_ASSIGN_( \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ + }; \ + int GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::gtest_registering_dummy_ = \ + GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry(); \ + template \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::testBodyHw() diff --git a/shared/test/common/test_macros/test.h b/shared/test/common/test_macros/test.h index b6bc7a1da7..d59d0b62ad 100644 --- a/shared/test/common/test_macros/test.h +++ b/shared/test/common/test_macros/test.h @@ -8,12 +8,8 @@ #pragma once #include "gtest/gtest.h" -#include "igfxfmid.h" #include "test_mode.h" -extern PRODUCT_FAMILY productFamily; -extern GFXCORE_FAMILY renderCoreFamily; - template struct Test : public Fixture, @@ -37,16 +33,6 @@ struct Test #define CHECK_TEST_NAME_LENGTH(test_fixture, test_name) \ CHECK_TEST_NAME_LENGTH_WITH_MAX(test_fixture, test_name, TEST_MAX_LENGTH) -#define HWTEST_EXCLUDE_PRODUCT(test_suite_name, test_name, family) \ - struct test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family { \ - test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family() { \ - NEO::TestExcludes::addTestExclude(#test_suite_name #test_name, family); \ - } \ - } test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family##_init; - -#define IS_TEST_EXCLUDED(test_suite_name, test_name) \ - NEO::TestExcludes::isTestExcluded(#test_suite_name #test_name, ::productFamily, ::renderCoreFamily) - #ifdef TEST_F #undef TEST_F #endif diff --git a/shared/test/common/test_macros/test_base.h b/shared/test/common/test_macros/test_base.h new file mode 100644 index 0000000000..5b079f8504 --- /dev/null +++ b/shared/test/common/test_macros/test_base.h @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2021-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once + +#include "igfxfmid.h" + +extern PRODUCT_FAMILY productFamily; +extern GFXCORE_FAMILY renderCoreFamily; diff --git a/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp b/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp index 741e0fd01c..87eb3285f1 100644 --- a/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp +++ b/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp b/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp index 6f7c438b1f..7f6b8d7b7c 100644 --- a/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp +++ b/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp @@ -7,9 +7,11 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp index a785d0e517..431153faf3 100644 --- a/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" using GenStruct = NEO::XE_HPG_CORE; using GenGfxFamily = NEO::XE_HPG_COREFamily; #include "shared/test/common/cmd_parse/cmd_parse_xehp_and_later.inl" diff --git a/shared/test/common/xe_hpg_core/dg2/test_encode_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/test_encode_dg2.cpp index c8646dc356..139298c7f5 100644 --- a/shared/test/common/xe_hpg_core/dg2/test_encode_dg2.cpp +++ b/shared/test/common/xe_hpg_core/dg2/test_encode_dg2.cpp @@ -8,9 +8,10 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/command_stream/stream_properties.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp index a403451424..a4db49f777 100644 --- a/shared/test/common/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp +++ b/shared/test/common/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp @@ -8,10 +8,11 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/dg2/test_hw_helper_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/test_hw_helper_dg2.cpp index 6aeeb4574a..59342dda72 100644 --- a/shared/test/common/xe_hpg_core/dg2/test_hw_helper_dg2.cpp +++ b/shared/test/common/xe_hpg_core/dg2/test_hw_helper_dg2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,10 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp index c0cce157e9..b2cf46e830 100644 --- a/shared/test/common/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp +++ b/shared/test/common/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp @@ -7,8 +7,10 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp index 84697a2274..04eeda12a8 100644 --- a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp index eb80b75ebb..82f3dc561b 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp @@ -22,7 +22,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_context.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include #include diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp index b4492bb024..400e5f88f4 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_context.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include #include diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp index 96a131f1c8..389103ea21 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp b/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp index 4b5dd26dee..5f093d911d 100644 --- a/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp +++ b/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp @@ -16,6 +16,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_base.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" TEST(IsDeviceBinaryFormatAr, GivenValidBinaryThenReturnTrue) { diff --git a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp index ef8214be61..5f63445a2f 100644 --- a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -6,13 +6,15 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp b/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp index b77f70c2f1..3cb7392697 100644 --- a/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp +++ b/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds_ehl.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using EhlHwInfo = ::testing::Test; diff --git a/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp b/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp index a770e81b39..5a01b1013e 100644 --- a/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp +++ b/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp @@ -6,7 +6,8 @@ */ #include "shared/source/gen11/hw_cmds_base.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; @@ -55,4 +56,4 @@ GEN11TEST_F(Gen11HwCmdTest, givenMediaSurfaceStateWhenProgrammingMocsThenMocsInd uint32_t expectedMocsIndex = (mocs >> 1); mediaSurfaceState.setSurfaceMemoryObjectControlState(mocs); EXPECT_EQ(expectedMocsIndex, mediaSurfaceState.TheStructure.Common.SurfaceMemoryObjectControlState_IndexToMocsTables); -} \ No newline at end of file +} diff --git a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp index 91488d22b3..568619c6c1 100644 --- a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 7b0c1459bf..5ede5b0a02 100644 --- a/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -6,13 +6,15 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp b/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp index 4c334f9748..ce24e35511 100644 --- a/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp +++ b/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds_lkf.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(LkfHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) { diff --git a/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp b/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp index 066e27c013..2602d02cdf 100644 --- a/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/windows/gmm_callbacks.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp index 3105376832..c84f7c222b 100644 --- a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adln.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index a2fe1bdde6..d97a0a0fb4 100644 --- a/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,6 +15,7 @@ #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_context.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl b/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl index e8817288e1..e16bde3494 100644 --- a/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_aub_stream.h" #include "shared/test/common/mocks/mock_csr_simulated_common_hw.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp index 40e2c1057d..69e7e7ff0b 100644 --- a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp @@ -6,9 +6,12 @@ */ #include "shared/source/command_stream/preemption.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using HwHelperTestGen12Lp = HwHelperTest; diff --git a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp index 41855ede37..67c810fabd 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp @@ -5,10 +5,12 @@ * */ +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp index a785efd7e6..f8bf02bc7a 100644 --- a/shared/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using BdwUsDeviceIdTest = ::testing::Test; diff --git a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp index d0932a93c0..d50d29abd4 100644 --- a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/coherency_tests_gen8.cpp b/shared/test/unit_test/gen8/coherency_tests_gen8.cpp index f3b065e96d..18e23395d7 100644 --- a/shared/test/unit_test/gen8/coherency_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/coherency_tests_gen8.cpp @@ -5,12 +5,14 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp index cea5ca693d..eb54a0216d 100644 --- a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp @@ -5,10 +5,12 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl" using HwHelperTestGen8 = HwHelperTest; diff --git a/shared/test/unit_test/gen8/sampler_tests_gen8.cpp b/shared/test/unit_test/gen8/sampler_tests_gen8.cpp index 203ffa0c86..54cf8d72ac 100644 --- a/shared/test/unit_test/gen8/sampler_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/sampler_tests_gen8.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include diff --git a/shared/test/unit_test/gen8/test_device_caps_gen8.cpp b/shared/test/unit_test/gen8/test_device_caps_gen8.cpp index fd686609c0..10311cf9f3 100644 --- a/shared/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/shared/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -5,9 +5,11 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/test_sample_gen8.cpp b/shared/test/unit_test/gen8/test_sample_gen8.cpp index fd34f5565d..13f8208de3 100644 --- a/shared/test/unit_test/gen8/test_sample_gen8.cpp +++ b/shared/test/unit_test/gen8/test_sample_gen8.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp b/shared/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp index e6bdbf3088..70f6bfc457 100644 --- a/shared/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/windows/gmm_callbacks.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp b/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp index 2b9e7b5b67..a41a800ed6 100644 --- a/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp +++ b/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp @@ -6,7 +6,8 @@ */ #include "shared/source/gen9/hw_cmds_base.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; @@ -52,4 +53,4 @@ GEN9TEST_F(Gen9HwCmdTest, givenMediaSurfaceStateWhenProgrammingMocsThenMocsIndex uint32_t expectedMocsIndex = (mocs >> 1); mediaSurfaceState.setSurfaceMemoryObjectControlState(mocs); EXPECT_EQ(expectedMocsIndex, mediaSurfaceState.TheStructure.Common.SurfaceMemoryObjectControlState_IndexToMocsTables); -} \ No newline at end of file +} diff --git a/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp b/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp index 4b39b0f2df..560871554d 100644 --- a/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/windows/gmm_callbacks.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/image/image_surface_state_fixture.h b/shared/test/unit_test/image/image_surface_state_fixture.h index 1d878d1031..531e30bf04 100644 --- a/shared/test/unit_test/image/image_surface_state_fixture.h +++ b/shared/test/unit_test/image/image_surface_state_fixture.h @@ -16,7 +16,6 @@ #include "shared/source/memory_manager/surface.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/image/image_surface_state_tests.cpp b/shared/test/unit_test/image/image_surface_state_tests.cpp index 0002e0ee73..3236fd046b 100644 --- a/shared/test/unit_test/image/image_surface_state_tests.cpp +++ b/shared/test/unit_test/image/image_surface_state_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp index faebbe72d7..030686f521 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp @@ -6,11 +6,13 @@ */ #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/memory_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/linux/drm_mock_prod_dg1.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp index 5cc08e04f9..f99e8df29a 100644 --- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp +++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp @@ -8,10 +8,12 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/stream_properties.h" #include "shared/source/helpers/preamble.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preemption_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preemption_xe_hp_sdv.cpp index 555a6422a3..9e07f814e8 100644 --- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preemption_xe_hp_sdv.cpp +++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preemption_xe_hp_sdv.cpp @@ -9,10 +9,12 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_debugger.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include diff --git a/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp index 68f04f41b2..a4419e1b2c 100644 --- a/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp @@ -8,10 +8,12 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_aub_center.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using XeHpcCoreAubCenterTests = ::testing::Test; diff --git a/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp index 8014084119..b6d0288549 100644 --- a/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp @@ -6,13 +6,15 @@ */ #include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_os_context.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using AubCommandStreamReceiverXeHpcCoreTests = ::testing::Test; diff --git a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp index 5996ebd08e..1f434d1caf 100644 --- a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp @@ -8,7 +8,8 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp index 765d8d9dfa..3fe10a0f04 100644 --- a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp @@ -7,9 +7,11 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp index c6b3ce8543..61da9faaeb 100644 --- a/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp +++ b/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp @@ -6,7 +6,8 @@ */ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp index 8721c37be4..d69231ea8a 100644 --- a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp +++ b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp index 19fe0b0314..f12ee1f655 100644 --- a/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp index bfc516f0f6..7eb61613a0 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp @@ -14,8 +14,10 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/product_config_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "platforms.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp index a1cbe6c707..189a3e20b5 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp @@ -8,9 +8,11 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp index 00e727b3f2..f0eaad9a48 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp @@ -7,9 +7,11 @@ #include "shared/source/helpers/constants.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp index 287c16dbe9..13a34c46e4 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/helpers/product_config_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "platforms.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp index 732c1d196d..bc3b52bd0b 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_container/command_encoder.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/command_container_fixture.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index 9398155145..6f139a7ae2 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -7,8 +7,10 @@ #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp index c711166b7d..1e9bee89c9 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp index b7f6e36fba..6df12acd10 100644 --- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp @@ -11,7 +11,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/command_container_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp index 2c40bdb605..f93a75b6ee 100644 --- a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp @@ -5,8 +5,10 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp index 2df341daef..1273aa4b9e 100644 --- a/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp +++ b/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp @@ -8,10 +8,12 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_aub_center.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using XeHpgCoreAubCenterTests = ::testing::Test; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp index cfcb63a2de..e6c5b3ae8a 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp @@ -14,8 +14,10 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/product_config_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "platforms.h" diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp index 110d2f1902..887c93b0a1 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp @@ -6,9 +6,11 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp index 8887e463c9..851c4aebd7 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp @@ -6,7 +6,9 @@ */ #include "shared/source/helpers/product_config_helper.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" #include "platforms.h" diff --git a/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp b/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp index 66500d4b8d..49d4e4add7 100644 --- a/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp +++ b/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp @@ -6,7 +6,8 @@ */ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp index 3861fa2b1b..cd7b26b2d5 100644 --- a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp +++ b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp @@ -7,11 +7,13 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" using HwHelperTestXeHpgCore = HwHelperTest;