From 39f0387ecc3fc8a6fc6e82057a3b9d88975fb211 Mon Sep 17 00:00:00 2001 From: Dominik Dabek Date: Mon, 31 May 2021 11:28:07 +0200 Subject: [PATCH] Move tbx stream, tbx csr to shared Related-To: NEO-5161 Signed-off-by: Dominik Dabek i --- level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp | 2 +- .../core/source/gen12lp/enable_family_full_l0_gen12lp.cpp | 2 +- level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp | 2 +- level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp | 2 +- manifests/manifest.yml | 2 +- opencl/source/command_stream/CMakeLists.txt | 5 ----- opencl/source/command_stream/create_command_stream_impl.cpp | 2 +- opencl/source/dll/create_command_stream.cpp | 2 +- opencl/source/gen11/enable_family_full_ocl_gen11.cpp | 2 +- opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp | 4 ++-- opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp | 2 +- .../source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp | 4 ++-- opencl/source/gen8/enable_family_full_ocl_gen8.cpp | 2 +- opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp | 4 ++-- opencl/source/gen9/enable_family_full_ocl_gen9.cpp | 2 +- opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp | 4 ++-- .../aub_tests/command_stream/aub_command_stream_fixture.cpp | 2 +- .../aub_tests/command_stream/aub_command_stream_fixture.h | 2 +- opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h | 2 +- .../command_stream_receiver_with_aub_dump_tests.cpp | 2 +- .../unit_test/command_stream/tbx_command_stream_fixture.h | 3 ++- .../unit_test/command_stream/tbx_command_stream_tests.cpp | 2 +- opencl/test/unit_test/command_stream/tbx_stream_tests.cpp | 3 +-- opencl/test/unit_test/device/device_tests.cpp | 2 +- .../gen11/tbx_command_stream_receiver_tests_gen11.cpp | 3 ++- .../gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl | 2 +- opencl/test/unit_test/libult/create_command_stream.cpp | 2 +- shared/source/command_stream/CMakeLists.txt | 5 +++++ .../source/command_stream/tbx_command_stream_receiver.cpp | 2 +- .../source/command_stream/tbx_command_stream_receiver.h | 0 .../source/command_stream/tbx_command_stream_receiver_hw.h | 3 +-- .../source/command_stream/tbx_command_stream_receiver_hw.inl | 0 {opencl => shared}/source/command_stream/tbx_stream.cpp | 3 +-- shared/test/common/mocks/mock_tbx_csr.h | 3 +-- shared/test/common/mocks/mock_tbx_stream.h | 2 +- 35 files changed, 42 insertions(+), 44 deletions(-) rename {opencl => shared}/source/command_stream/tbx_command_stream_receiver.cpp (95%) rename {opencl => shared}/source/command_stream/tbx_command_stream_receiver.h (100%) rename {opencl => shared}/source/command_stream/tbx_command_stream_receiver_hw.h (98%) rename {opencl => shared}/source/command_stream/tbx_command_stream_receiver_hw.inl (100%) rename {opencl => shared}/source/command_stream/tbx_stream.cpp (96%) diff --git a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp index cb7d808a74..53bf642183 100644 --- a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp +++ b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/mem_obj/buffer.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" diff --git a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp index 1089b13cd6..253080274c 100644 --- a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp +++ b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/mem_obj/buffer.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" diff --git a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp index da4c80268f..ddd6a0b795 100644 --- a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp +++ b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/mem_obj/buffer.h" namespace NEO { diff --git a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp index 90c2215d0b..90f680f55f 100644 --- a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp +++ b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/mem_obj/buffer.h" #include "level_zero/core/source/helpers/l0_populate_factory.h" diff --git a/manifests/manifest.yml b/manifests/manifest.yml index cfe0ebedd7..069f6877fe 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -14,7 +14,7 @@ components: infra: branch: infra dest_dir: infra - revision: e234b2757b258d6ccf524492efd5775068a7a39f + revision: 4680c158109278771c386c356bc9dd9b5517b64a type: git internal: branch: master diff --git a/opencl/source/command_stream/CMakeLists.txt b/opencl/source/command_stream/CMakeLists.txt index 92a66a93de..3a898c6427 100644 --- a/opencl/source/command_stream/CMakeLists.txt +++ b/opencl/source/command_stream/CMakeLists.txt @@ -20,11 +20,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_impl.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_simulated_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.inl - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream.cpp ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_STREAM}) diff --git a/opencl/source/command_stream/create_command_stream_impl.cpp b/opencl/source/command_stream/create_command_stream_impl.cpp index 456d726add..39be6d52d6 100644 --- a/opencl/source/command_stream/create_command_stream_impl.cpp +++ b/opencl/source/command_stream/create_command_stream_impl.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/device_factory.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" namespace NEO { diff --git a/opencl/source/dll/create_command_stream.cpp b/opencl/source/dll/create_command_stream.cpp index 0b7707c78e..379e065712 100644 --- a/opencl/source/dll/create_command_stream.cpp +++ b/opencl/source/dll/create_command_stream.cpp @@ -6,12 +6,12 @@ */ #include "shared/source/command_stream/device_command_stream.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/helpers/hw_info.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/create_command_stream_impl.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" namespace NEO { diff --git a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp index 8d1982fa2b..4e4708a79a 100644 --- a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp +++ b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp b/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp index 5eb5b42ef5..b96accb662 100644 --- a/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp +++ b/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.inl" #include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" namespace NEO { typedef ICLFamily Family; diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp index 9a14e24d7b..48e56ff867 100644 --- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp +++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 282430dd9b..36dee6cfd1 100644 --- a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -5,14 +5,14 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.inl" #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_pool.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" #include "aub_mem_dump.h" diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp index 20188d6223..5b390d11ff 100644 --- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp +++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp b/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp index a4845e2793..8dae9c51e0 100644 --- a/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp +++ b/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.inl" #include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/array_count.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" namespace NEO { diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp index 7230a0e60b..8573431114 100644 --- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp +++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/cl_hw_helper.h" diff --git a/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp b/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp index d390d7409d..77b527ee57 100644 --- a/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp +++ b/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.inl" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/populate_factory.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp index df009362fb..18f7ad2276 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -8,6 +8,7 @@ #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" @@ -17,7 +18,6 @@ #include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index 4e2e78a252..a5aef41582 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -7,6 +7,7 @@ #pragma once #include "shared/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/os_context.h" @@ -14,7 +15,6 @@ #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index f8ad3a426a..7a92da2b72 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -7,6 +7,7 @@ #pragma once #include "shared/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_device.h" @@ -15,7 +16,6 @@ #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.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 966b031dbe..9ba1f88f1d 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 @@ -6,6 +6,7 @@ */ #include "shared/source/command_stream/preemption.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/flush_stamp.h" #include "shared/source/helpers/hw_helper.h" @@ -17,7 +18,6 @@ #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h index 8a8aa4fe03..2553d6cfe0 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h @@ -6,7 +6,8 @@ */ #pragma once -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" + #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index 7e648fcc89..68b0d18f49 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/hw_helper.h" @@ -22,7 +23,6 @@ #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp index 9323526980..e05a1fe499 100644 --- a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp @@ -5,11 +5,10 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/test/common/mocks/mock_tbx_sockets.h" #include "shared/test/common/mocks/mock_tbx_stream.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" - #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 8145ecd1f4..5ef6a0476a 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/indirect_heap/indirect_heap.h" @@ -16,7 +17,6 @@ #include "shared/test/common/mocks/mock_driver_info.h" #include "shared/test/common/mocks/ult_device_factory.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.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 c973c893ea..b961685844 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 @@ -5,7 +5,8 @@ * */ -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index f5ac3e5218..f915f56ef1 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -6,9 +6,9 @@ */ #include "shared/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/libult/create_command_stream.cpp b/opencl/test/unit_test/libult/create_command_stream.cpp index 58dc0a2b68..919c78ff96 100644 --- a/opencl/test/unit_test/libult/create_command_stream.cpp +++ b/opencl/test/unit_test/libult/create_command_stream.cpp @@ -8,6 +8,7 @@ #include "opencl/test/unit_test/libult/create_command_stream.h" #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/device_factory.h" #include "shared/test/common/helpers/default_hw_info.h" @@ -16,7 +17,6 @@ #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/create_command_stream_impl.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include diff --git a/shared/source/command_stream/CMakeLists.txt b/shared/source/command_stream/CMakeLists.txt index 10fdeb266d..6bb0966120 100644 --- a/shared/source/command_stream/CMakeLists.txt +++ b/shared/source/command_stream/CMakeLists.txt @@ -38,6 +38,11 @@ set(NEO_CORE_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/stream_property.h ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator.h + ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h + ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy.h ) diff --git a/opencl/source/command_stream/tbx_command_stream_receiver.cpp b/shared/source/command_stream/tbx_command_stream_receiver.cpp similarity index 95% rename from opencl/source/command_stream/tbx_command_stream_receiver.cpp rename to shared/source/command_stream/tbx_command_stream_receiver.cpp index fa379135dc..8ddffa8377 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver.cpp +++ b/shared/source/command_stream/tbx_command_stream_receiver.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" diff --git a/opencl/source/command_stream/tbx_command_stream_receiver.h b/shared/source/command_stream/tbx_command_stream_receiver.h similarity index 100% rename from opencl/source/command_stream/tbx_command_stream_receiver.h rename to shared/source/command_stream/tbx_command_stream_receiver.h diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.h b/shared/source/command_stream/tbx_command_stream_receiver_hw.h similarity index 98% rename from opencl/source/command_stream/tbx_command_stream_receiver_hw.h rename to shared/source/command_stream/tbx_command_stream_receiver_hw.h index 71c528d68d..7d8ff2b43d 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver_hw.h +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.h @@ -6,12 +6,11 @@ */ #pragma once +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/memory_manager/address_mapper.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/page_table.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" - #include "aub_mapper.h" #include "command_stream_receiver_simulated_hw.h" diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl similarity index 100% rename from opencl/source/command_stream/tbx_command_stream_receiver_hw.inl rename to shared/source/command_stream/tbx_command_stream_receiver_hw.inl diff --git a/opencl/source/command_stream/tbx_stream.cpp b/shared/source/command_stream/tbx_stream.cpp similarity index 96% rename from opencl/source/command_stream/tbx_stream.cpp rename to shared/source/command_stream/tbx_stream.cpp index ef4f306f3c..4ef7a61827 100644 --- a/opencl/source/command_stream/tbx_stream.cpp +++ b/shared/source/command_stream/tbx_stream.cpp @@ -6,12 +6,11 @@ */ #include "shared/source/aub/aub_helper.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/tbx/tbx_sockets.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" - namespace NEO { TbxStream::TbxStream() { diff --git a/shared/test/common/mocks/mock_tbx_csr.h b/shared/test/common/mocks/mock_tbx_csr.h index 23eeee2e60..02c3d2ee3e 100644 --- a/shared/test/common/mocks/mock_tbx_csr.h +++ b/shared/test/common/mocks/mock_tbx_csr.h @@ -9,11 +9,10 @@ #include "shared/source/aub/aub_center.h" #include "shared/source/command_stream/preemption.h" +#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_info.h" -#include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" - #include "gmock/gmock.h" #include diff --git a/shared/test/common/mocks/mock_tbx_stream.h b/shared/test/common/mocks/mock_tbx_stream.h index e3e8cccda9..fbe6f640c5 100644 --- a/shared/test/common/mocks/mock_tbx_stream.h +++ b/shared/test/common/mocks/mock_tbx_stream.h @@ -7,7 +7,7 @@ #pragma once -#include "opencl/source/command_stream/tbx_command_stream_receiver.h" +#include "shared/source/command_stream/tbx_command_stream_receiver.h" namespace NEO {