From 7ada522fa24384d0e84e1ce6b0767d192c80ee22 Mon Sep 17 00:00:00 2001 From: Konstanty Misiak Date: Tue, 3 Mar 2020 11:59:49 +0100 Subject: [PATCH] Move CSR to shared [1/n] Related-To: NEO-4344 Change-Id: I356b46bdfac7c943b95ee6dc41d3416bd880f9cb Signed-off-by: Konstanty Misiak --- CMakeLists.txt | 2 +- opencl/source/command_stream/CMakeLists.txt | 1 - opencl/source/dll/create_command_stream.cpp | 2 +- opencl/source/enable_gens.cmake | 1 - opencl/source/gen_common/CMakeLists.txt | 1 - opencl/source/os_interface/linux/CMakeLists.txt | 2 +- .../os_interface/linux/device_command_stream.inl | 3 ++- opencl/source/os_interface/linux/drm_command_stream.h | 3 +-- opencl/source/os_interface/windows/CMakeLists.txt | 2 +- .../os_interface/windows/device_command_stream.inl | 2 +- .../os_interface/windows/wddm_device_command_stream.h | 2 +- opencl/test/unit_test/gen11/coherency_tests_gen11.cpp | 2 +- .../gen11/icllp/test_program_media_sampler_icllp.cpp | 2 +- opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp | 3 ++- .../linux/device_command_stream_tests.cpp | 2 +- .../os_interface/linux/drm_gem_close_worker_tests.cpp | 2 +- .../os_interface/linux/drm_memory_manager_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 2 +- shared/source/CMakeLists.txt | 1 + shared/source/command_stream/CMakeLists.txt | 1 + .../source/command_stream/device_command_stream.h | 0 shared/source/enable_gens.cmake | 1 + shared/source/gen11/command_encoder_gen11.cpp | 2 +- .../source/gen11/command_stream_receiver_hw_gen11.cpp | 5 ++--- {opencl => shared}/source/gen11/reg_configs.h | 0 shared/source/gen12lp/command_encoder_gen12lp.cpp | 3 +-- .../gen12lp/command_stream_receiver_hw_gen12lp.cpp | 4 +--- {opencl => shared}/source/gen12lp/reg_configs.h | 0 shared/source/gen8/command_encoder_gen8.cpp | 3 +-- .../source/gen8/command_stream_receiver_hw_gen8.cpp | 3 +-- {opencl => shared}/source/gen8/reg_configs.h | 0 shared/source/gen9/command_encoder_gen9.cpp | 3 +-- .../source/gen9/command_stream_receiver_hw_gen9.cpp | 3 +-- {opencl => shared}/source/gen9/reg_configs.h | 0 shared/source/gen_common/CMakeLists.txt | 11 +++++++++++ .../gen_common/reg_configs/reg_configs_common.h | 8 ++++---- shared/test/unit_test/gen8/test_preamble_gen8.cpp | 2 +- shared/test/unit_test/gen9/skl/test_preamble_skl.cpp | 2 +- shared/test/unit_test/preamble/preamble_tests.cpp | 2 +- 39 files changed, 47 insertions(+), 43 deletions(-) rename {opencl => shared}/source/command_stream/device_command_stream.h (100%) rename {opencl => shared}/source/gen11/command_stream_receiver_hw_gen11.cpp (98%) rename {opencl => shared}/source/gen11/reg_configs.h (100%) rename {opencl => shared}/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp (97%) rename {opencl => shared}/source/gen12lp/reg_configs.h (100%) rename {opencl => shared}/source/gen8/command_stream_receiver_hw_gen8.cpp (98%) rename {opencl => shared}/source/gen8/reg_configs.h (100%) rename {opencl => shared}/source/gen9/command_stream_receiver_hw_gen9.cpp (98%) rename {opencl => shared}/source/gen9/reg_configs.h (100%) create mode 100644 shared/source/gen_common/CMakeLists.txt rename {opencl => shared}/source/gen_common/reg_configs/reg_configs_common.h (81%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff8a5408d8..f66a0c1261 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -793,6 +793,7 @@ include_directories(${NEO_CORE_DIRECTORY}/built_ins/builtinops${BRANCH_DIR_SUFFI include_directories(${NEO_CORE_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX}) +include_directories(${NEO_CORE_DIRECTORY}/gen_common/reg_configs${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/memory_manager/definitions${BRANCH_DIR_SUFFIX}) @@ -800,7 +801,6 @@ include_directories(${NEO_CORE_DIRECTORY}/memory_properties${BRANCH_DIR_SUFFIX}) include_directories(${NEO_CORE_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/command_queue/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/command_stream/definitions${BRANCH_DIR_SUFFIX}) -include_directories(${NEO_SOURCE_DIR}/opencl/source/gen_common/reg_configs${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX}) diff --git a/opencl/source/command_stream/CMakeLists.txt b/opencl/source/command_stream/CMakeLists.txt index 7413e26601..ec252b743f 100644 --- a/opencl/source/command_stream/CMakeLists.txt +++ b/opencl/source/command_stream/CMakeLists.txt @@ -22,7 +22,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_bdw_plus.inl - ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h diff --git a/opencl/source/dll/create_command_stream.cpp b/opencl/source/dll/create_command_stream.cpp index 66e9e1de4e..0b8087a3d1 100644 --- a/opencl/source/dll/create_command_stream.cpp +++ b/opencl/source/dll/create_command_stream.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/command_stream/device_command_stream.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/device_command_stream.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" namespace NEO { diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake index 71fd5687c2..e131e0ca7f 100644 --- a/opencl/source/enable_gens.cmake +++ b/opencl/source/enable_gens.cmake @@ -22,7 +22,6 @@ set(RUNTIME_SRCS_GENX_CPP_BASE aub_mem_dump buffer command_queue - command_stream_receiver_hw command_stream_receiver_simulated_common_hw experimental_command_buffer gpgpu_walker diff --git a/opencl/source/gen_common/CMakeLists.txt b/opencl/source/gen_common/CMakeLists.txt index 6d05cf288a..64109bce0a 100644 --- a/opencl/source/gen_common/CMakeLists.txt +++ b/opencl/source/gen_common/CMakeLists.txt @@ -8,7 +8,6 @@ set(RUNTIME_SRCS_GEN_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h - ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GEN_COMMON}) diff --git a/opencl/source/os_interface/linux/CMakeLists.txt b/opencl/source/os_interface/linux/CMakeLists.txt index a1e9c27b9b..16a6c752e1 100644 --- a/opencl/source/os_interface/linux/CMakeLists.txt +++ b/opencl/source/os_interface/linux/CMakeLists.txt @@ -8,8 +8,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h - ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_linux.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl diff --git a/opencl/source/os_interface/linux/device_command_stream.inl b/opencl/source/os_interface/linux/device_command_stream.inl index ba0450948d..1229d93cc9 100644 --- a/opencl/source/os_interface/linux/device_command_stream.inl +++ b/opencl/source/os_interface/linux/device_command_stream.inl @@ -5,8 +5,9 @@ * */ +#include "shared/source/command_stream/device_command_stream.h" + #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" namespace NEO { diff --git a/opencl/source/os_interface/linux/drm_command_stream.h b/opencl/source/os_interface/linux/drm_command_stream.h index f49f0a45bb..5c2f45e1ea 100644 --- a/opencl/source/os_interface/linux/drm_command_stream.h +++ b/opencl/source/os_interface/linux/drm_command_stream.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/os_interface/linux/drm_gem_close_worker.h" -#include "opencl/source/command_stream/device_command_stream.h" - #include "drm/i915_drm.h" #include diff --git a/opencl/source/os_interface/windows/CMakeLists.txt b/opencl/source/os_interface/windows/CMakeLists.txt index ee4ba43859..3927878db0 100644 --- a/opencl/source/os_interface/windows/CMakeLists.txt +++ b/opencl/source/os_interface/windows/CMakeLists.txt @@ -10,8 +10,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h - ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_win.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h ${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h diff --git a/opencl/source/os_interface/windows/device_command_stream.inl b/opencl/source/os_interface/windows/device_command_stream.inl index 0613e01794..ea3797fdf0 100644 --- a/opencl/source/os_interface/windows/device_command_stream.inl +++ b/opencl/source/os_interface/windows/device_command_stream.inl @@ -9,10 +9,10 @@ // Current order must be preserved due to two versions of igfxfmid.h #pragma warning(push) #pragma warning(disable : 4005) +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/helpers/hw_cmds.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" #pragma warning(pop) diff --git a/opencl/source/os_interface/windows/wddm_device_command_stream.h b/opencl/source/os_interface/windows/wddm_device_command_stream.h index 13dc17999f..f9210aebb7 100644 --- a/opencl/source/os_interface/windows/wddm_device_command_stream.h +++ b/opencl/source/os_interface/windows/wddm_device_command_stream.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/command_stream/device_command_stream.h" +#include "shared/source/command_stream/device_command_stream.h" struct COMMAND_BUFFER_HEADER_REC; diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp index 5e09af5526..26ad80c68b 100644 --- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 2f8fe74c7a..7c91818fd4 100644 --- a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index 996ad8aafe..ed09e186c0 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/source/gen9/reg_configs.h" + #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/gen9/reg_configs.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp index 8c0383a441..2e412fbb58 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/os_interface/linux/os_interface.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" -#include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/linux/device_command_stream.inl" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index 3973b0e88c..c25a9318cb 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/os_interface/linux/drm_buffer_object.h" @@ -13,7 +14,6 @@ #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 104753b664..f973e5008f 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -7,6 +7,7 @@ #include "drm_memory_manager_tests.h" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/gmm_helper/gmm_helper.h" @@ -26,7 +27,6 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index a964c78762..f9e1921d53 100644 --- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/flush_stamp.h" @@ -23,7 +24,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/device_command_stream.h" #include "opencl/source/helpers/built_ins_helper.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index da1f6a25a3..9b5a0c2f57 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -77,6 +77,7 @@ append_sources_from_properties(CORE_SOURCES NEO_CORE_DIRECT_SUBMISSION NEO_CORE_DIRECT_SUBMISSION_DISPATCHERS NEO_CORE_EXECUTION_ENVIRONMENT + NEO_CORE_GEN_COMMON NEO_CORE_GMM_HELPER NEO_CORE_HELPERS NEO_CORE_IMAGE diff --git a/shared/source/command_stream/CMakeLists.txt b/shared/source/command_stream/CMakeLists.txt index eb521ccc25..f88863f2bd 100644 --- a/shared/source/command_stream/CMakeLists.txt +++ b/shared/source/command_stream/CMakeLists.txt @@ -17,6 +17,7 @@ set(NEO_CORE_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.cpp ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_hw_ext.inl + ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.inl diff --git a/opencl/source/command_stream/device_command_stream.h b/shared/source/command_stream/device_command_stream.h similarity index 100% rename from opencl/source/command_stream/device_command_stream.h rename to shared/source/command_stream/device_command_stream.h diff --git a/shared/source/enable_gens.cmake b/shared/source/enable_gens.cmake index 9c7d391d64..b4efe04a58 100644 --- a/shared/source/enable_gens.cmake +++ b/shared/source/enable_gens.cmake @@ -12,6 +12,7 @@ set(CORE_SRCS_GENX_H_BASE set(CORE_RUNTIME_SRCS_GENX_CPP_BASE command_encoder + command_stream_receiver_hw preamble preemption ) diff --git a/shared/source/gen11/command_encoder_gen11.cpp b/shared/source/gen11/command_encoder_gen11.cpp index ee9b52f664..3d02ac6be7 100644 --- a/shared/source/gen11/command_encoder_gen11.cpp +++ b/shared/source/gen11/command_encoder_gen11.cpp @@ -9,8 +9,8 @@ #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_base.inl" #include "shared/source/gen11/hw_cmds_base.h" +#include "shared/source/gen11/reg_configs.h" -#include "opencl/source/gen11/reg_configs.h" namespace NEO { using Family = ICLFamily; diff --git a/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp similarity index 98% rename from opencl/source/gen11/command_stream_receiver_hw_gen11.cpp rename to shared/source/gen11/command_stream_receiver_hw_gen11.cpp index 540da01828..369f4fc7dd 100644 --- a/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp +++ b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp @@ -6,12 +6,11 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl" -#include "opencl/source/command_stream/device_command_stream.h" -#include "opencl/source/gen11/reg_configs.h" - namespace NEO { typedef ICLFamily Family; static auto gfxCore = IGFX_GEN11_CORE; diff --git a/opencl/source/gen11/reg_configs.h b/shared/source/gen11/reg_configs.h similarity index 100% rename from opencl/source/gen11/reg_configs.h rename to shared/source/gen11/reg_configs.h diff --git a/shared/source/gen12lp/command_encoder_gen12lp.cpp b/shared/source/gen12lp/command_encoder_gen12lp.cpp index 847e3283a6..3c67e9903b 100644 --- a/shared/source/gen12lp/command_encoder_gen12lp.cpp +++ b/shared/source/gen12lp/command_encoder_gen12lp.cpp @@ -9,8 +9,7 @@ #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_base.inl" #include "shared/source/gen12lp/hw_cmds_base.h" - -#include "opencl/source/gen12lp/reg_configs.h" +#include "shared/source/gen12lp/reg_configs.h" namespace NEO { diff --git a/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp similarity index 97% rename from opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp rename to shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 22f78bcd5a..b5c298b5c8 100644 --- a/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -11,11 +11,9 @@ using Family = NEO::TGLLPFamily; #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "shared/source/command_stream/command_stream_receiver_hw_tgllp_plus.inl" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl" -#include "opencl/source/command_stream/device_command_stream.h" -#include "opencl/source/gen12lp/helpers_gen12lp.h" - namespace NEO { static auto gfxCore = IGFX_GEN12LP_CORE; diff --git a/opencl/source/gen12lp/reg_configs.h b/shared/source/gen12lp/reg_configs.h similarity index 100% rename from opencl/source/gen12lp/reg_configs.h rename to shared/source/gen12lp/reg_configs.h diff --git a/shared/source/gen8/command_encoder_gen8.cpp b/shared/source/gen8/command_encoder_gen8.cpp index fc9ebc87f1..1182f54158 100644 --- a/shared/source/gen8/command_encoder_gen8.cpp +++ b/shared/source/gen8/command_encoder_gen8.cpp @@ -9,8 +9,7 @@ #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_base.inl" #include "shared/source/gen8/hw_cmds_base.h" - -#include "opencl/source/gen8/reg_configs.h" +#include "shared/source/gen8/reg_configs.h" namespace NEO { diff --git a/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp b/shared/source/gen8/command_stream_receiver_hw_gen8.cpp similarity index 98% rename from opencl/source/gen8/command_stream_receiver_hw_gen8.cpp rename to shared/source/gen8/command_stream_receiver_hw_gen8.cpp index f7c59db21c..caa2e3eb5f 100644 --- a/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp +++ b/shared/source/gen8/command_stream_receiver_hw_gen8.cpp @@ -6,11 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl" -#include "opencl/source/command_stream/device_command_stream.h" - namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; diff --git a/opencl/source/gen8/reg_configs.h b/shared/source/gen8/reg_configs.h similarity index 100% rename from opencl/source/gen8/reg_configs.h rename to shared/source/gen8/reg_configs.h diff --git a/shared/source/gen9/command_encoder_gen9.cpp b/shared/source/gen9/command_encoder_gen9.cpp index 0687033d6f..27ac19ae94 100644 --- a/shared/source/gen9/command_encoder_gen9.cpp +++ b/shared/source/gen9/command_encoder_gen9.cpp @@ -9,8 +9,7 @@ #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_base.inl" #include "shared/source/gen9/hw_cmds_base.h" - -#include "opencl/source/gen9/reg_configs.h" +#include "shared/source/gen9/reg_configs.h" namespace NEO { diff --git a/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp b/shared/source/gen9/command_stream_receiver_hw_gen9.cpp similarity index 98% rename from opencl/source/gen9/command_stream_receiver_hw_gen9.cpp rename to shared/source/gen9/command_stream_receiver_hw_gen9.cpp index 0a3d21e98c..d50287f0f9 100644 --- a/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp +++ b/shared/source/gen9/command_stream_receiver_hw_gen9.cpp @@ -6,11 +6,10 @@ */ #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl" -#include "opencl/source/command_stream/device_command_stream.h" - namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; diff --git a/opencl/source/gen9/reg_configs.h b/shared/source/gen9/reg_configs.h similarity index 100% rename from opencl/source/gen9/reg_configs.h rename to shared/source/gen9/reg_configs.h diff --git a/shared/source/gen_common/CMakeLists.txt b/shared/source/gen_common/CMakeLists.txt new file mode 100644 index 0000000000..b1deb1cc28 --- /dev/null +++ b/shared/source/gen_common/CMakeLists.txt @@ -0,0 +1,11 @@ +# +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(NEO_CORE_GEN_COMMON + ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h +) + +set_property(GLOBAL PROPERTY NEO_CORE_GEN_COMMON ${NEO_CORE_GEN_COMMON}) diff --git a/opencl/source/gen_common/reg_configs/reg_configs_common.h b/shared/source/gen_common/reg_configs/reg_configs_common.h similarity index 81% rename from opencl/source/gen_common/reg_configs/reg_configs_common.h rename to shared/source/gen_common/reg_configs/reg_configs_common.h index e8a1164bd8..bdc501aa9e 100644 --- a/opencl/source/gen_common/reg_configs/reg_configs_common.h +++ b/shared/source/gen_common/reg_configs/reg_configs_common.h @@ -7,16 +7,16 @@ #pragma once #ifdef SUPPORT_GEN8 -#include "opencl/source/gen8/reg_configs.h" +#include "shared/source/gen8/reg_configs.h" #endif #ifdef SUPPORT_GEN9 -#include "opencl/source/gen9/reg_configs.h" +#include "shared/source/gen9/reg_configs.h" #endif #ifdef SUPPORT_GEN11 -#include "opencl/source/gen11/reg_configs.h" +#include "shared/source/gen11/reg_configs.h" #endif #ifdef SUPPORT_GEN12LP -#include "opencl/source/gen12lp/reg_configs.h" +#include "shared/source/gen12lp/reg_configs.h" #endif #include diff --git a/shared/test/unit_test/gen8/test_preamble_gen8.cpp b/shared/test/unit_test/gen8/test_preamble_gen8.cpp index 84d24949ea..4079d22cf2 100644 --- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/command_stream/thread_arbitration_policy.h" +#include "shared/source/gen8/reg_configs.h" #include "shared/source/helpers/preamble.h" #include "shared/test/unit_test/preamble/preamble_fixture.h" -#include "opencl/source/gen8/reg_configs.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp index 0e9ffc18f5..0af8a2e6c5 100644 --- a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp +++ b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp @@ -7,11 +7,11 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/thread_arbitration_policy.h" +#include "shared/source/gen9/reg_configs.h" #include "shared/source/helpers/preamble.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/preamble/preamble_fixture.h" -#include "opencl/source/gen9/reg_configs.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index d9d3706ec2..916bf98484 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/source/command_stream/preemption.h" +#include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/flat_batch_buffer_helper_hw.h" #include "shared/source/helpers/preamble.h" #include "shared/source/utilities/stackvec.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"