From f171a22c0a60fc3f9a129eb540f0c85cb6422790 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 3 Jul 2024 11:30:28 +0000 Subject: [PATCH] refactor: include reg_configs_common using full path add missing register offset value Signed-off-by: Mateusz Jablonski --- .../command_queue/enqueue_copy_buffer_rect_tests.cpp | 3 +-- .../unit_test/command_queue/enqueue_copy_buffer_tests.cpp | 3 +-- .../command_queue/enqueue_copy_buffer_to_image_tests.cpp | 3 +-- .../unit_test/command_queue/enqueue_copy_image_tests.cpp | 3 +-- .../command_queue/enqueue_copy_image_to_buffer_tests.cpp | 3 +-- .../unit_test/command_queue/enqueue_fill_buffer_tests.cpp | 3 +-- .../unit_test/command_queue/enqueue_fill_image_tests.cpp | 5 ++--- .../test/unit_test/command_queue/enqueue_kernel_2_tests.cpp | 3 +-- .../command_queue/enqueue_read_buffer_rect_tests.cpp | 5 ++--- .../unit_test/command_queue/enqueue_read_buffer_tests.cpp | 3 +-- .../unit_test/command_queue/enqueue_read_image_tests.cpp | 3 +-- .../command_queue/enqueue_write_buffer_rect_tests.cpp | 5 ++--- .../unit_test/command_queue/enqueue_write_buffer_tests.cpp | 5 ++--- .../unit_test/command_queue/enqueue_write_image_tests.cpp | 3 +-- .../command_stream_receiver_flush_task_2_tests.cpp | 3 +-- .../command_stream_receiver_flush_task_gmock_tests.cpp | 2 +- .../gen11/command_stream_receiver_hw_tests_gen11.cpp | 4 ++-- opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp | 5 ++--- .../gen12lp/command_stream_receiver_hw_tests_gen12lp.inl | 4 ++-- .../unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp | 2 +- .../unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp | 4 ++-- .../test/unit_test/helpers/test_preamble_xehp_and_later.cpp | 2 +- shared/source/aub_mem_dump/aub_mem_dump_pvc_and_later.inl | 4 ++-- shared/source/aub_mem_dump/aub_mem_dump_xehp_and_later.inl | 4 ++-- shared/source/gen11/command_encoder_gen11.cpp | 3 +-- shared/source/gen11/preamble_gen11.cpp | 5 ++--- shared/source/gen12lp/aub_mem_dump_gen12lp.cpp | 4 ++-- shared/source/gen_common/CMakeLists.txt | 4 ++-- shared/source/helpers/preamble_base.inl | 3 +-- shared/source/helpers/preamble_xehp_and_later.inl | 3 +-- shared/source/helpers/register_offsets.h | 1 + shared/test/unit_test/gen11/test_preamble_gen11.cpp | 3 +-- .../test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp | 5 ++--- shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp | 3 +-- shared/test/unit_test/gen9/test_command_encoder_gen9.cpp | 5 ++--- shared/test/unit_test/preamble/preamble_tests.cpp | 1 - 36 files changed, 50 insertions(+), 74 deletions(-) diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp index dfe08a6422..ce38a98909 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/wait_status.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/constants.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" @@ -19,8 +20,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - using namespace NEO; const size_t EnqueueCopyBufferRectTest::BufferRect::sizeInBytes = 100 * 100 * 100 * sizeof(cl_char); diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index 0b5e9343bb..6acaa28beb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" @@ -23,8 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index bd2a188d98..21ae42e4d7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" @@ -23,8 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index b0be790563..85af8aeb38 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" @@ -20,8 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 13ba5faec3..73e8dc0484 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" @@ -22,8 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 27ae29a43a..712fb17a5d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/allocations_list.h" @@ -26,8 +27,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "reg_configs_common.h" - using namespace NEO; typedef Test EnqueueFillBufferCmdTests; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp index a252f9556c..71c07da002 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" @@ -16,8 +17,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 496c06440d..a4a68592cf 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/command_stream/wait_status.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/kernel/implicit_args_helper.h" #include "shared/source/memory_manager/allocations_list.h" @@ -30,8 +31,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "reg_configs_common.h" - using namespace NEO; struct TestParam2 { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index f7ad6e9602..2b9ccdc5e5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" @@ -19,8 +20,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "reg_configs_common.h" - using namespace NEO; HWTEST_F(EnqueueReadBufferRectTest, GivenNullBufferWhenReadingBufferThenInvalidMemObjectErrorIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index 09ab228de8..d2b8b881a8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/local_memory_access_modes.h" @@ -24,8 +25,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - using namespace NEO; HWTEST_F(EnqueueReadBufferTypeTest, GivenNullBufferWhenReadingBufferThenInvalidMemObjectErrorIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 1cd1df18a7..d2a6b83b10 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/migration_sync_data.h" @@ -23,8 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenReadingImageThenGpgpuWalkerIsProgrammedCorrectly) { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index 96c06fc2c0..677f62eb09 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" @@ -20,8 +21,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "reg_configs_common.h" - using namespace NEO; HWTEST_F(EnqueueWriteBufferRectTest, GivenNullBufferWhenWritingBufferThenInvalidMemObjectErrorIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index 6cd057c318..125a4f7815 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -22,8 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - using namespace NEO; HWTEST_F(EnqueueWriteBufferTypeTest, GivenNullBufferWhenWrtingBufferThenInvalidMemObjectErrorIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 40bfcb4723..51e7e95892 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_stream/wait_status.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/memory_manager.h" @@ -26,8 +27,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "reg_configs_common.h" - using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenWritingImageThenCommandsAreProgrammedCorrectly) { 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 efd233feff..7b301c0786 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 @@ -7,6 +7,7 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/scratch_space_controller.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/state_base_address.h" @@ -31,8 +32,6 @@ #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "reg_configs_common.h" - using namespace NEO; using CommandStreamReceiverFlushTaskTests = UltCommandStreamReceiverTest; 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 2d14249254..42ec030d79 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 @@ -11,6 +11,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/preamble.h" @@ -43,7 +44,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "reg_configs_common.h" #include "test_traits_common.h" using namespace NEO; 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 bee0ee353a..a2e36fb8c4 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-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index 6aa3145808..6e86280154 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen11/hw_cmds.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/helpers/static_size3.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" @@ -17,8 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "reg_configs_common.h" - namespace NEO { using Gen11EnqueueTest = Test; diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl index e07fd71695..6eca223011 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h" #include "shared/test/common/mocks/mock_csr.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "reg_configs_common.h" using namespace NEO; 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 fbe1611650..23e458b626 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 @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/gen8/hw_cmds.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "reg_configs_common.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 ab71625ecc..97e700c582 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-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" @@ -26,7 +27,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "reg_configs_common.h" using namespace NEO; #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" diff --git a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp index cef7cefb7d..a2fd212000 100644 --- a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_container/encode_surface_state.h" #include "shared/source/command_stream/stream_properties.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/state_base_address.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "encode_surface_state_args.h" -#include "reg_configs_common.h" #include "test_traits_common.h" using namespace NEO; diff --git a/shared/source/aub_mem_dump/aub_mem_dump_pvc_and_later.inl b/shared/source/aub_mem_dump/aub_mem_dump_pvc_and_later.inl index f8117d86d4..c2a8d32ac8 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump_pvc_and_later.inl +++ b/shared/source/aub_mem_dump/aub_mem_dump_pvc_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,13 +8,13 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "aub_mapper_common.h" #include "config.h" -#include "reg_configs_common.h" namespace AubMemDump { diff --git a/shared/source/aub_mem_dump/aub_mem_dump_xehp_and_later.inl b/shared/source/aub_mem_dump/aub_mem_dump_xehp_and_later.inl index 1dcdd72d44..9de1b47b33 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump_xehp_and_later.inl +++ b/shared/source/aub_mem_dump/aub_mem_dump_xehp_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,13 +8,13 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "aub_mapper_common.h" #include "config.h" -#include "reg_configs_common.h" namespace AubMemDump { diff --git a/shared/source/gen11/command_encoder_gen11.cpp b/shared/source/gen11/command_encoder_gen11.cpp index fba0d9c87a..33bea71c6a 100644 --- a/shared/source/gen11/command_encoder_gen11.cpp +++ b/shared/source/gen11/command_encoder_gen11.cpp @@ -8,8 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/gen11/reg_configs.h" - -#include "reg_configs_common.h" +#include "shared/source/gen_common/reg_configs_common.h" using Family = NEO::Gen11Family; diff --git a/shared/source/gen11/preamble_gen11.cpp b/shared/source/gen11/preamble_gen11.cpp index 89fd6f1542..3c15a3c0da 100644 --- a/shared/source/gen11/preamble_gen11.cpp +++ b/shared/source/gen11/preamble_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,13 +7,12 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/gen11/hw_cmds_base.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/pipe_control_args.h" #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/helpers/preamble_bdw_and_later.inl" -#include "reg_configs_common.h" - namespace NEO { using Family = Gen11Family; diff --git a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp index 1910b9e7af..5dd9cff46e 100644 --- a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen12lp/aub_mapper.h" #include "shared/source/gen12lp/hw_cmds_base.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "config.h" -#include "reg_configs_common.h" namespace AubMemDump { diff --git a/shared/source/gen_common/CMakeLists.txt b/shared/source/gen_common/CMakeLists.txt index a0bc7c9572..73d9c5f809 100644 --- a/shared/source/gen_common/CMakeLists.txt +++ b/shared/source/gen_common/CMakeLists.txt @@ -1,12 +1,12 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # set(NEO_CORE_GEN_COMMON ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}aub_mapper_common.h - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}reg_configs_common.h + ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs_common.h ) set_property(GLOBAL PROPERTY NEO_CORE_GEN_COMMON ${NEO_CORE_GEN_COMMON}) diff --git a/shared/source/helpers/preamble_base.inl b/shared/source/helpers/preamble_base.inl index 5f1fef5737..c05c3e7005 100644 --- a/shared/source/helpers/preamble_base.inl +++ b/shared/source/helpers/preamble_base.inl @@ -9,13 +9,12 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/device/device.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/preamble.h" #include "shared/source/helpers/register_offsets.h" -#include "reg_configs_common.h" - #include namespace NEO { diff --git a/shared/source/helpers/preamble_xehp_and_later.inl b/shared/source/helpers/preamble_xehp_and_later.inl index 614f62995c..28e36c4b13 100644 --- a/shared/source/helpers/preamble_xehp_and_later.inl +++ b/shared/source/helpers/preamble_xehp_and_later.inl @@ -8,13 +8,12 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/stream_properties.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/pipe_control_args.h" #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/helpers/preamble_base.inl" -#include "reg_configs_common.h" - namespace NEO { template diff --git a/shared/source/helpers/register_offsets.h b/shared/source/helpers/register_offsets.h index d60a21375c..4ae24b8556 100644 --- a/shared/source/helpers/register_offsets.h +++ b/shared/source/helpers/register_offsets.h @@ -48,6 +48,7 @@ inline constexpr uint32_t csPredicateResult2 = 0x23BC; inline constexpr uint32_t semaWaitPoll = 0x0224c; inline constexpr uint32_t gpThreadTimeRegAddressOffsetLow = 0x23A8; +inline constexpr uint32_t gpThreadTimeRegAddressOffsetHigh = 0x23AC; inline constexpr uint32_t globalTimestampLdw = 0x2358; inline constexpr uint32_t globalTimestampUn = 0x235c; diff --git a/shared/test/unit_test/gen11/test_preamble_gen11.cpp b/shared/test/unit_test/gen11/test_preamble_gen11.cpp index 199341f986..60e6231f55 100644 --- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/stream_properties.h" #include "shared/source/gen11/hw_cmds_base.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/fixtures/preamble_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -16,8 +17,6 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "reg_configs_common.h" - using namespace NEO; typedef PreambleFixture IclSlm; diff --git a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp index 8501d7bb85..d78371d89b 100644 --- a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/command_encoder.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/source/helpers/gfx_core_helper.h" @@ -21,8 +22,6 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" -#include "reg_configs_common.h" - using namespace NEO; using CommandEncoderTest = Test; diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index 2673c59524..fc4dbe0a90 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -7,12 +7,11 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/stream_properties.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/fixtures/preamble_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "reg_configs_common.h" - using namespace NEO; using TglLpSlm = PreambleFixture; diff --git a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp index 4d3d502557..1832221c23 100644 --- a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp +++ b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/command_encoder.h" #include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/source/indirect_heap/heap_size.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" @@ -16,8 +17,6 @@ #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" -#include "reg_configs_common.h" - using namespace NEO; using CommandEncoderTest = Test; diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index 6e4efbedda..a59bbeb05f 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -23,7 +23,6 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" -#include "reg_configs_common.h" #include #include