diff --git a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp index 6e844cb98b..0ffbf9562c 100644 --- a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/test_files.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdqueue/cmdqueue.h" #include "level_zero/core/source/context/context_imp.h" diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp index 5556578039..4b252eca0d 100644 --- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_io_functions.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdqueue/cmdqueue.h" #include "level_zero/core/source/context/context_imp.h" diff --git a/level_zero/core/test/aub_tests/xe_hpc_core/pvc/l0_aub_tests_excludes_pvc.cpp b/level_zero/core/test/aub_tests/xe_hpc_core/pvc/l0_aub_tests_excludes_pvc.cpp index 00cd47bf4f..13377ff559 100644 --- a/level_zero/core/test/aub_tests/xe_hpc_core/pvc/l0_aub_tests_excludes_pvc.cpp +++ b/level_zero/core/test/aub_tests/xe_hpc_core/pvc/l0_aub_tests_excludes_pvc.cpp @@ -5,6 +5,6 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(L0BindlessAub, GivenBindlessKernelWhenExecutedThenOutputIsCorrect, IGFX_PVC); diff --git a/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp b/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp index dc0b0b95be..8415ee0893 100644 --- a/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp +++ b/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/driver/driver_imp.h" diff --git a/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp b/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp index 799ee9e552..555567f87e 100644 --- a/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp +++ b/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp b/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp index e31e489b6d..bf1647a65f 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/helpers/l3_range.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp index 2807c0fca8..41d630cbb5 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp @@ -11,7 +11,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp index 6ed3d8f1a4..bff72c75ab 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp index 5cc4346f25..e1e3424542 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/mocks/mock_timestamp_packet.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_l0_hw_helper_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_l0_hw_helper_gen12lp.cpp index 969cce516a..03a7f4bbb2 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_l0_hw_helper_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_l0_hw_helper_gen12lp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp index f51c6c8ffb..49c5c89eb0 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp index 25c6108bdc..4570ff4338 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp @@ -7,7 +7,7 @@ #include "shared/source/gen9/reg_configs.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp index 94ed30033c..1879de397e 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_cmdlist_create_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp index ef7e03a75e..5f9c60deaa 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 @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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_cmdlist_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp index e1031c83bc..ad0a2dbb1a 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/gen9/reg_configs.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/gen9/cmdlist_gen9.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 c9ea5039cc..c32a33e5d6 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 @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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/gen9/test_cmdqueue_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp index 1fb579291b..7982fa69a7 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" diff --git a/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp index 3b359d89f1..980c034bc5 100644 --- a/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp index d56d448a97..cdeed8fb7e 100644 --- a/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/os_interface/windows/wddm_l0_tests.cpp b/level_zero/core/test/unit_tests/os_interface/windows/wddm_l0_tests.cpp index b746649824..22b340c3c8 100644 --- a/level_zero/core/test/unit_tests/os_interface/windows/wddm_l0_tests.cpp +++ b/level_zero/core/test/unit_tests/os_interface/windows/wddm_l0_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp index 72a524f716..381a0fbb21 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_builtinslib.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/test/unit_tests/mocks/mock_device_recompile_built_ins.h" diff --git a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp index 75dcd1d240..0566a8283f 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_compiler_interface_spirv.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/source/device/device_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp b/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp index 8c73304c79..45b5d7903d 100644 --- a/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp +++ b/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cache/windows/cache_reservation_impl.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp index ac30eab329..2efcc05336 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp index d8c0be59d3..555d4363c3 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #include "level_zero/core/source/image/image_hw.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp index 6805e367bc..c635341085 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp @@ -8,7 +8,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/image/image_hw.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp index fc6c39aa0f..cbf14b34f4 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/event/event.h" #include "level_zero/core/source/image/image_hw.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp index 82993402f6..7308b39e33 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/kernel/kernel_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp index 84c9301e45..28f3b7bd34 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp index e0ac071544..f56c9cc46f 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp index 1ba3b5053a..ee83474661 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/hw_helper.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp index d4e3fc8b69..9f07b3b4c6 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp index d22717a027..c5bf2af04f 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index cb3c171f04..f8d25da343 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index 3aa760eb4a..456a0ebdff 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp index 89fc185fdb..490e8b9cca 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp index a24b08abb1..09e664a6ce 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #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_append_signal_event.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp index 549f6d852a..fab6b27928 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp index 04242e4793..bcda2f4096 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp index 59e0874af8..5273d58728 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp index 9227fc110b..9b9ac842b8 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp @@ -8,7 +8,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/source/kernel/kernel_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp index b149355f3b..a1a3aac836 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp @@ -10,7 +10,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/cmdlist/cmdlist_hw.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp index 9ddce6c6aa..0b5a48e182 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/mocks/mock_bindless_heaps_helper.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp index 9833ca753c..5af894edf9 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp @@ -15,8 +15,8 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_memory_operations_handler.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/mock_method_macros.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp index 80302fed31..0aeb89c5f8 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/mocks/mock_bindless_heaps_helper.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp index 8da712cd79..428d1b7a7d 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp @@ -15,7 +15,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/fence/fence.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp index d672c3daa0..b47639f374 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/fence/fence.h" diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp index b91f6b812e..90d575627e 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_svm_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "level_zero/core/source/cmdqueue/cmdqueue.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp index 206c32e1cd..6828a1e7c4 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp @@ -10,7 +10,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_allocation.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/device/device.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index a8bacd89f4..bb4963cc52 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/preamble.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/mocks/mock_gmm_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/event/event.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp index 11ed1519c4..e93d9a5d59 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/preamble.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/image/image_hw.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp index a8085f65e9..fc621e0f19 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/mocks/mock_gmm_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_single_address_space.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_single_address_space.cpp index a764cdbaf1..acafafeaa2 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_single_address_space.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_single_address_space.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp index 371f88e836..92b639bf0a 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_compilers.h" #include "shared/test/common/mocks/mock_elf.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "level_zero/core/source/module/module_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp index 4c0670071c..d6bd95be12 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/sources/debugger/windows/test_l0_debugger_windows.cpp b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp index 73ad26769b..67dfd5f44f 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/windows/mock_gdi_interface.h" #include "shared/test/common/mocks/windows/mock_wddm_eudebug.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp b/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp index d23b3aee60..c653715e23 100644 --- a/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp +++ b/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" diff --git a/level_zero/core/test/unit_tests/sources/device/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_device.cpp index a496d5e954..2a1f74e90c 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_device.cpp @@ -25,7 +25,7 @@ #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cache/cache_reservation.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp index 0ed56b7111..53cf90ecef 100644 --- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_compilers.h" #include "shared/test/common/mocks/mock_io_functions.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/api/driver_experimental/public/zex_api.h" #include "level_zero/api/driver_experimental/public/zex_driver.h" diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index eb56626c48..4dc331f3cd 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_memory_operations_handler.h" #include "shared/test/common/mocks/mock_timestamp_packet.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/driver/driver_handle_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp index 5f48a38dcc..73e3fbc4f7 100644 --- a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp +++ b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/fence/fence.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp index 207ec55617..b69a590ffb 100644 --- a/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/heap_assigner.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" diff --git a/level_zero/core/test/unit_tests/sources/helper/l0_hw_helper_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/l0_hw_helper_tests.cpp index b16d4b9424..a6e6a83bbe 100644 --- a/level_zero/core/test/unit_tests/sources/helper/l0_hw_helper_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/helper/l0_hw_helper_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/ptr_math.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index aaf127d954..e913520b27 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_sip.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" #include "level_zero/core/source/image/image_format_desc_helper.h" diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index 1e89226288..aca8627fd6 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/helpers/engine_descriptor_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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp index 2a3a544a15..809a51d684 100644 --- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_driver_model.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_hw.h" #include "level_zero/core/source/context/context_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 6a630b8e31..df60a01f40 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_elf.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" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/device_binary_format/zebin_tests.h" diff --git a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp index fd5db1cc0e..8596927b19 100644 --- a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp +++ b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/utilities/numeric.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/sampler/sampler_hw.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp index 477c561770..073a0fc190 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_packet.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_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 9d7c0394c3..3262c0f750 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 @@ -10,7 +10,7 @@ #include "shared/source/helpers/preamble.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_cmdqueue_enqueuecommandlist_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp index 51eddf782b..aabfa73772 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/linear_stream.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/test.h" +#include "shared/test/common/test_macros/hw_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_hp_core/test_device_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp index 2288a84760..8de441a95b 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.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 65a147fce3..59e031df56 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,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_hp_core/test_module_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp index 21a5e2c369..a548cc729a 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/kernel/kernel_properties.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp index 9a5c17086f..e048bf6357 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_builtinslib.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/test/unit_tests/mocks/mock_device_recompile_built_ins.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 07d0fe1641..8ec61aef08 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 e666ec68b3..b7c227f75d 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 @@ -8,7 +8,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_cmdlist_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp index 49a9ede2c9..9cd2fa0078 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp index 64cad11998..18a291e6b7 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp index b7795b3e4e..cc5a1aab9d 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_imp.h" #include "level_zero/core/source/cmdqueue/cmdqueue.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 d002abd98f..e432c0f4b4 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,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.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_module_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp index 7e3de39dd7..877315e237 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_module_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/kernel/kernel_properties.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp index dabb5e5e7e..a33c8c7692 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp @@ -7,7 +7,7 @@ #include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp index e559306171..3e921f4079 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_hw.h" #include "level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp index 2ed2b2a647..701c4f146d 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp index 76244f977e..1efdd77e05 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/utilities/numeric.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/sampler/sampler_hw.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp index eb3b0f42b0..94ca378bbf 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.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 0121d4697d..5dada4e296 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 @@ -8,7 +8,7 @@ #include "shared/source/command_stream/linear_stream.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/test.h" +#include "shared/test/common/test_macros/hw_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_device_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp index 3ef48d16cc..89ed07cfd7 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp index d69a43e01e..d670c34e2f 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/image/image.h" #include "level_zero/core/source/image/image_hw.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 2eb7ab1d77..59361ac21b 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,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_hpg_core/test_module_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp index 3f84f08de1..c7b71a37a1 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_module_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/kernel/kernel_properties.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp index d7f8d76217..49e9ccd089 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/mocks/mock_gmm_helper.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/eu_thread_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/eu_thread_tests.cpp index 066c69be58..e8fc3056e2 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/eu_thread_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/eu_thread_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/tools/source/debug/eu_thread.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp index 473925edc7..bbd31f5ec4 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_sip.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp index 71bed6db86..9c4ba0e216 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/windows/wddm_allocation.h" #include "shared/test/common/mocks/windows/mock_wddm_eudebug.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/debug/windows/debug_session.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 4fcf49e1f3..41f1bb2ba5 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 @@ -8,7 +8,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/linux/test_metric_ip_sampling_linux.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp index 783cead244..c26204afab 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index 64819fa1e8..366cfdfa39 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp index 80476f1130..9f1b5f4bb9 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/libult/linux/drm_mock.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp index 3e5e2d3124..9115d5c3c1 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp index 8800d6976c..cc8ca9a958 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_wddm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h index 3be6ff73c1..7dc239edd5 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/sysman.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h index 4f78ed1413..e495424587 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h @@ -10,7 +10,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/sysman.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp index 03ec12de8a..40d9a1bd32 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/debug_env_reader.h" #include "shared/test/common/mocks/mock_driver_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 9d89ce41c8..782029b136 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -11,7 +11,7 @@ #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_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/ult_limits.h" #include "opencl/source/api/api.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp index 4edbfe4108..122a6d5c05 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/array_count.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index 249b38b6a1..5171ef954e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/helpers/unit_test_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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp index cb2f80c128..e93ffffd6c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/tests_configuration.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp index d504213c50..85ee105fc4 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp @@ -9,7 +9,7 @@ #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_scratch_space_controller_xehp_and_later.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp index 3100991475..fd899e78d4 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp @@ -10,7 +10,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_allocation_properties.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/extensions/public/cl_ext_private.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp index 242f567769..bcec94f536 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h" #include "shared/source/memory_manager/allocations_list.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp index 2dcfd6a78c..301b49cf68 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/constants.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/single_tile_products_excludes.cpp b/opencl/test/unit_test/aub_tests/command_queue/single_tile_products_excludes.cpp index 03c9063d6b..0dfc963669 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/single_tile_products_excludes.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/single_tile_products_excludes.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(FourTilesAllContextsTest, GENERATEONLY_givenFourTilesAndAllContextsWhenSubmittingThenDataIsValid, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(FourTilesDualContextTest, HEAVY_givenFourTilesAndDualContextWhenSubmittingThenDataIsValid, IGFX_XE_HPG_CORE); diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index b295798928..6fb16a02a9 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -12,7 +12,7 @@ #include "shared/source/os_interface/os_context.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.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 "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h index 6c43fd0c4f..45d5bd7d87 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "aub_mapper.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp index afc9cf33d2..314e2f97f4 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index 870f30505d..6f72c7d0b4 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ #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/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/event.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.cpp index 1eb5294575..cbbf89dbd3 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp index 89ebd8c4ff..dbc78c396b 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp index 8fd7c06832..bf47742bc1 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp index 16ccba8d8e..b9ab4455a8 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp index e1b86c6f88..e38fbedfe9 100644 --- a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp index 5a7e9a97b1..3c0ab3c191 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(MiAtomicAubTest, GivenSystemMemoryWhenDispatchingAtomicMove4BytesOperationThenExpectCorrectEndValues, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(AubMemDumpTests, GivenReserveMaxAddressThenExpectationsAreMet, IGFX_XE_HPC_CORE); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp index 31f4e90f0a..ea8158387a 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h" diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp index c073491ba2..cdf41a6fe9 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/mem_obj/buffer.h" 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 209e8059bb..4cb1b0280b 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp index 9de7d3e920..40f60138fb 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 9880fc70b2..9ef48b3af0 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 @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/command_queue/blit_enqueue_1_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp index 06acd3a208..72bc8fa07b 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp index ee04d59919..b2dd3bc0ff 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp index 105cf7ecba..26f00e6425 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp @@ -9,7 +9,7 @@ #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_graphics_allocation.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 8bcfb4db45..08f7692eb5 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index c5ae1a0050..3ac1a64054 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_logical_state_helper.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/event/event_builder.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp index 529efa5299..918d36e283 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/resource_barrier.h" #include "opencl/source/event/event_builder.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index cc10e3dc36..b34a1d9426 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -10,8 +10,8 @@ #include "shared/test/common/helpers/kernel_binary_helper.h" #include "shared/test/common/helpers/kernel_filename_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/mock_method_macros.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 6712bc0fa6..093e9f16d4 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/mocks/mock_internal_allocation_storage.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index a67d919b15..7ec38ce02b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp index 809fd6e39a..b5dccb601a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/resource_barrier.h" #include "opencl/source/event/event_builder.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index 8020a9ee87..95541574e6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp index 5e6da4f7e4..e5bc1a30ad 100644 --- a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.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/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index 50f4d4115a..e03de7d82f 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" diff --git a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp index a4833521bf..a7a2d2df73 100644 --- a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp index c878a6a5d6..e437e1397c 100644 --- a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/local_work_size.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/cl_local_work_size.h" #include "opencl/source/helpers/dispatch_info.h" diff --git a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp index a0cab41327..88d893c00b 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index f713165425..432cae3b5f 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index d656479c26..c365262969 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/program/sync_buffer_handler.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index a3ab57a451..d7cda32b27 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/local_work_size.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp index 25d7039350..95e4923edf 100644 --- a/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp @@ -9,7 +9,7 @@ #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_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/cmd_buffer_validator.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp index defdedb6bc..c1981ec8e6 100644 --- a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp index 50119aab2e..0db68dbe6a 100644 --- a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_tbx_csr.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" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp index 795048d351..79d1707483 100644 --- a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp +++ b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index 219902a1a7..75bfea6ca8 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index e436831240..d8453eece1 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" #include "shared/test/common/mocks/mock_hw_helper.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp index ff0863479e..7ddcd4661a 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -18,7 +18,7 @@ #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/mocks/mock_svm_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp index 0aa50e35b1..fae3c36d1e 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/wait_status.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index 653348d803..3f41c76a4b 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -27,7 +27,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp index 543259352a..ae1ceaf94a 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_debugger.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h index 0cebd713c7..23b3638149 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#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" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp index 40a539b586..b2cadcd07f 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_csr.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 "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp index 894d182f01..abc113c80b 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp @@ -26,7 +26,7 @@ #include "shared/test/common/mocks/mock_scratch_space_controller_xehp_and_later.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/command_stream/command_stream_receiver_mt_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp index 894572b107..2041d63956 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp @@ -7,7 +7,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 43d4a1184f..93925fc842 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -26,7 +26,7 @@ #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_execution_environment.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 "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/source/helpers/dispatch_info.h" diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index e543c4a553..13498ead8d 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/create_command_stream.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp index 235d0d3834..e9bc8c8aa7 100644 --- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp +++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_experimental_command_buffer.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp index 6b798ca77d..3681655e00 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/create_command_stream.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index ef34813c02..87586fdd53 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.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" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 4125658c39..f308c08753 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/mocks/mock_deferred_deleter.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.inl" diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 7776944ced..9c89f1a5c2 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -22,7 +22,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index 7a78b28700..949f879e17 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_driver_info.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 "shared/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/source/cl_device/cl_device_info_map.h" diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 19c5915094..6f783d724d 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 9f99a2202d..7cc214b5b2 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" diff --git a/opencl/test/unit_test/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h index 23baa65609..76cff3dbe9 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.h +++ b/opencl/test/unit_test/fixtures/image_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h index 4171c8570c..c9a1aa10f3 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#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/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index fe88634e64..232ac69ddd 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/excludes_ocl_ehl.cpp b/opencl/test/unit_test/gen11/ehl/excludes_ocl_ehl.cpp index ef3dd3960e..b1fc118055 100644 --- a/opencl/test/unit_test/gen11/ehl/excludes_ocl_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/excludes_ocl_ehl.cpp @@ -5,6 +5,6 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE); 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 46896c5d97..4d1b8b32cb 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index 08ec52f107..1692c20545 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index 97c84b08cb..1a0973fa58 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index dded5380f7..6902dc95d9 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 016c0d8c77..5f1040d50d 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index f83a46bc56..b88c26dd81 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/hw_info_config.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/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index b9e4041091..7d83973b2b 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_stream/tbx_command_stream_receiver_hw.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/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index afe63cea8b..3fab6acc3f 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 4cb6d1db0f..8ef2521afc 100644 --- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 86e649d96e..955cd7e11e 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen12lp/adln/excludes_ocl_adln.cpp b/opencl/test/unit_test/gen12lp/adln/excludes_ocl_adln.cpp index e21cace85f..a6b4074394 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/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_N); diff --git a/opencl/test/unit_test/gen12lp/adlp/excludes_ocl_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/excludes_ocl_adlp.cpp index 8480acbc9b..2c0f1a8f17 100644 --- a/opencl/test/unit_test/gen12lp/adlp/excludes_ocl_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/excludes_ocl_adlp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ALDERLAKE_P) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_ALDERLAKE_P); 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 bfa6eedef5..b4a18290ac 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen12lp/adls/excludes_ocl_adls.cpp b/opencl/test/unit_test/gen12lp/adls/excludes_ocl_adls.cpp index 69d8b2f33f..31abe710ef 100644 --- a/opencl/test/unit_test/gen12lp/adls/excludes_ocl_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/excludes_ocl_adls.cpp @@ -5,6 +5,6 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_S); 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 ce17bca13d..fe9f4797e7 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen12lp/buffer_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl index a872696754..b0515d8f96 100644 --- a/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/cl_device/cl_device.h" diff --git a/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp index 1254917188..b986f3aaa1 100644 --- a/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_DG1) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_DG1); diff --git a/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp index 66e306a777..ea3a1ca7bf 100644 --- a/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/destructor_counted.h" namespace NEO { diff --git a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp index eb1863e685..188fa64773 100644 --- a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/hw_info.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" using namespace NEO; 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 964101c909..ab896af5be 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/driver_info.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/gen12lp/excludes_ocl_gen12lp.cpp b/opencl/test/unit_test/gen12lp/excludes_ocl_gen12lp.cpp index 9b2e0b02dd..1e579d2441 100644 --- a/opencl/test/unit_test/gen12lp/excludes_ocl_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/excludes_ocl_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE); HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE); diff --git a/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp index add0f09c2e..20fe806f78 100644 --- a/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ROCKETLAKE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ROCKETLAKE) 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 2d6c3f4851..f7ebd45522 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp index 974dd6243e..64bfd5de3d 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_TIGERLAKE_LP) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_TIGERLAKE_LP); 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 eb3fc3f7c4..e78fe95cbd 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index a1a9a1dee0..7facc9bf0d 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 e1f9ea9ee1..da6f5efd58 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 bcb7a8b0ff..3bef97e1ad 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 d97c1fba1c..61406fd935 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 9150246553..adfdd83537 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,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 44f181bd99..943df4c20b 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 09278f70f3..adfb186f10 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index 77797122f2..c2aa346560 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index a88aa26b3f..406c21773c 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 1327375fad..b1765d0f3f 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index ac8db9d1f5..31c428bd43 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index 0f97566fa2..36fe80b266 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 3f1587e56f..c6e0e94922 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp index b0db7b1a16..f1c0477209 100644 --- a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 712b5a3cb1..0f69581fce 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 4752ac8a26..074aa4f554 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -7,7 +7,7 @@ #include "shared/source/gen9/reg_configs.h" #include "shared/test/common/fixtures/memory_management_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 b59814c60c..21145ed7d0 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/glk/test_hw_info_config_glk.cpp b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp index 3109d90874..228267360e 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 5f13789205..498b7df758 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp index b6284e01a7..3cbf1f2f0a 100644 --- a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/kbl/test_hw_info_config_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index 2358c8cc2f..7dc555eb14 100644 --- a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; TEST(KblHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 18d8cd2a4e..1346a3129d 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index 10053c4287..3b5c47873e 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 a92d9ac87d..8c2106c8a8 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/hw_info_config.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/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index 8a04b1e7e1..bde187258d 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 c60f8418cc..d8c523607e 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index bf0f45c2e6..495112617b 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 0af6cf4319..81bff2cb12 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 2521e0ef3c..677ec1dbfd 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index 41696c56ec..31f69201cc 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index 69c6841c44..74037bad0d 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 0ce68921f4..9289805dc9 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 c075269bb3..7ee9de0b4a 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/gen_common/exclude_tests/exclude_test_declare.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp index 5eaf6c3c40..228a975ee0 100644 --- a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp +++ b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp index 522479967f..10a6009fb0 100644 --- a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp +++ b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwCmdTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL); HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL); diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 4e10bb03fe..db93199af2 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -25,7 +25,7 @@ #include "shared/test/common/mocks/mock_gmm_client_context.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 60e307a728..450dadc58d 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index 9bb8083979..a255860182 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/aub/aub_helper.h" #include "shared/source/aub_mem_dump/aub_mem_dump.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/engine_node_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp index e725fbd256..7f2d7095e8 100644 --- a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.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/heap_assigner_ocl_tests.cpp b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp index c9376d0eb4..3194670ddb 100644 --- a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp +++ b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/heap_assigner.h" #include "shared/test/common/helpers/debug_manager_state_restore.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_dg2_or_below.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp index 0974ef24aa..996807d365 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_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/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 8b7849e988..69a13f0e83 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_context.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index ad176d5330..cdd63d8b25 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/source/helpers/per_thread_data.h" #include "shared/source/program/kernel_info.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" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index 5cab1d9d9f..b2d81fd6dc 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.h b/opencl/test/unit_test/helpers/timestamp_packet_tests.h index 7c8a81dcad..48aea34df8 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.h +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.h @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_timestamp_packet.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp index 0aa639d4bc..202b3bf9be 100644 --- a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/windows/windows_wrapper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/windows/gl_helper.h" #include "opencl/test/unit_test/helpers/windows/mock_function.h" diff --git a/opencl/test/unit_test/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h index 884230ddc7..4dcf1811e5 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.h +++ b/opencl/test/unit_test/igdrcl_tests_pch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/sku_info/sku_info_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "hw_cmds.h" #include "third_party/opencl_headers/CL/cl.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index 871520182b..1cd2d37258 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/unified_memory/unified_memory.h" #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp index adcc47abf4..cbc546e713 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/pipe.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index 988eb790eb..c1f2fe7923 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index 513dd99def..2723b8ae0f 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.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" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" diff --git a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp index 546644331f..cfcdf5d688 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/program/kernel_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 7e73c9ca2a..9864d26b11 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -24,7 +24,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp b/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp index 27509d05ed..85ea2a0cc6 100644 --- a/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 6ead1515f1..38bc48ca74 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -22,7 +22,7 @@ #include "shared/test/common/libult/signal_utils.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/source/command_queue/command_queue.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp index 207b684467..6dadb73cce 100644 --- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp index 73a1213c31..8dd304a9c2 100644 --- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 19ba514fb2..20f8418bf9 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp index 95ecb1be9a..7864ef2f35 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/mem_obj/buffer_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp index 4a4bf5225d..be433fe333 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/client_context/gmm_client_context.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" diff --git a/opencl/test/unit_test/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp index 2b86683e3f..19fcb96777 100644 --- a/opencl/test/unit_test/mem_obj/image1d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image1d_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/mem_obj/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp index 30d2468bbc..daa54d8704 100644 --- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/source/cl_device/cl_device_info_map.h" diff --git a/opencl/test/unit_test/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp index 7d30e2157a..3e45fd1566 100644 --- a/opencl/test/unit_test/mem_obj/image2d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #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/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp index d0db97afce..336fc5e719 100644 --- a/opencl/test/unit_test/mem_obj/image3d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image3d_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index 85774e5f41..46a63c1e77 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/aligned_memory.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/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image_compression_fixture.h b/opencl/test/unit_test/mem_obj/image_compression_fixture.h index b661d719bf..32dafa4ab1 100644 --- a/opencl/test/unit_test/mem_obj/image_compression_fixture.h +++ b/opencl/test/unit_test/mem_obj/image_compression_fixture.h @@ -9,7 +9,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp index deeec54008..61a75d75e0 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/api/api.h" diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index b8f8256c7b..8a1973ef3b 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/api/api.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index cc09a29994..f7d54f8dfd 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp b/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp index ebece52749..c805d7b868 100644 --- a/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/memory_manager/mem_obj_surface.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 664d9414a9..732fa6f273 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index f790e71169..43c803891c 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -34,7 +34,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.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 "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/helpers/raii_hw_helper.h" diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index 69a94371e5..fc39479f92 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "opencl/source/api/api.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 03ad06b1a4..25b69cc79c 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,7 @@ */ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 ecc55180ba..2d713bf8dc 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 @@ -7,7 +7,7 @@ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" #include "shared/test/common/helpers/test_files.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 f83c6db845..19fce5c307 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 @@ -8,7 +8,7 @@ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index 34c5444414..3d28f23753 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/device_binary_format/zebin_tests.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" diff --git a/opencl/test/unit_test/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp index 45fd509c2d..5148036075 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp index d35ddcb79d..4b73f04bbb 100644 --- a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp @@ -27,7 +27,7 @@ #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/source/event/event.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 4cd10bb8b3..f21f2a3871 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 @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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/os_interface/linux/drm_command_stream_tests_1.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp index 4abe922bac..6247d82ecd 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp @@ -34,7 +34,7 @@ #include "shared/test/common/mocks/mock_host_ptr_manager.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp index b69e6a994f..8e8c5ea8ff 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp @@ -32,7 +32,7 @@ #include "shared/test/common/mocks/mock_host_ptr_manager.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp index ccea91210a..649f7e1428 100644 --- a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index a93a390bcc..4d861e2aeb 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/logger_tests.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp index 70b9c3b267..b0ae7a1b12 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/windows/sys_calls.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index 5e066bca41..a40d189ef3 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/mocks/mock_wddm_interface23.h" #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp index b563ae71d6..547f40eae2 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -15,7 +15,7 @@ #include "shared/source/os_interface/windows/wddm_allocation.h" #include "shared/test/common/mock_gdi/mock_gdi.h" #include "shared/test/common/mocks/windows/mock_gdi_interface.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index 574dc2af98..6c37077931 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -19,7 +19,7 @@ #include "shared/test/common/mocks/windows/mock_wddm_eudebug.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index 8ef9219743..33789710fe 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp @@ -24,7 +24,7 @@ #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/mocks/windows/mock_gdi_interface.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp index 5463da13e6..b07d5b1dbb 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/test/unit_test/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp index d7eba81dfa..6bae2d7f99 100644 --- a/opencl/test/unit_test/program/printf_handler_tests.cpp +++ b/opencl/test/unit_test/program/printf_handler_tests.cpp @@ -10,7 +10,7 @@ #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/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index cbd704025f..69839ecd06 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -33,7 +33,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_compiler_interface.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" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/device_binary_format/zebin_tests.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" diff --git a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp index 10ba8ff490..77c181d646 100644 --- a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.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/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index cc34121dea..ad0ec69228 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 48253e24d5..22b90889e0 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/helpers/cl_execution_environment_helper.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp index d9cd193d5b..74741f3fd8 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index b9c25efaa4..7b3690970d 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index f964de0353..76ddd2a72f 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp index d4d099bf7c..3485b5ef4c 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h index 784ae4ef83..fd63953991 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h @@ -11,7 +11,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/sharings/unified/unified_sharing_types.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp index e9e8f84beb..69c47c350b 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_library.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index aaa3b2d4cb..39a1a30127 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -18,7 +18,7 @@ #include "shared/test/common/libult/source_level_debugger_library.h" #include "shared/test/common/mocks/mock_gmm_helper.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp index 32c3ed19d4..1947d101c0 100644 --- a/opencl/test/unit_test/windows/get_devices_tests.cpp +++ b/opencl/test/unit_test/windows/get_devices_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "shared/source/os_interface/hw_info_config.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" namespace NEO { diff --git a/opencl/test/unit_test/windows/os_interface_tests.cpp b/opencl/test/unit_test/windows/os_interface_tests.cpp index 302aabf60f..3852995ebe 100644 --- a/opencl/test/unit_test/windows/os_interface_tests.cpp +++ b/opencl/test/unit_test/windows/os_interface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_wddm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/opencl/test/unit_test/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp index 88d0f6b6f9..df656fd7b6 100644 --- a/opencl/test/unit_test/windows/wddm_create_tests.cpp +++ b/opencl/test/unit_test/windows/wddm_create_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/source/os_interface/windows/wddm/wddm.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp index 49f984c1ff..e24bbcd9cd 100644 --- a/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_hp_core/excludes_ocl_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp index 87f99b1586..2fd79b30f8 100644 --- a/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HP_CORE); diff --git a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp index a74d9e5b14..aa5e84f021 100644 --- a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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_hp_core/test_platform_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp index b3ef212637..77a51e1b92 100644 --- a/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp index 19ad97fee0..446a5f0786 100644 --- a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#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/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 07cd0d0ff6..6be9629f70 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 @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 4bab48a2ed..1fc4eacac8 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_builtinslib.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using XeHpcCoreBuiltInTests = Test; diff --git a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp index b1fc633518..20aaadcb7f 100644 --- a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" 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 5b91fb0ba1..d57296bffb 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 @@ -14,7 +14,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 943b9aff75..d1fe0f2b59 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 @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp index 52c8732e98..f624dda929 100644 --- a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPC_CORE); 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 316dee5d80..4cf777674b 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 @@ -16,7 +16,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 cbd97dc1cf..b4aee15980 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 @@ -7,7 +7,7 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.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" #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 4858dfc2b5..19be07771e 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,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 53c86a3c29..090ccbc1aa 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/ult_hw_config.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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" 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 9c18e0d0a5..bf25dca55b 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.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/xe_hpc_core/pvc/test_device_caps_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp index c666805f91..0aab390f96 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,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 8dda98a331..3c1e926c20 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 @@ -10,7 +10,7 @@ #include "shared/source/os_interface/hw_info_config.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/test.h" +#include "shared/test/common/test_macros/hw_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 7a587a2ec0..e1698d26c1 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 @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/state_base_address.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 c623790370..32d69c4fb2 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,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 53d98114f0..46182d5a72 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,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 92d4ef7fff..d0e0ac6944 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 @@ -8,7 +8,7 @@ #include "shared/source/program/kernel_info.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/test.h" +#include "shared/test/common/test_macros/hw_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 c83be6b4be..d39ffb2e80 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 3b6b38475d..b13a019bf4 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 @@ -15,7 +15,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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/excludes_ocl_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp index 88a51d7cba..e1845a6b30 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwHelperTest, GivenZeroSlmSizeWhenComputeSlmSizeIsCalledThenCorrectValueIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestXeHpAndLater, givenXeHPAndLaterPlatformWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenFalseIsReturned, IGFX_DG2); 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 e189bb1490..d5587854f1 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 @@ -1,11 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 d45758a4b5..a6aacf0a84 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 @@ -8,7 +8,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_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp index 9bbd5c43de..4c48c1c00d 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/sampler/sampler.h" 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 e2e1427e69..b59fd7012d 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 @@ -10,7 +10,7 @@ #include "shared/source/helpers/state_base_address.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/excludes_ocl_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp index 3382fe225e..961989efe4 100644 --- a/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPG_CORE); 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 7ebb4a534a..c7e582c9ec 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,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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/test/common/debug_settings/windows/debug_variables_helper_windows_tests.cpp b/shared/test/common/debug_settings/windows/debug_variables_helper_windows_tests.cpp index cc8aa5d63d..8a885aa2cc 100644 --- a/shared/test/common/debug_settings/windows/debug_variables_helper_windows_tests.cpp +++ b/shared/test/common/debug_settings/windows/debug_variables_helper_windows_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/debug_settings/debug_variables_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/common/fixtures/command_container_fixture.h b/shared/test/common/fixtures/command_container_fixture.h index 7fbc551da9..0501996b4e 100644 --- a/shared/test/common/fixtures/command_container_fixture.h +++ b/shared/test/common/fixtures/command_container_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/kernel/kernel_descriptor.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/common/fixtures/linear_stream_fixture.h b/shared/test/common/fixtures/linear_stream_fixture.h index bf9c6790e1..9883a39890 100644 --- a/shared/test/common/fixtures/linear_stream_fixture.h +++ b/shared/test/common/fixtures/linear_stream_fixture.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/command_stream/linear_stream.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" #include diff --git a/shared/test/common/fixtures/linux/device_id_fixture.h b/shared/test/common/fixtures/linux/device_id_fixture.h index 0ea38d5a27..9be2d07cae 100644 --- a/shared/test/common/fixtures/linux/device_id_fixture.h +++ b/shared/test/common/fixtures/linux/device_id_fixture.h @@ -7,7 +7,7 @@ #pragma once #include "shared/source/os_interface/linux/drm_neo.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/common/fixtures/preemption_fixture.h b/shared/test/common/fixtures/preemption_fixture.h index 7992973b69..700d236a88 100644 --- a/shared/test/common/fixtures/preemption_fixture.h +++ b/shared/test/common/fixtures/preemption_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/command_stream/preemption_mode.h" #include "shared/test/common/helpers/debug_manager_state_restore.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/common/fixtures/product_config_fixture.h b/shared/test/common/fixtures/product_config_fixture.h index eb76cde139..394f2fd07e 100644 --- a/shared/test/common/fixtures/product_config_fixture.h +++ b/shared/test/common/fixtures/product_config_fixture.h @@ -11,7 +11,7 @@ #include "shared/source/helpers/product_config_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/test.h" +#include "shared/test/common/test_macros/hw_test.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 acc6f51ceb..906e0b7792 100644 --- a/shared/test/common/gen11/command_encoder_tests_gen11.cpp +++ b/shared/test/common/gen11/command_encoder_tests_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/blit_commands_helper.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/common/gen11/test_encode_math_gen11.cpp b/shared/test/common/gen11/test_encode_math_gen11.cpp index 948dff1932..ed8eb4c832 100644 --- a/shared/test/common/gen11/test_encode_math_gen11.cpp +++ b/shared/test/common/gen11/test_encode_math_gen11.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 d48cef6c52..18a61346d9 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 @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.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/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp b/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp index 19a9468bc8..36deaa0073 100644 --- a/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp +++ b/shared/test/common/gen12lp/adlp/preamble_helper_tests_adlp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 4e2bc09d06..da1b710029 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.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/common/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp index 3097a89c2b..c8747011b3 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using AdlsHwInfo = ::testing::Test; diff --git a/shared/test/common/gen12lp/command_encoder_tests_gen12lp.cpp b/shared/test/common/gen12lp/command_encoder_tests_gen12lp.cpp index 5c7d2e9cdd..ed8cc53377 100644 --- a/shared/test/common/gen12lp/command_encoder_tests_gen12lp.cpp +++ b/shared/test/common/gen12lp/command_encoder_tests_gen12lp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/preamble.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.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/common/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp index 87880b7fbb..1c36226fa6 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.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/common/gen12lp/test_command_encoder_gen12lp.cpp b/shared/test/common/gen12lp/test_command_encoder_gen12lp.cpp index 447e68ebf1..1eab825533 100644 --- a/shared/test/common/gen12lp/test_command_encoder_gen12lp.cpp +++ b/shared/test/common/gen12lp/test_command_encoder_gen12lp.cpp @@ -11,7 +11,7 @@ #include "shared/source/os_interface/os_context.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "reg_configs_common.h" diff --git a/shared/test/common/gen12lp/test_encode_gen12lp.cpp b/shared/test/common/gen12lp/test_encode_gen12lp.cpp index b08e00a285..77a1fabbc0 100644 --- a/shared/test/common/gen12lp/test_encode_gen12lp.cpp +++ b/shared/test/common/gen12lp/test_encode_gen12lp.cpp @@ -10,7 +10,7 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/gen12lp/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.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/common/gen12lp/test_encode_math_gen12lp.cpp b/shared/test/common/gen12lp/test_encode_math_gen12lp.cpp index 77426a12c0..6d92bf2c0e 100644 --- a/shared/test/common/gen12lp/test_encode_math_gen12lp.cpp +++ b/shared/test/common/gen12lp/test_encode_math_gen12lp.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 33de63a95e..cf6ce574e5 100644 --- a/shared/test/common/gen8/command_encoder_tests_gen8.cpp +++ b/shared/test/common/gen8/command_encoder_tests_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/blit_commands_helper.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/common/gen8/test_encode_math_gen8.cpp b/shared/test/common/gen8/test_encode_math_gen8.cpp index 9f4fef8779..abe47e22ba 100644 --- a/shared/test/common/gen8/test_encode_math_gen8.cpp +++ b/shared/test/common/gen8/test_encode_math_gen8.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 514f107c66..5f4242ba4d 100644 --- a/shared/test/common/gen9/command_encoder_tests_gen9.cpp +++ b/shared/test/common/gen9/command_encoder_tests_gen9.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_container/command_encoder.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/common/gen9/test_command_encoder_gen9.cpp b/shared/test/common/gen9/test_command_encoder_gen9.cpp index b91fabbe38..1a1a3fd438 100644 --- a/shared/test/common/gen9/test_command_encoder_gen9.cpp +++ b/shared/test/common/gen9/test_command_encoder_gen9.cpp @@ -9,7 +9,7 @@ #include "shared/source/command_container/command_encoder.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/test.h" +#include "shared/test/common/test_macros/hw_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 e72e731da0..46c84648d8 100644 --- a/shared/test/common/gen9/test_encode_math_gen9.cpp +++ b/shared/test/common/gen9/test_encode_math_gen9.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/common/helpers/blit_commands_helper_tests.inl b/shared/test/common/helpers/blit_commands_helper_tests.inl index 7971e5aecb..4da2f09b0b 100644 --- a/shared/test/common/helpers/blit_commands_helper_tests.inl +++ b/shared/test/common/helpers/blit_commands_helper_tests.inl @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.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/common/helpers/hw_helper_extended_tests.cpp b/shared/test/common/helpers/hw_helper_extended_tests.cpp index b52cebee54..bde39a7421 100644 --- a/shared/test/common/helpers/hw_helper_extended_tests.cpp +++ b/shared/test/common/helpers/hw_helper_extended_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; @@ -23,4 +23,4 @@ HWTEST_F(HwHelperTest, GivenHwInfoWithDisabledBliterWhenCheckCopyEnginesCountThe HardwareInfo hwInfo{}; hwInfo.capabilityTable.blitterOperationsSupported = false; EXPECT_EQ(HwHelper::getCopyEnginesCount(hwInfo), 0u); -} \ No newline at end of file +} diff --git a/shared/test/common/helpers/hw_helper_tests.h b/shared/test/common/helpers/hw_helper_tests.h index f2729fe0cb..249921477a 100644 --- a/shared/test/common/helpers/hw_helper_tests.h +++ b/shared/test/common/helpers/hw_helper_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/common/helpers/hw_helper_tests_dg2_and_later.cpp b/shared/test/common/helpers/hw_helper_tests_dg2_and_later.cpp index ed8fbe0b2b..3d3bff9b0e 100644 --- a/shared/test/common/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/shared/test/common/helpers/hw_helper_tests_dg2_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/helpers/hw_helper.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/common/helpers/simd_helper_tests.inl b/shared/test/common/helpers/simd_helper_tests.inl index 763c39b424..4d5584f542 100644 --- a/shared/test/common/helpers/simd_helper_tests.inl +++ b/shared/test/common/helpers/simd_helper_tests.inl @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/simd_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/common/helpers/simd_helper_tests_pvc_and_later.inl b/shared/test/common/helpers/simd_helper_tests_pvc_and_later.inl index 9ade3654b3..0559d22ae4 100644 --- a/shared/test/common/helpers/simd_helper_tests_pvc_and_later.inl +++ b/shared/test/common/helpers/simd_helper_tests_pvc_and_later.inl @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/simd_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/common/helpers/state_base_address_tests.h b/shared/test/common/helpers/state_base_address_tests.h index ade8d1c462..9168ff5af5 100644 --- a/shared/test/common/helpers/state_base_address_tests.h +++ b/shared/test/common/helpers/state_base_address_tests.h @@ -13,7 +13,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" struct SBATest : public NEO::DeviceFixture, public ::testing::Test { void SetUp() override { diff --git a/shared/test/common/os_interface/windows/wddm_fixture.h b/shared/test/common/os_interface/windows/wddm_fixture.h index d124956720..7d13fc24a6 100644 --- a/shared/test/common/os_interface/windows/wddm_fixture.h +++ b/shared/test/common/os_interface/windows/wddm_fixture.h @@ -27,7 +27,7 @@ #include "shared/test/common/mocks/windows/mock_gdi_interface.h" #include "shared/test/common/mocks/windows/mock_gmm_memory_base.h" #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { struct WddmFixture : public Test { diff --git a/shared/test/common/test_macros/hw_test.h b/shared/test/common/test_macros/hw_test.h new file mode 100644 index 0000000000..f1c8e202c2 --- /dev/null +++ b/shared/test/common/test_macros/hw_test.h @@ -0,0 +1,807 @@ +/* + * 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_excludes.h" + +#include "gtest/gtest.h" +#include "hw_cmds.h" +#include "igfxfmid.h" +#include "per_product_test_selector.h" +#include "test_mode.h" + +// Macros to provide template based testing. +// Test can use FamilyType in the test -- equivalent to SKLFamily +#define HWTEST_TEST_(test_suite_name, test_name, parent_class, parent_id, SetUpT_name, TearDownT_name) \ + 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(); \ + template \ + void emptyFcn() {} \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + parent_class::SetUp(); \ + FAMILY_SELECTOR(::renderCoreFamily, SetUpT_name); \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + FAMILY_SELECTOR(::renderCoreFamily, TearDownT_name) \ + parent_class::TearDown(); \ + } \ + } \ + \ + void TestBody() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ + } \ + } \ + 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 HWTEST_F(test_fixture, test_name) \ + HWTEST_TEST_(test_fixture, test_name, test_fixture, \ + ::testing::internal::GetTypeId(), emptyFcn, emptyFcn) + +// Macros to provide template based testing. +// Test can use productFamily, gfxCoreFamily and FamilyType in the test +#define HWTEST2_TEST_(test_suite_name, test_name, parent_class, parent_id, test_matcher) \ + 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: \ + using ContainerType = SupportedProductFamilies; \ + using MatcherType = test_matcher; \ + \ + template \ + void matchBody(); \ + \ + template \ + void matched() { \ + const GFXCORE_FAMILY gfxCoreFamily = \ + static_cast(NEO::HwMapper::gfxFamily); \ + using FamilyType = typename NEO::GfxFamilyMapper::GfxFamily; \ + matchBody(); \ + } \ + \ + struct MatcherFalse { \ + template \ + static void matched() {} \ + }; \ + \ + template \ + void checkForMatch(PRODUCT_FAMILY matchProduct); \ + \ + template \ + bool checkMatch(PRODUCT_FAMILY matchProduct); \ + \ + void SetUp() override; \ + void TearDown() override; \ + void TestBody() override; \ + \ + 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::GetSetUpCaseOrSuite(), \ + ::testing::internal::SuiteApiResolver::GetTearDownCaseOrSuite(), \ + new ::testing::internal::TestFactoryImpl); \ + \ + template \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkForMatch(PRODUCT_FAMILY matchProduct) { \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + using Matcher = \ + typename std::conditional::type; \ + Matcher::template matched(); \ + } else { \ + checkForMatch(matchProduct); \ + } \ + } \ + \ + template <> \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkForMatch<0u>(PRODUCT_FAMILY matchProduct) { \ + const int matcherOrdinal = 0u; \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + using Matcher = \ + typename std::conditional::type; \ + Matcher::template matched(); \ + } \ + } \ + template \ + bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkMatch(PRODUCT_FAMILY matchProduct) { \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + return isMatched; \ + } else { \ + return checkMatch(matchProduct); \ + } \ + } \ + \ + template <> \ + bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkMatch<0>(PRODUCT_FAMILY matchProduct) { \ + const int matcherOrdinal = 0u; \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + return isMatched; \ + } else { \ + return false; \ + } \ + } \ + \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + if (checkMatch(::productFamily)) { \ + parent_class::SetUp(); \ + } \ + } \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + if (checkMatch(::productFamily)) { \ + parent_class::TearDown(); \ + } \ + } \ + } \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + checkForMatch(::productFamily); \ + } \ + } \ + \ + template \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::matchBody() + +#define HWTEST2_F(test_fixture, test_name, test_matcher) \ + HWTEST2_TEST_(test_fixture, test_name##_##test_matcher, test_fixture, \ + ::testing::internal::GetTypeId(), test_matcher) + +#define HWTEST_TEMPLATED_F(test_fixture, test_name) \ + HWTEST_TEST_(test_fixture, test_name, test_fixture, \ + ::testing::internal::GetTypeId(), setUpT, tearDownT) + +// Macros to provide template based testing. +// Test can use FamilyType in the test -- equivalent to SKLFamily +#define HWCMDTEST_TEST_(cmdset_gen_base, test_suite_name, test_name, parent_class, parent_id) \ + 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(); \ + \ + template \ + auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + testBodyHw(); \ + } \ + } \ + \ + template \ + auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ + /* do nothing */ \ + } \ + \ + void TestBody() override { \ + FAMILY_SELECTOR(::renderCoreFamily, runCmdTestHwIfSupported) \ + } \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + CALL_IF_SUPPORTED(cmdset_gen_base, parent_class::SetUp()); \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_SUPPORTED(cmdset_gen_base, 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 HWCMDTEST_F(cmdset_gen_base, test_fixture, test_name) \ + 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) \ + 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)) { \ + FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ + } \ + } \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + test_suite_name::SetUp(); \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + 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 HWCMDTEST_P(cmdset_gen_base, test_suite_name, test_name) \ + 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(); \ + \ + template \ + auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ + testBodyHw(); \ + } \ + \ + template \ + auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ + /* do nothing */ \ + } \ + \ + void TestBody() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + FAMILY_SELECTOR(::renderCoreFamily, runCmdTestHwIfSupported) \ + } \ + } \ + void SetUp() override { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + CALL_IF_SUPPORTED(cmdset_gen_base, test_suite_name::SetUp()); \ + } \ + void TearDown() override { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + CALL_IF_SUPPORTED(cmdset_gen_base, 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() + +// Macros to provide template based testing. +// Test can use productFamily, gfxCoreFamily and FamilyType in the test +#define HWTEST2_P(test_suite_name, test_name, test_matcher) \ + 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 matchBody(); \ + \ + private: \ + using ContainerType = SupportedProductFamilies; \ + using MatcherType = test_matcher; \ + \ + template \ + void matched() { \ + const GFXCORE_FAMILY gfxCoreFamily = \ + static_cast(NEO::HwMapper::gfxFamily); \ + using FamilyType = typename NEO::GfxFamilyMapper::GfxFamily; \ + matchBody(); \ + } \ + \ + struct MatcherFalse { \ + template \ + static void matched() {} \ + }; \ + \ + template \ + void checkForMatch(PRODUCT_FAMILY matchProduct); \ + \ + template \ + bool checkMatch(PRODUCT_FAMILY matchProduct); \ + \ + void SetUp() override; \ + void TearDown() override; \ + \ + void TestBody() override; \ + \ + 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()); \ + return 0; \ + } \ + static int gtest_registering_dummy_; \ + GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ + }; \ + \ + template \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkForMatch(PRODUCT_FAMILY matchProduct) { \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + using Matcher = \ + typename std::conditional::type; \ + Matcher::template matched(); \ + } else { \ + checkForMatch(matchProduct); \ + } \ + } \ + \ + template <> \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkForMatch<0u>(PRODUCT_FAMILY matchProduct) { \ + const int matcherOrdinal = 0u; \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + using Matcher = \ + typename std::conditional::type; \ + Matcher::template matched(); \ + } \ + } \ + template \ + bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkMatch(PRODUCT_FAMILY matchProduct) { \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + return isMatched; \ + } else { \ + return checkMatch(matchProduct); \ + } \ + } \ + \ + template <> \ + bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ + test_name)::checkMatch<0>(PRODUCT_FAMILY matchProduct) { \ + const int matcherOrdinal = 0u; \ + const PRODUCT_FAMILY productFamily = At::productFamily; \ + \ + if (matchProduct == productFamily) { \ + const bool isMatched = MatcherType::isMatched(); \ + return isMatched; \ + } else { \ + return false; \ + } \ + } \ + \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \ + if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + GTEST_SKIP(); \ + } \ + if (checkMatch(::productFamily)) { \ + test_suite_name::SetUp(); \ + } \ + } \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + if (checkMatch(::productFamily)) { \ + test_suite_name::TearDown(); \ + } \ + } \ + } \ + \ + void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \ + if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ + checkForMatch(::productFamily); \ + } \ + } \ + \ + 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)::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) \ + CHECK_TEST_NAME_LENGTH(CaseName, TestName) \ + template \ + class GTEST_TEST_CLASS_NAME_(CaseName, TestName) : public CaseName { \ + private: \ + typedef CaseName TestFixture; \ + typedef gtest_TypeParam_ TypeParam; \ + template \ + void testBodyHw(); \ + \ + void TestBody() override { \ + FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ + } \ + }; \ + bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \ + ::testing::internal::TypeParameterizedTest< \ + CaseName, \ + ::testing::internal::TemplateSel< \ + GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \ + GTEST_TYPE_PARAMS_(CaseName)>::Register("", ::testing::internal::CodeLocation(__FILE__, __LINE__), \ + #CaseName, #TestName, 0); \ + template \ + template \ + void GTEST_TEST_CLASS_NAME_(CaseName, TestName)::testBodyHw() + +template +struct SupportedProductFamilyContainer { + using BaseClass = SupportedProductFamilyContainer; + static const PRODUCT_FAMILY productFamily = IGFX_UNKNOWN; +}; + +template +struct SupportedProductFamilyContainer : SupportedProductFamilyContainer { + using BaseClass = SupportedProductFamilyContainer; + + static const PRODUCT_FAMILY productFamily = p; + static const std::size_t size = sizeof...(args) + 1; +}; + +using SupportedProductFamilies = + SupportedProductFamilyContainer; + +// Static container accessor +template +struct At { + static const PRODUCT_FAMILY productFamily = + At::productFamily; +}; + +template +struct At { + static const PRODUCT_FAMILY productFamily = Container::productFamily; +}; + +template +struct IsGfxCore { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() == gfxCoreFamily; + } +}; + +template +struct IsNotGfxCore { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() != gfxCoreFamily; + } +}; + +template +struct AreNotGfxCores { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() != gfxCoreFamily && NEO::ToGfxCoreFamily::get() != gfxCoreFamily2; + } +}; + +template +struct IsAtMostGfxCore { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() <= gfxCoreFamily; + } +}; + +template +struct IsAtLeastGfxCore { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() >= gfxCoreFamily; + } +}; + +template +struct IsWithinGfxCore { + template + static constexpr bool isMatched() { + return NEO::ToGfxCoreFamily::get() >= gfxCoreFamilyMin && NEO::ToGfxCoreFamily::get() <= gfxCoreFamilyMax; + } +}; + +template +struct IsAnyGfxCores { + template + static constexpr bool isMatched() { + return (... || IsGfxCore::template isMatched()); + } +}; + +template +struct IsNotAnyGfxCores { + template + static constexpr bool isMatched() { + return (... && IsNotGfxCore::template isMatched()); + } +}; + +template +struct IsProduct { + template + static constexpr bool isMatched() { + return productFamily == product; + } +}; + +template +struct IsAtMostProduct { + template + static constexpr bool isMatched() { + return productFamily <= productFamilyMax; + } +}; + +template +struct IsAtLeastProduct { + template + static constexpr bool isMatched() { + return productFamily >= productFamilyMin; + } +}; + +template +struct IsWithinProducts { + template + static constexpr bool isMatched() { + return productFamily >= productFamilyMin && productFamily <= productFamilyMax; + } +}; + +template +struct IsNotWithinProducts { + template + static constexpr bool isMatched() { + return (productFamily < productFamilyMin) || (productFamily > productFamilyMax); + } +}; + +struct MatchAny { + template + static constexpr bool isMatched() { return true; } +}; + +#include "common_matchers.h" diff --git a/shared/test/common/test_macros/test.h b/shared/test/common/test_macros/test.h index 0a279b3de2..b6bc7a1da7 100644 --- a/shared/test/common/test_macros/test.h +++ b/shared/test/common/test_macros/test.h @@ -6,18 +6,28 @@ */ #pragma once -#include "shared/source/helpers/hw_info.h" -#include "shared/test/common/test_macros/test_excludes.h" #include "gtest/gtest.h" -#include "hw_cmds.h" #include "igfxfmid.h" -#include "per_product_test_selector.h" #include "test_mode.h" extern PRODUCT_FAMILY productFamily; extern GFXCORE_FAMILY renderCoreFamily; +template +struct Test + : public Fixture, + public ::testing::Test { + + void SetUp() override { + Fixture::SetUp(); + } + + void TearDown() override { + Fixture::TearDown(); + } +}; + #define TO_STR2(x) #x #define TO_STR(x) TO_STR2(x) @@ -80,807 +90,3 @@ extern GFXCORE_FAMILY renderCoreFamily; test_name)::gtest_registering_dummy_ = \ GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry(); \ void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() - -// Macros to provide template based testing. -// Test can use FamilyType in the test -- equivalent to SKLFamily -#define HWTEST_TEST_(test_suite_name, test_name, parent_class, parent_id, SetUpT_name, TearDownT_name) \ - 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(); \ - template \ - void emptyFcn() {} \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - parent_class::SetUp(); \ - FAMILY_SELECTOR(::renderCoreFamily, SetUpT_name); \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - FAMILY_SELECTOR(::renderCoreFamily, TearDownT_name) \ - parent_class::TearDown(); \ - } \ - } \ - \ - void TestBody() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ - } \ - } \ - 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 HWTEST_F(test_fixture, test_name) \ - HWTEST_TEST_(test_fixture, test_name, test_fixture, \ - ::testing::internal::GetTypeId(), emptyFcn, emptyFcn) - -// Macros to provide template based testing. -// Test can use productFamily, gfxCoreFamily and FamilyType in the test -#define HWTEST2_TEST_(test_suite_name, test_name, parent_class, parent_id, test_matcher) \ - 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: \ - using ContainerType = SupportedProductFamilies; \ - using MatcherType = test_matcher; \ - \ - template \ - void matchBody(); \ - \ - template \ - void matched() { \ - const GFXCORE_FAMILY gfxCoreFamily = \ - static_cast(NEO::HwMapper::gfxFamily); \ - using FamilyType = typename NEO::GfxFamilyMapper::GfxFamily; \ - matchBody(); \ - } \ - \ - struct MatcherFalse { \ - template \ - static void matched() {} \ - }; \ - \ - template \ - void checkForMatch(PRODUCT_FAMILY matchProduct); \ - \ - template \ - bool checkMatch(PRODUCT_FAMILY matchProduct); \ - \ - void SetUp() override; \ - void TearDown() override; \ - void TestBody() override; \ - \ - 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::GetSetUpCaseOrSuite(), \ - ::testing::internal::SuiteApiResolver::GetTearDownCaseOrSuite(), \ - new ::testing::internal::TestFactoryImpl); \ - \ - template \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkForMatch(PRODUCT_FAMILY matchProduct) { \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - using Matcher = \ - typename std::conditional::type; \ - Matcher::template matched(); \ - } else { \ - checkForMatch(matchProduct); \ - } \ - } \ - \ - template <> \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkForMatch<0u>(PRODUCT_FAMILY matchProduct) { \ - const int matcherOrdinal = 0u; \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - using Matcher = \ - typename std::conditional::type; \ - Matcher::template matched(); \ - } \ - } \ - template \ - bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkMatch(PRODUCT_FAMILY matchProduct) { \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - return isMatched; \ - } else { \ - return checkMatch(matchProduct); \ - } \ - } \ - \ - template <> \ - bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkMatch<0>(PRODUCT_FAMILY matchProduct) { \ - const int matcherOrdinal = 0u; \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - return isMatched; \ - } else { \ - return false; \ - } \ - } \ - \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - if (checkMatch(::productFamily)) { \ - parent_class::SetUp(); \ - } \ - } \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - if (checkMatch(::productFamily)) { \ - parent_class::TearDown(); \ - } \ - } \ - } \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - checkForMatch(::productFamily); \ - } \ - } \ - \ - template \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::matchBody() - -#define HWTEST2_F(test_fixture, test_name, test_matcher) \ - HWTEST2_TEST_(test_fixture, test_name##_##test_matcher, test_fixture, \ - ::testing::internal::GetTypeId(), test_matcher) - -#define HWTEST_TEMPLATED_F(test_fixture, test_name) \ - HWTEST_TEST_(test_fixture, test_name, test_fixture, \ - ::testing::internal::GetTypeId(), setUpT, tearDownT) - -// Macros to provide template based testing. -// Test can use FamilyType in the test -- equivalent to SKLFamily -#define HWCMDTEST_TEST_(cmdset_gen_base, test_suite_name, test_name, parent_class, parent_id) \ - 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(); \ - \ - template \ - auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - testBodyHw(); \ - } \ - } \ - \ - template \ - auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ - /* do nothing */ \ - } \ - \ - void TestBody() override { \ - FAMILY_SELECTOR(::renderCoreFamily, runCmdTestHwIfSupported) \ - } \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - CALL_IF_SUPPORTED(cmdset_gen_base, parent_class::SetUp()); \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_SUPPORTED(cmdset_gen_base, 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 HWCMDTEST_F(cmdset_gen_base, test_fixture, test_name) \ - 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) \ - 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)) { \ - FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ - } \ - } \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - test_suite_name::SetUp(); \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - 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 HWCMDTEST_P(cmdset_gen_base, test_suite_name, test_name) \ - 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(); \ - \ - template \ - auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ - testBodyHw(); \ - } \ - \ - template \ - auto runCmdTestHwIfSupported() -> typename std::enable_if::type { \ - /* do nothing */ \ - } \ - \ - void TestBody() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - FAMILY_SELECTOR(::renderCoreFamily, runCmdTestHwIfSupported) \ - } \ - } \ - void SetUp() override { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - CALL_IF_SUPPORTED(cmdset_gen_base, test_suite_name::SetUp()); \ - } \ - void TearDown() override { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - CALL_IF_SUPPORTED(cmdset_gen_base, 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() - -// Macros to provide template based testing. -// Test can use productFamily, gfxCoreFamily and FamilyType in the test -#define HWTEST2_P(test_suite_name, test_name, test_matcher) \ - 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 matchBody(); \ - \ - private: \ - using ContainerType = SupportedProductFamilies; \ - using MatcherType = test_matcher; \ - \ - template \ - void matched() { \ - const GFXCORE_FAMILY gfxCoreFamily = \ - static_cast(NEO::HwMapper::gfxFamily); \ - using FamilyType = typename NEO::GfxFamilyMapper::GfxFamily; \ - matchBody(); \ - } \ - \ - struct MatcherFalse { \ - template \ - static void matched() {} \ - }; \ - \ - template \ - void checkForMatch(PRODUCT_FAMILY matchProduct); \ - \ - template \ - bool checkMatch(PRODUCT_FAMILY matchProduct); \ - \ - void SetUp() override; \ - void TearDown() override; \ - \ - void TestBody() override; \ - \ - 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()); \ - return 0; \ - } \ - static int gtest_registering_dummy_; \ - GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)); \ - }; \ - \ - template \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkForMatch(PRODUCT_FAMILY matchProduct) { \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - using Matcher = \ - typename std::conditional::type; \ - Matcher::template matched(); \ - } else { \ - checkForMatch(matchProduct); \ - } \ - } \ - \ - template <> \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkForMatch<0u>(PRODUCT_FAMILY matchProduct) { \ - const int matcherOrdinal = 0u; \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - using Matcher = \ - typename std::conditional::type; \ - Matcher::template matched(); \ - } \ - } \ - template \ - bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkMatch(PRODUCT_FAMILY matchProduct) { \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - return isMatched; \ - } else { \ - return checkMatch(matchProduct); \ - } \ - } \ - \ - template <> \ - bool GTEST_TEST_CLASS_NAME_(test_suite_name, \ - test_name)::checkMatch<0>(PRODUCT_FAMILY matchProduct) { \ - const int matcherOrdinal = 0u; \ - const PRODUCT_FAMILY productFamily = At::productFamily; \ - \ - if (matchProduct == productFamily) { \ - const bool isMatched = MatcherType::isMatched(); \ - return isMatched; \ - } else { \ - return false; \ - } \ - } \ - \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \ - if (IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - GTEST_SKIP(); \ - } \ - if (checkMatch(::productFamily)) { \ - test_suite_name::SetUp(); \ - } \ - } \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - if (checkMatch(::productFamily)) { \ - test_suite_name::TearDown(); \ - } \ - } \ - } \ - \ - void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \ - if (!IS_TEST_EXCLUDED(test_suite_name, test_name)) { \ - checkForMatch(::productFamily); \ - } \ - } \ - \ - 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)::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) \ - CHECK_TEST_NAME_LENGTH(CaseName, TestName) \ - template \ - class GTEST_TEST_CLASS_NAME_(CaseName, TestName) : public CaseName { \ - private: \ - typedef CaseName TestFixture; \ - typedef gtest_TypeParam_ TypeParam; \ - template \ - void testBodyHw(); \ - \ - void TestBody() override { \ - FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ - } \ - }; \ - bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::internal::TypeParameterizedTest< \ - CaseName, \ - ::testing::internal::TemplateSel< \ - GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \ - GTEST_TYPE_PARAMS_(CaseName)>::Register("", ::testing::internal::CodeLocation(__FILE__, __LINE__), \ - #CaseName, #TestName, 0); \ - template \ - template \ - void GTEST_TEST_CLASS_NAME_(CaseName, TestName)::testBodyHw() - -template -struct Test - : public Fixture, - public ::testing::Test { - - void SetUp() override { - Fixture::SetUp(); - } - - void TearDown() override { - Fixture::TearDown(); - } -}; - -template -struct SupportedProductFamilyContainer { - using BaseClass = SupportedProductFamilyContainer; - static const PRODUCT_FAMILY productFamily = IGFX_UNKNOWN; -}; - -template -struct SupportedProductFamilyContainer : SupportedProductFamilyContainer { - using BaseClass = SupportedProductFamilyContainer; - - static const PRODUCT_FAMILY productFamily = p; - static const std::size_t size = sizeof...(args) + 1; -}; - -using SupportedProductFamilies = - SupportedProductFamilyContainer; - -// Static container accessor -template -struct At { - static const PRODUCT_FAMILY productFamily = - At::productFamily; -}; - -template -struct At { - static const PRODUCT_FAMILY productFamily = Container::productFamily; -}; - -template -struct IsGfxCore { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() == gfxCoreFamily; - } -}; - -template -struct IsNotGfxCore { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() != gfxCoreFamily; - } -}; - -template -struct AreNotGfxCores { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() != gfxCoreFamily && NEO::ToGfxCoreFamily::get() != gfxCoreFamily2; - } -}; - -template -struct IsAtMostGfxCore { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() <= gfxCoreFamily; - } -}; - -template -struct IsAtLeastGfxCore { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() >= gfxCoreFamily; - } -}; - -template -struct IsWithinGfxCore { - template - static constexpr bool isMatched() { - return NEO::ToGfxCoreFamily::get() >= gfxCoreFamilyMin && NEO::ToGfxCoreFamily::get() <= gfxCoreFamilyMax; - } -}; - -template -struct IsAnyGfxCores { - template - static constexpr bool isMatched() { - return (... || IsGfxCore::template isMatched()); - } -}; - -template -struct IsNotAnyGfxCores { - template - static constexpr bool isMatched() { - return (... && IsNotGfxCore::template isMatched()); - } -}; - -template -struct IsProduct { - template - static constexpr bool isMatched() { - return productFamily == product; - } -}; - -template -struct IsAtMostProduct { - template - static constexpr bool isMatched() { - return productFamily <= productFamilyMax; - } -}; - -template -struct IsAtLeastProduct { - template - static constexpr bool isMatched() { - return productFamily >= productFamilyMin; - } -}; - -template -struct IsWithinProducts { - template - static constexpr bool isMatched() { - return productFamily >= productFamilyMin && productFamily <= productFamilyMax; - } -}; - -template -struct IsNotWithinProducts { - template - static constexpr bool isMatched() { - return (productFamily < productFamilyMin) || (productFamily > productFamilyMax); - } -}; - -struct MatchAny { - template - static constexpr bool isMatched() { return true; } -}; - -#include "common_matchers.h" diff --git a/shared/test/common/test_macros/test_checks_shared.cpp b/shared/test/common/test_macros/test_checks_shared.cpp index bd3ef79b7e..3c53ed6b68 100644 --- a/shared/test/common/test_macros/test_checks_shared.cpp +++ b/shared/test/common/test_macros/test_checks_shared.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.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 b228cf1ca6..6f7c438b1f 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 @@ -9,7 +9,7 @@ #include "shared/source/os_interface/hw_info_config.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp index 9f548c837d..7eda4bddd4 100644 --- a/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp +++ b/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateInternalAllocationInDevicePoolThen32BitAllocationIsCreated, IGFX_DG2); 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 42fb97b099..c8646dc356 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 @@ -10,7 +10,7 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/xe_hpg_core/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.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/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 dc6ead2822..a403451424 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 @@ -11,7 +11,7 @@ #include "shared/source/xe_hpg_core/hw_cmds.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.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/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 1091c6a65e..c0cce157e9 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 @@ -8,7 +8,7 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/fixtures/device_fixture.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/common/xe_hpg_core/excludes_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp index 2a99367f1e..98a3b03918 100644 --- a/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenEventAddressWhenEncodeThenMocsFromGmmHelperIsSet, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HPG_CORE); diff --git a/shared/test/unit_test/ail/ail_tests.cpp b/shared/test/unit_test/ail/ail_tests.cpp index 7706d7a9d4..b120008325 100644 --- a/shared/test/unit_test/ail/ail_tests.cpp +++ b/shared/test/unit_test/ail/ail_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { using IsSKL = IsProduct; diff --git a/shared/test/unit_test/ail/linux/ail_linux_tests.cpp b/shared/test/unit_test/ail/linux/ail_linux_tests.cpp index 9f5a201ed4..e0f1ecefef 100644 --- a/shared/test/unit_test/ail/linux/ail_linux_tests.cpp +++ b/shared/test/unit_test/ail/linux/ail_linux_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { using AILTests = ::testing::Test; diff --git a/shared/test/unit_test/ail/windows/ail_windows_tests.cpp b/shared/test/unit_test/ail/windows/ail_windows_tests.cpp index 3d823c4959..9b81efcb2f 100644 --- a/shared/test/unit_test/ail/windows/ail_windows_tests.cpp +++ b/shared/test/unit_test/ail/windows/ail_windows_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { using AILTests = ::testing::Test; diff --git a/shared/test/unit_test/aub/aub_helper_tests.cpp b/shared/test/unit_test/aub/aub_helper_tests.cpp index aab5b609d4..afa125c6de 100644 --- a/shared/test/unit_test/aub/aub_helper_tests.cpp +++ b/shared/test/unit_test/aub/aub_helper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_lrca_helper.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/built_ins/built_in_tests_shared.inl b/shared/test/unit_test/built_ins/built_in_tests_shared.inl index d3631718fe..55a976536f 100644 --- a/shared/test/unit_test/built_ins/built_in_tests_shared.inl +++ b/shared/test/unit_test/built_ins/built_in_tests_shared.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_builtinslib.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/command_container/command_container_tests.cpp b/shared/test/unit_test/command_container/command_container_tests.cpp index 80fda90ecf..1e50020392 100644 --- a/shared/test/unit_test/command_container/command_container_tests.cpp +++ b/shared/test/unit_test/command_container/command_container_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/command_container/command_encoder_tests.cpp b/shared/test/unit_test/command_container/command_encoder_tests.cpp index 6975369dd6..51ce59bc3e 100644 --- a/shared/test/unit_test/command_container/command_encoder_tests.cpp +++ b/shared/test/unit_test/command_container/command_encoder_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using CommandEncoderTests = ::testing::Test; diff --git a/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp b/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp index 12ad7f1589..faab82687f 100644 --- a/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp +++ b/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm_helper.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using CommandEncoderXeHpgCorePlusTests = Test; diff --git a/shared/test/unit_test/command_queue/flattened_id_tests.cpp b/shared/test/unit_test/command_queue/flattened_id_tests.cpp index 9d8bcd5c20..b6f352d43e 100644 --- a/shared/test/unit_test/command_queue/flattened_id_tests.cpp +++ b/shared/test/unit_test/command_queue/flattened_id_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/string.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 #include diff --git a/shared/test/unit_test/command_queue/local_id_tests.cpp b/shared/test/unit_test/command_queue/local_id_tests.cpp index 2f115ea1d3..85ce43478b 100644 --- a/shared/test/unit_test/command_queue/local_id_tests.cpp +++ b/shared/test/unit_test/command_queue/local_id_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/source/helpers/local_id_gen.h" #include "shared/source/helpers/ptr_math.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 #include diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 19624880aa..2d5b3bef54 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -21,7 +21,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 "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 778aa3e3ce..ba8515da1a 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -24,7 +24,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index a73922ac43..9a1cc70751 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_svm_manager.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/command_stream/aub_file_stream_tests.cpp b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp index 62ab302e49..c3a22a32b0 100644 --- a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -21,7 +21,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 "driver_version.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp index b16f529d4e..723b04642d 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp @@ -12,7 +12,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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using XeHPAndLaterMockSimulatedCsrHwTests = Test; diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 942f741f19..a38d0fc16a 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -27,7 +27,7 @@ #include "shared/test/common/mocks/mock_internal_allocation_storage.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/unit_test/direct_submission/direct_submission_controller_mock.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" diff --git a/shared/test/unit_test/command_stream/compute_mode_tests.h b/shared/test/unit_test/command_stream/compute_mode_tests.h index 3b12df8efe..2cadf67291 100644 --- a/shared/test/unit_test/command_stream/compute_mode_tests.h +++ b/shared/test/unit_test/command_stream/compute_mode_tests.h @@ -11,7 +11,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.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/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index ee1dfd0c32..7874697adc 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -25,7 +25,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_tbx_csr.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 809c64e637..ad08236d55 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -18,7 +18,7 @@ #include "shared/test/common/mocks/mock_cif.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp index 9ac9f9b004..f6ac287bbb 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp @@ -22,7 +22,7 @@ #include "shared/test/common/mocks/mock_direct_submission_diagnostic_collector.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_io_functions.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using DirectSubmissionTest = Test; diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp index f05def3e87..62bdcf9b7a 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp @@ -23,7 +23,7 @@ #include "shared/test/common/mocks/mock_direct_submission_diagnostic_collector.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_io_functions.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace CpuIntrinsicsTests { extern std::atomic sfenceCounter; diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp index 6797062761..3c9b0a99f5 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/direct_submission_fixture.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using DirectSubmissionTestXE_HP_CORE = Test; diff --git a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp index e0e9090ff1..3931bd1dae 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h" #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp index 8324695553..60fb366cfd 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.h" #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp index db5e1c5d22..d0b9372ce7 100644 --- a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/linux/mock_drm_allocation.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp index 2ee1ab498a..d0527823dd 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp @@ -10,7 +10,7 @@ #include "shared/source/os_interface/hw_info_config.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp index 17bc07fc48..b1892c9c83 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_device.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/encoders/test_command_encoder.cpp b/shared/test/unit_test/encoders/test_command_encoder.cpp index c45e817ee5..920a0629e6 100644 --- a/shared/test/unit_test/encoders/test_command_encoder.cpp +++ b/shared/test/unit_test/encoders/test_command_encoder.cpp @@ -9,7 +9,7 @@ #include "shared/source/command_container/command_encoder.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp index 25105c8833..178dd102a6 100644 --- a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp +++ b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp @@ -9,7 +9,7 @@ #include "shared/source/command_container/command_encoder.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_math.cpp b/shared/test/unit_test/encoders/test_encode_math.cpp index 21039da879..0a875848d4 100644 --- a/shared/test/unit_test/encoders/test_encode_math.cpp +++ b/shared/test/unit_test/encoders/test_encode_math.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp index d9a78d6caf..2d64477ee8 100644 --- a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp @@ -9,7 +9,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp b/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp index 204fe82f1f..8239f2ac40 100644 --- a/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp +++ b/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/default_hw_info.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/encoders/test_encode_set_mmio.cpp b/shared/test/unit_test/encoders/test_encode_set_mmio.cpp index d65de669bc..b7d877bcfb 100644 --- a/shared/test/unit_test/encoders/test_encode_set_mmio.cpp +++ b/shared/test/unit_test/encoders/test_encode_set_mmio.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/command_encoder.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h b/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h index 4c42d457b5..6d0a60a36a 100644 --- a/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h +++ b/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h @@ -12,7 +12,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.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" using namespace WalkerPartition; diff --git a/shared/test/unit_test/encoders/walker_partition_tests_pvc_and_later.cpp b/shared/test/unit_test/encoders/walker_partition_tests_pvc_and_later.cpp index 63a9d44aa8..4290d99268 100644 --- a/shared/test/unit_test/encoders/walker_partition_tests_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/walker_partition_tests_pvc_and_later.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.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" using namespace WalkerPartition; using namespace NEO; diff --git a/shared/test/unit_test/fixtures/templated_fixture_tests.cpp b/shared/test/unit_test/fixtures/templated_fixture_tests.cpp index 5d79e36cca..f29fd5da02 100644 --- a/shared/test/unit_test/fixtures/templated_fixture_tests.cpp +++ b/shared/test/unit_test/fixtures/templated_fixture_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { struct TemplatedFixtureTests : public ::testing::Test { diff --git a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp index f3ca677fbd..ef8214be61 100644 --- a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -12,7 +12,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 ef6418b792..b77f70c2f1 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 2df96d3515..a770e81b39 100644 --- a/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp +++ b/shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen11/hw_cmds_base.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/gen11/icllp/excludes_gen11_icllp.cpp b/shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp index d875d5d890..684777f55a 100644 --- a/shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAdditionalMediaSamplerProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP) HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfInitialFlagsProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP) 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 c6c29efe16..91488d22b3 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 @@ -7,7 +7,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/hw_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 6220bcdf95..7b0c1459bf 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 @@ -12,7 +12,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 4e0e122028..4c334f9748 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 76cffe5f15..066e27c013 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 @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/windows/gmm_callbacks.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/gen12lp/adln/test_device_caps_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp index bac3f388f2..3105376832 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/fixtures/device_fixture.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/gen12lp/dg1/excludes_gen12lp_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp index a52633e494..785c450386 100644 --- a/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_DG1); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_DG1); 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 f8f1c29f43..41855ede37 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 @@ -8,7 +8,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/hw_cmds_gen12lp_tests.cpp b/shared/test/unit_test/gen12lp/hw_cmds_gen12lp_tests.cpp index 61d72a95ed..78770d4d29 100644 --- a/shared/test/unit_test/gen12lp/hw_cmds_gen12lp_tests.cpp +++ b/shared/test/unit_test/gen12lp/hw_cmds_gen12lp_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen12lp/hw_cmds_base.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/gen12lp/rkl/excludes_gen12lp_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp index 20c9c7f3cf..05fa547f05 100644 --- a/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); diff --git a/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp index ddaefc6b34..4a1dade1f7 100644 --- a/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); diff --git a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index 23aa48fbd1..8992993c85 100644 --- a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/ult_command_stream_receiver.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/gen12lp/windows/wddm_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp index fc363f3dca..6e3327e3cb 100644 --- a/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/mocks/windows/mock_gmm_memory_base.h" #include "shared/test/common/os_interface/windows/gdi_dll_fixture.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/gen8/bdw/test_device_caps_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp index d254d8ac25..a785efd7e6 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_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 8201d32223..d0932a93c0 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 @@ -7,7 +7,7 @@ #include "shared/source/helpers/compiler_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/hw_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 1557d578c7..f3b065e96d 100644 --- a/shared/test/unit_test/gen8/coherency_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/coherency_tests_gen8.cpp @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/sampler_tests_gen8.cpp b/shared/test/unit_test/gen8/sampler_tests_gen8.cpp index ee6bf24926..203ffa0c86 100644 --- a/shared/test/unit_test/gen8/sampler_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/sampler_tests_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,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/hw_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 2b68e4718a..fd686609c0 100644 --- a/shared/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/shared/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/fixtures/device_fixture.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/gen8/test_sample_gen8.cpp b/shared/test/unit_test/gen8/test_sample_gen8.cpp index 1691cfad25..fd34f5565d 100644 --- a/shared/test/unit_test/gen8/test_sample_gen8.cpp +++ b/shared/test/unit_test/gen8/test_sample_gen8.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/test/common/helpers/default_hw_info.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/gen8/windows/gmm_callbacks_tests_gen8.cpp b/shared/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp index a375e19aeb..e6bdbf3088 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 @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks.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/gen9/hw_cmds_gen9_tests.cpp b/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp index 1f5de26a9c..2b9e7b5b67 100644 --- a/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp +++ b/shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen9/hw_cmds_base.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/gen9/windows/gmm_callbacks_tests_gen9.cpp b/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp index 751eb6dc6c..4b39b0f2df 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 @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/windows/gmm_callbacks.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/gmm_helper/gmm_resource_info_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp index 57021684f8..649bdc6ea7 100644 --- a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp +++ b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" extern PRODUCT_FAMILY productFamily; diff --git a/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp b/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp index 3ee26ba247..469bbdd998 100644 --- a/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp +++ b/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/heap_assigner.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp b/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp index 8c0bd2a981..762f245a19 100644 --- a/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp +++ b/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/cmd_buffer_validator.h" using HwParseTest = ::testing::Test; diff --git a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp b/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp index ca3218fe91..b17ad73f1b 100644 --- a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp +++ b/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/test/common/fixtures/device_fixture.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" using namespace NEO; diff --git a/shared/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp b/shared/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp index f7ed7f204b..4699f82451 100644 --- a/shared/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp +++ b/shared/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/kmd_notify_properties.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/helpers/timestamp_packet_tests.cpp b/shared/test/unit_test/helpers/timestamp_packet_tests.cpp index ba5fe5c3c7..eaa472bcaa 100644 --- a/shared/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/shared/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/mocks/mock_timestamp_packet.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp b/shared/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp index fb1e9e143a..b2e4716e38 100644 --- a/shared/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp +++ b/shared/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/windows/sys_calls.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" 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 6b8a9b7271..1d878d1031 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,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp index 0c33bc9c1e..2d9451e938 100644 --- a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp +++ b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/kernel/implicit_args.h" #include "shared/source/kernel/kernel_descriptor.h" #include "shared/test/common/helpers/default_hw_info.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/memory_manager/deferrable_allocation_deletion_tests.cpp b/shared/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp index 6b339a7cbb..218933c752 100644 --- a/shared/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp +++ b/shared/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.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/memory_manager/graphics_allocation_tests.cpp b/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp index 1cb2a369d9..ad6ce1c866 100644 --- a/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp +++ b/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_execution_environment.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/memory_manager/host_ptr_manager_tests.cpp b/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index e4befb35dd..4582d75418 100644 --- a/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/mocks/mock_host_ptr_manager.h" #include "shared/test/common/mocks/mock_internal_allocation_storage.h" #include "shared/test/common/mocks/mock_memory_manager.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/memory_manager/internal_allocation_storage_tests.cpp b/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index 8ccbbdb484..1c7a09a116 100644 --- a/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_allocation_properties.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" #include "shared/test/unit_test/utilities/containers_tests_helpers.h" struct InternalAllocationStorageTest : public MemoryAllocatorFixture, diff --git a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp index ffd9076aa0..8e001361cf 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.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/memory_manager/physical_address_allocator_hw_tests.cpp b/shared/test/unit_test/memory_manager/physical_address_allocator_hw_tests.cpp index 60d272ea3f..e657992144 100644 --- a/shared/test/unit_test/memory_manager/physical_address_allocator_hw_tests.cpp +++ b/shared/test/unit_test/memory_manager/physical_address_allocator_hw_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/test/common/mocks/mock_physical_address_allocator.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/memory_manager/storage_info_tests.cpp b/shared/test/unit_test/memory_manager/storage_info_tests.cpp index 277313ca6a..38057b9da8 100644 --- a/shared/test/unit_test/memory_manager/storage_info_tests.cpp +++ b/shared/test/unit_test/memory_manager/storage_info_tests.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.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/memory_manager/surface_tests.cpp b/shared/test/unit_test/memory_manager/surface_tests.cpp index 1ee806be79..66991cc642 100644 --- a/shared/test/unit_test/memory_manager/surface_tests.cpp +++ b/shared/test/unit_test/memory_manager/surface_tests.cpp @@ -13,7 +13,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_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/device_uuid_tests.cpp b/shared/test/unit_test/os_interface/device_uuid_tests.cpp index 78ab154da7..9088b7a918 100644 --- a/shared/test/unit_test/os_interface/device_uuid_tests.cpp +++ b/shared/test/unit_test/os_interface/device_uuid_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { struct MultipleDeviceBdfUuidTest : public ::testing::Test { diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.h b/shared/test/unit_test/os_interface/hw_info_config_tests.h index 7600ec140f..cf62a8e028 100644 --- a/shared/test/unit_test/os_interface/hw_info_config_tests.h +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.h @@ -8,7 +8,7 @@ #pragma once #include "shared/test/common/helpers/default_hw_info.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/os_interface/linux/device_command_stream_tests.cpp b/shared/test/unit_test/os_interface/linux/device_command_stream_tests.cpp index c94cc15c28..74b93e3fcf 100644 --- a/shared/test/unit_test/os_interface/linux/device_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/device_command_stream_tests.cpp @@ -16,7 +16,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/execution_environment_helper.h" #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp index 4b22f4e3ae..948a2f8733 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.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/os_interface/linux/drm_command_stream_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp index f860af5ae8..f6bffdfec6 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/api_specific_config.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { extern ApiSpecificConfig::ApiType apiTypeForUlts; diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp index 3e8632eab5..91935d9b1d 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/os_interface/linux/device_command_stream_fixture_prelim.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp index de979bf517..0eff0820c8 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp @@ -23,7 +23,7 @@ #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.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/os_interface/linux/drm_debug_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp index a391376ffb..6b63e54dd3 100644 --- a/shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp @@ -11,7 +11,7 @@ #include "shared/test/common/libult/linux/drm_query_mock.h" #include "shared/test/common/mocks/linux/mock_drm_allocation.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp index 9a05dcf5ed..4bc0a074c9 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/linux/drm_mock_helper.h" #include "shared/test/common/libult/linux/drm_query_mock.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/os_interface/linux/drm_memory_info_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp index 25d98edb24..c579c6f96d 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/os_interface/linux/memory_info.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/linux/drm_mock_impl.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp index 46756ee848..b540fa3983 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp @@ -21,7 +21,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp index 929f2d9215..8d462a2483 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h" #include "shared/test/common/os_interface/linux/drm_mock_memory_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/linux/drm_mock_impl.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 83977f5417..8efedec66d 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h" #include "shared/test/common/os_interface/linux/drm_mock_cache_info.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp index d4d36f5c1d..004eed5752 100644 --- a/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_allocation.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp index 36afedede9..f5e37a39aa 100644 --- a/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp @@ -26,7 +26,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm_client_context.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" #include diff --git a/shared/test/unit_test/os_interface/linux/hw_info_config_uuid_tests.cpp b/shared/test/unit_test/os_interface/linux/hw_info_config_uuid_tests.cpp index 9fe02eb55c..47a676a3d5 100644 --- a/shared/test/unit_test/os_interface/linux/hw_info_config_uuid_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/hw_info_config_uuid_tests.cpp @@ -15,7 +15,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" 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 563f28e682..faebbe72d7 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 @@ -10,7 +10,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp b/shared/test/unit_test/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp index 4cea467d1f..abf7bcb6a1 100644 --- a/shared/test/unit_test/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp +++ b/shared/test/unit_test/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp @@ -20,7 +20,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gmm_memory.h" diff --git a/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp b/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp index 8d1c04765f..37e6b4ded6 100644 --- a/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/os_interface/windows/ult_dxcore_factory.h" #include "shared/test/common/os_interface/windows/ult_dxgi_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 842ac47bbb..43bff9d864 100644 --- a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -41,7 +41,7 @@ #include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "hw_cmds.h" diff --git a/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp b/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp index 5c7fe2a605..a6902499f3 100644 --- a/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/windows/gdi_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp index b457d6e4a4..235ba7f4c1 100644 --- a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp @@ -14,7 +14,7 @@ #include "shared/source/os_interface/windows/wddm/wddm.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/os_interface/windows/os_library_win_tests.cpp b/shared/test/unit_test/os_interface/windows/os_library_win_tests.cpp index 5969d1dae2..846a1584c1 100644 --- a/shared/test/unit_test/os_interface/windows/os_library_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/os_library_win_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/windows/os_library_win.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp index 14e8874143..5ac99d0129 100644 --- a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/windows/gdi_interface.h" #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/windows/adapter_info_tests.h" #include "shared/wsl_compute_helper/source/gmm_resource_info_accessor.h" #include "shared/wsl_compute_helper/source/wsl_compute_helper.h" diff --git a/shared/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp index 63db8a0bab..27c666fd49 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_wddm.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/os_interface/windows/wddm_command_stream_l0_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_command_stream_l0_tests.cpp index 0e7ccbebbd..a76cb422a9 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_command_stream_l0_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_command_stream_l0_tests.cpp @@ -35,7 +35,7 @@ #include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { extern ApiSpecificConfig::ApiType apiTypeForUlts; diff --git a/shared/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp index 8c5b6620f5..8805d6944c 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/windows/wddm_engine_mapper.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/os_interface/windows/wddm_preemption_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp index 2572bb0756..79456f7029 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/os_interface/windows/wddm_fixture.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/os_interface/windows/wddm_shared_allocations_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp index 5451f0a171..1c73f11aee 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp @@ -9,7 +9,7 @@ #include "shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h" #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/os_interface/windows/wddm_fixture.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/os_interface/windows/wddm_special_heap_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp index f684718543..fbaa8e1ccd 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index e7f1c8b314..f1b58acff0 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index c7f06e3553..f2d013cb96 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -17,7 +17,7 @@ #include "shared/test/common/helpers/unit_test_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/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "reg_configs_common.h" #include diff --git a/shared/test/unit_test/preamble/test_preamble_xe_hpg_core.cpp b/shared/test/unit_test/preamble/test_preamble_xe_hpg_core.cpp index 2a40bb36cd..0a7a982dc5 100644 --- a/shared/test/unit_test/preamble/test_preamble_xe_hpg_core.cpp +++ b/shared/test/unit_test/preamble/test_preamble_xe_hpg_core.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/preamble.h" #include "shared/source/utilities/stackvec.h" #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using PreambleTest = ::testing::Test; diff --git a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp index e162b12b1a..53f30bc973 100644 --- a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp +++ b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/scratch_space_controller_base.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_command_stream_receiver.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/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp index c3146ff0bf..cc185da6bc 100644 --- a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp +++ b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_command_stream_receiver.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/source_level_debugger/source_level_debugger_preamble_test.h b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h index cbdf36900c..b9604fef57 100644 --- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h +++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h @@ -13,7 +13,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" template class SourceLevelDebuggerPreambleTest { diff --git a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp index a34272d586..be4f73490e 100644 --- a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp +++ b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/utilities/software_tags_manager.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using namespace SWTags; diff --git a/shared/test/unit_test/utilities/tag_allocator_tests.cpp b/shared/test/unit_test/utilities/tag_allocator_tests.cpp index 7853d0c663..774ab62ff4 100644 --- a/shared/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/shared/test/unit_test/utilities/tag_allocator_tests.cpp @@ -14,7 +14,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_packet.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/utilities/wait_util_tests.cpp b/shared/test/unit_test/utilities/wait_util_tests.cpp index ffe2a8fcf4..9a2828a902 100644 --- a/shared/test/unit_test/utilities/wait_util_tests.cpp +++ b/shared/test/unit_test/utilities/wait_util_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/utilities/wait_util.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/xe_hp_core/aub_center_using_aubstream_lib_tests_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/aub_center_using_aubstream_lib_tests_xe_hp_core.cpp index 05c39acbb5..975857ee19 100644 --- a/shared/test/unit_test/xe_hp_core/aub_center_using_aubstream_lib_tests_xe_hp_core.cpp +++ b/shared/test/unit_test/xe_hp_core/aub_center_using_aubstream_lib_tests_xe_hp_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using XeHpCoreAubCenterTests = ::testing::Test; diff --git a/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp index 4b145204cc..2a5a7b12de 100644 --- a/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp +++ b/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE); diff --git a/shared/test/unit_test/xe_hp_core/hw_cmds_xe_hp_core_tests.cpp b/shared/test/unit_test/xe_hp_core/hw_cmds_xe_hp_core_tests.cpp index e049cd35fe..3053cdc18c 100644 --- a/shared/test/unit_test/xe_hp_core/hw_cmds_xe_hp_core_tests.cpp +++ b/shared/test/unit_test/xe_hp_core/hw_cmds_xe_hp_core_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/xe_hp_core/hw_cmds_base.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/xe_hp_core/hw_helper_xe_hp_core_tests.cpp b/shared/test/unit_test/xe_hp_core/hw_helper_xe_hp_core_tests.cpp index 437a777c3a..ef7483bc2c 100644 --- a/shared/test/unit_test/xe_hp_core/hw_helper_xe_hp_core_tests.cpp +++ b/shared/test/unit_test/xe_hp_core/hw_helper_xe_hp_core_tests.cpp @@ -8,7 +8,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using HwHelperXeHpCoreTest = ::testing::Test; diff --git a/shared/test/unit_test/xe_hp_core/product_config_tests_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/product_config_tests_xe_hp_core.cpp index 96eeaab416..a684016f7c 100644 --- a/shared/test/unit_test/xe_hp_core/product_config_tests_xe_hp_core.cpp +++ b/shared/test/unit_test/xe_hp_core/product_config_tests_xe_hp_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/product_config_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "platforms.h" 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 8c73c5abee..5cc08e04f9 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 @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 3970c5aae8..555a6422a3 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 @@ -12,7 +12,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 b68fac1cd0..68f04f41b2 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 6de50646a2..8014084119 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 @@ -12,7 +12,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 15588ecd5b..5996ebd08e 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,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_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 d0202209b3..765d8d9dfa 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 @@ -9,7 +9,7 @@ #include "shared/source/os_interface/hw_info_config.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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp index 400eac514d..1c1de58904 100644 --- a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenOverrideSlmTotalSizeDebugVariableWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_XE_HPC_CORE); 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 a25fce847d..c6b3ce8543 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,7 @@ */ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.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/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 36d626da7e..bfc516f0f6 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 @@ -15,7 +15,7 @@ #include "shared/source/helpers/product_config_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/test.h" +#include "shared/test/common/test_macros/hw_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 a75319880f..a1cbe6c707 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 @@ -10,7 +10,7 @@ #include "shared/source/os_interface/device_factory.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/test.h" +#include "shared/test/common/test_macros/hw_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 024bf398ad..00e727b3f2 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 @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.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/test.h" +#include "shared/test/common/test_macros/hw_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 94bcb3c896..287c16dbe9 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,7 @@ */ #include "shared/source/helpers/product_config_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "platforms.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 97ebfd710c..9398155145 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 @@ -8,7 +8,7 @@ #include "shared/source/helpers/constants.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/test.h" +#include "shared/test/common/test_macros/hw_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 c4b33007c1..c711166b7d 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/fixtures/device_fixture.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/xe_hpc_core/test_sample_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp index 790635ce46..2c40bdb605 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 @@ -6,7 +6,7 @@ */ #include "shared/test/common/fixtures/device_fixture.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/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 1aec998a41..2df341daef 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #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/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO; using XeHpgCoreAubCenterTests = ::testing::Test; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/ail_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/ail_tests_dg2.cpp index 51811ef8be..91c54dc3a3 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/ail_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/ail_tests_dg2.cpp @@ -8,7 +8,7 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" namespace NEO { 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 047220bd12..cfcb63a2de 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 @@ -15,7 +15,7 @@ #include "shared/source/helpers/product_config_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/test.h" +#include "shared/test/common/test_macros/hw_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/excludes_xe_hpg_core_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp index c0f14554c3..5753d3c87f 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned, IGFX_DG2); 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 5426631ad3..110d2f1902 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 @@ -8,7 +8,7 @@ #include "shared/source/helpers/hw_helper.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/test.h" +#include "shared/test/common/test_macros/hw_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 dc59ea71bd..8887e463c9 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,7 @@ */ #include "shared/source/helpers/product_config_helper.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" #include "platforms.h" diff --git a/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp index 9b33df0210..c8567eee1f 100644 --- a/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp +++ b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HPG_CORE); 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 a395ae0ed2..66500d4b8d 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,7 @@ */ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.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/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp index d49bcdf8b0..761008d1db 100644 --- a/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp +++ b/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp @@ -10,7 +10,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/hw_test.h" using namespace NEO;