Add absolute path to include

Change-Id: Ib0782b4ab8d9a26ec358ecfb57721f4fe8d51b06

.clang-format

@@ -50,7 +50,7 @@ ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^.(core|documentation|manifests|offline_compiler|runtime|scripts|unit_tests)/'
+  - Regex:           '^.(core|documentation|manifests|offline_compiler|opencl|scripts|unit_tests)/'
     Priority:        1
   - Regex:           '^"test\.h"$'
     Priority:        1

CMakeLists.txt

@@ -106,6 +106,9 @@ endif()
 set(NEO_RUNTIME_SUB_DIR "opencl/source")
 set(NEO_RUNTIME_SOURCE_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_SUB_DIR}")
 
+set(NEO_RUNTIME_TESTS_SUB_DIR "unit_tests")
+set(NEO_RUNTIME_TESTS_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}")
+
 # Set the core source directory
 if(NOT DEFINED NEO_CORE_DIRECTORY)
   set(NEO_CORE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/core)
@@ -554,8 +557,6 @@ else()
 endif()
 message(STATUS "Engine node dir: ${ENGINE_NODE_DIR}")
 
-include_directories(opencl/source)
-
 add_definitions(-DGMM_OCL)
 
 # We want to organize our IDE targets into folders
@@ -789,12 +790,12 @@ include_directories(${NEO_SOURCE_DIR}/core/gmm_helper/windows/gmm_memory${BRANCH
 include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/sku_info/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/built_ins/builtinops${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/command_queue/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/command_stream/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/mem_obj/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/memory_manager/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/opencl/source/built_ins/builtinops${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})
 
 
 if(HAVE_INSTRUMENTATION)
@@ -804,7 +805,7 @@ if(HAVE_INSTRUMENTATION)
 else()
   set(NEO__INSTRUMENTATION_DIR_SUFFIX "/")
 endif()
-include_directories(${NEO_RUNTIME_SOURCE_DIR}/instrumentation${NEO__INSTRUMENTATION_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/opencl/source/instrumentation${NEO__INSTRUMENTATION_DIR_SUFFIX})
 
 # Define where to put binaries
 set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

core/command_container/command_encoder.inl

@@ -16,8 +16,7 @@
 #include "core/helpers/simd_helper.h"
 #include "core/helpers/string.h"
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
-
-#include "helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
 
 #include <algorithm>
 

core/command_container/command_encoder_base.inl

@@ -14,8 +14,7 @@
 #include "core/helpers/simd_helper.h"
 #include "core/helpers/state_base_address.h"
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
-
-#include "helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
 
 #include <algorithm>
 

core/command_stream/command_stream_receiver.cpp

@@ -25,8 +25,7 @@
 #include "core/os_interface/os_interface.h"
 #include "core/utilities/cpuintrinsics.h"
 #include "core/utilities/tag_allocator.h"
-
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 namespace NEO {
 

core/command_stream/preemption.cpp

@@ -9,10 +9,9 @@
 
 #include "core/device/device.h"
 #include "core/helpers/string.h"
-
-#include "built_ins/built_ins.h"
-#include "helpers/dispatch_info.h"
-#include "kernel/kernel.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/kernel/kernel.h"
 
 namespace NEO {
 

core/command_stream/preemption.inl

@@ -9,9 +9,8 @@
 #include "core/device/device.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "built_ins/sip.h"
-#include "command_queue/gpgpu_walker.h"
+#include "opencl/source/built_ins/sip.h"
+#include "opencl/source/command_queue/gpgpu_walker.h"
 
 namespace NEO {
 

core/compiler_interface/compiler_interface.cpp

@@ -12,6 +12,7 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/device/device.h"
 #include "core/helpers/hw_info.h"
+#include "opencl/source/os_interface/os_inc_base.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/helpers/error.h"
@@ -20,7 +21,6 @@
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
 #include "ocl_igc_interface/platform_helper.h"
-#include "os_interface/os_inc_base.h"
 
 #include <fstream>
 

core/compiler_interface/compiler_interface.h

@@ -11,8 +11,8 @@
 #include "core/os_interface/os_library.h"
 #include "core/utilities/arrayref.h"
 #include "core/utilities/spinlock.h"
+#include "opencl/source/built_ins/sip.h"
 
-#include "built_ins/sip.h"
 #include "cif/common/cif_main.h"
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"

core/compiler_interface/compiler_interface.inl

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/os_interface/os_library.h"
+#include "opencl/source/helpers/validators.h"
 
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "cif/common/cif.h"
 #include "cif/import/library_api.h"
-#include "helpers/validators.h"
 #include "ocl_igc_interface/ocl_translation_output.h"
 
 namespace NEO {

core/device/device.cpp

@@ -16,9 +16,8 @@
 #include "core/os_interface/os_context.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/os_time.h"
-
-#include "device/driver_info.h"
-#include "source_level_debugger/source_level_debugger.h"
+#include "opencl/source/device/driver_info.h"
+#include "opencl/source/source_level_debugger/source_level_debugger.h"
 
 namespace NEO {
 

core/device/device.h

@@ -10,9 +10,8 @@
 #include "core/helpers/common_types.h"
 #include "core/helpers/engine_control.h"
 #include "core/helpers/hw_info.h"
-
-#include "device/device_info.h"
-#include "os_interface/performance_counters.h"
+#include "opencl/source/device/device_info.h"
+#include "opencl/source/os_interface/performance_counters.h"
 
 namespace NEO {
 class DriverInfo;

core/device_binary_format/device_binary_format_patchtokens.cpp

@@ -11,8 +11,7 @@
 #include "core/device_binary_format/patchtokens_validator.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/program/program_info_from_patchtokens.h"
-
-#include "utilities/logger.h"
+#include "opencl/source/utilities/logger.h"
 
 namespace NEO {
 

core/device_binary_format/patchtokens_validator.cpp

@@ -9,9 +9,9 @@
 
 #include "core/device_binary_format/patchtokens_decoder.h"
 #include "core/helpers/hw_info.h"
+#include "opencl/source/program/kernel_arg_info.h"
 
 #include "igfxfmid.h"
-#include "program/kernel_arg_info.h"
 
 #include <string>
 

core/execution_environment/execution_environment.cpp

@@ -13,9 +13,8 @@
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
-
-#include "built_ins/built_ins.h"
-#include "memory_manager/os_agnostic_memory_manager.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 
 namespace NEO {
 ExecutionEnvironment::ExecutionEnvironment() {

core/execution_environment/root_device_environment.cpp

@@ -11,8 +11,7 @@
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/memory_manager/memory_operations_handler.h"
 #include "core/os_interface/os_interface.h"
-
-#include "aub/aub_center.h"
+#include "opencl/source/aub/aub_center.h"
 
 namespace NEO {
 

core/gen11/command_encoder_gen11.cpp

@@ -9,8 +9,7 @@
 #include "core/command_container/command_encoder.inl"
 #include "core/command_container/command_encoder_base.inl"
 #include "core/gen11/hw_cmds_base.h"
-
-#include "gen11/reg_configs.h"
+#include "opencl/source/gen11/reg_configs.h"
 namespace NEO {
 
 using Family = ICLFamily;

core/gen11/enable_gen11.cpp

@@ -7,8 +7,7 @@
 
 #include "core/gen11/hw_cmds.h"
 #include "core/os_interface/hw_info_config.h"
-
-#include "helpers/enable_product.inl"
+#include "opencl/source/helpers/enable_product.inl"
 
 namespace NEO {
 

core/gen12lp/command_encoder_gen12lp.cpp

@@ -9,8 +9,7 @@
 #include "core/command_container/command_encoder.inl"
 #include "core/command_container/command_encoder_base.inl"
 #include "core/gen12lp/hw_cmds_base.h"
-
-#include "gen12lp/reg_configs.h"
+#include "opencl/source/gen12lp/reg_configs.h"
 
 namespace NEO {
 

core/gen12lp/enable_gen12lp.cpp

@@ -7,8 +7,7 @@
 
 #include "core/gen12lp/hw_cmds.h"
 #include "core/os_interface/hw_info_config.h"
-
-#include "helpers/enable_product.inl"
+#include "opencl/source/helpers/enable_product.inl"
 
 namespace NEO {
 

core/gen12lp/preamble_gen12lp.cpp

@@ -8,9 +8,9 @@
 #include "core/command_stream/csr_definitions.h"
 #include "core/helpers/engine_node_helper.h"
 #include "core/helpers/preamble_bdw_plus.inl"
+#include "opencl/source/gen12lp/helpers_gen12lp.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
 
-#include "gen12lp/helpers_gen12lp.h"
-#include "helpers/hardware_commands_helper.h"
 #include "reg_configs_common.h"
 
 namespace NEO {

core/gen8/command_encoder_gen8.cpp

@@ -9,8 +9,7 @@
 #include "core/command_container/command_encoder.inl"
 #include "core/command_container/command_encoder_base.inl"
 #include "core/gen8/hw_cmds_base.h"
-
-#include "gen8/reg_configs.h"
+#include "opencl/source/gen8/reg_configs.h"
 
 namespace NEO {
 

core/gen8/enable_gen8.cpp

@@ -7,8 +7,7 @@
 
 #include "core/gen8/hw_cmds.h"
 #include "core/os_interface/hw_info_config.h"
-
-#include "helpers/enable_product.inl"
+#include "opencl/source/helpers/enable_product.inl"
 
 namespace NEO {
 

core/gen9/command_encoder_gen9.cpp

@@ -9,8 +9,7 @@
 #include "core/command_container/command_encoder.inl"
 #include "core/command_container/command_encoder_base.inl"
 #include "core/gen9/hw_cmds_base.h"
-
-#include "gen9/reg_configs.h"
+#include "opencl/source/gen9/reg_configs.h"
 
 namespace NEO {
 

core/gen9/enable_gen9.cpp

@@ -7,8 +7,7 @@
 
 #include "core/gen9/hw_cmds.h"
 #include "core/os_interface/hw_info_config.h"
-
-#include "helpers/enable_product.inl"
+#include "opencl/source/helpers/enable_product.inl"
 
 namespace NEO {
 

core/gen9/preemption_gen9.cpp

@@ -8,8 +8,7 @@
 #include "core/command_stream/csr_definitions.h"
 #include "core/command_stream/preemption.h"
 #include "core/command_stream/preemption.inl"
-
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 #include <cstring>
 

core/helpers/aligned_memory.h

@@ -8,8 +8,7 @@
 #pragma once
 #include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/memory_constants.h"
-
-#include "utilities/logger.h"
+#include "opencl/source/utilities/logger.h"
 
 #include <algorithm>
 #include <cstddef>

core/helpers/hw_helper.h

@@ -9,10 +9,9 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/aux_translation.h"
 #include "core/helpers/hw_cmds.h"
-
-#include "built_ins/sip.h"
-#include "gen_common/aub_mapper.h"
-#include "mem_obj/buffer.h"
+#include "opencl/source/built_ins/sip.h"
+#include "opencl/source/gen_common/aub_mapper.h"
+#include "opencl/source/mem_obj/buffer.h"
 
 #include <cstdint>
 #include <string>

core/helpers/hw_helper_base.inl

@@ -15,10 +15,10 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/os_interface.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
 
-#include "aub_mem_dump/aub_mem_dump.h"
-#include "helpers/dispatch_info.h"
-#include "helpers/hardware_commands_helper.h"
 #include "instrumentation.h"
 
 namespace NEO {

core/helpers/preamble_base.inl

@@ -11,9 +11,9 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/preamble.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/kernel/kernel.h"
 
-#include "helpers/hardware_commands_helper.h"
-#include "kernel/kernel.h"
 #include "reg_configs_common.h"
 
 #include <cstddef>

core/memory_manager/graphics_allocation.cpp

@@ -9,8 +9,7 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/memory_manager/memory_manager.h"
-
-#include "utilities/logger.h"
+#include "opencl/source/utilities/logger.h"
 
 namespace NEO {
 void GraphicsAllocation::setAllocationType(AllocationType allocationType) {

core/memory_manager/unified_memory_manager.cpp

@@ -10,8 +10,7 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/memory_manager/memory_manager.h"
-
-#include "mem_obj/mem_obj_helper.h"
+#include "opencl/source/mem_obj/mem_obj_helper.h"
 
 namespace NEO {
 

core/os_interface/aub_memory_operations_handler.cpp

@@ -8,8 +8,7 @@
 #include "core/os_interface/aub_memory_operations_handler.h"
 
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 #include <algorithm>
 

core/os_interface/device_factory.cpp

@@ -15,8 +15,8 @@
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "core/os_interface/hw_info_config.h"
 #include "core/os_interface/os_interface.h"
+#include "opencl/source/aub/aub_center.h"
 
-#include "aub/aub_center.h"
 #include "hw_device_id.h"
 
 namespace NEO {

core/os_interface/linux/drm_gem_close_worker.cpp

@@ -11,8 +11,7 @@
 #include "core/os_interface/linux/drm_buffer_object.h"
 #include "core/os_interface/linux/drm_memory_manager.h"
 #include "core/os_interface/os_thread.h"
-
-#include "os_interface/linux/drm_command_stream.h"
+#include "opencl/source/os_interface/linux/drm_command_stream.h"
 
 #include <atomic>
 #include <iostream>

core/os_interface/linux/page_table_manager_functions.cpp

@@ -7,9 +7,9 @@
 
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/gmm_helper/page_table_mngr.h"
+#include "opencl/source/platform/platform.h"
 
 #include "gmm_client_context.h"
-#include "platform/platform.h"
 
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {

core/os_interface/windows/page_table_manager_functions.cpp

@@ -7,9 +7,9 @@
 
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/gmm_helper/page_table_mngr.h"
+#include "opencl/source/platform/platform.h"
 
 #include "gmm_client_context.h"
-#include "platform/platform.h"
 
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {

core/program/program_info.cpp

@@ -7,7 +7,7 @@
 
 #include "core/program/program_info.h"
 
-#include "program/kernel_info.h"
+#include "opencl/source/program/kernel_info.h"
 
 namespace NEO {
 

core/program/program_info_from_patchtokens.cpp

@@ -11,9 +11,8 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/device_binary_format/patchtokens_decoder.h"
 #include "core/program/program_info.h"
-
-#include "program/kernel_info.h"
-#include "program/kernel_info_from_patchtokens.h"
+#include "opencl/source/program/kernel_info.h"
+#include "opencl/source/program/kernel_info_from_patchtokens.h"
 
 namespace NEO {
 

core/program/sync_buffer_handler.cpp

@@ -10,8 +10,7 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/memory_manager.h"
-
-#include "kernel/kernel.h"
+#include "opencl/source/kernel/kernel.h"
 
 namespace NEO {
 

core/unit_tests/compiler_interface/compiler_cache_tests.cpp

@@ -11,14 +11,13 @@
 #include "core/helpers/hash.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/string.h"
+#include "opencl/source/compiler_interface/default_cl_cache_config.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/global_environment.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_program.h"
 
-#include "compiler_interface/default_cl_cache_config.h"
-
 #include <array>
 #include <list>
 #include <memory>

core/unit_tests/encoders/test_encode_dispatch_kernel.cpp

@@ -8,10 +8,9 @@
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/fixtures/command_container_fixture.h"
 #include "core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 
-#include "helpers/hardware_commands_helper.h"
-
 using namespace NEO;
 
 using CommandEncodeStatesTest = Test<CommandEncodeStatesFixture>;

core/unit_tests/fixtures/preemption_fixture.cpp

@@ -9,6 +9,11 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_info.h"
+#include "opencl/source/command_queue/enqueue_common.h"
+#include "opencl/source/command_queue/enqueue_kernel.h"
+#include "opencl/source/command_queue/enqueue_marker.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/scheduler/scheduler_kernel.h"
 #include "test.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
@@ -17,12 +22,7 @@
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_kernel.h"
 
-#include "command_queue/enqueue_common.h"
-#include "command_queue/enqueue_kernel.h"
-#include "command_queue/enqueue_marker.h"
 #include "gtest/gtest.h"
-#include "helpers/dispatch_info.h"
-#include "scheduler/scheduler_kernel.h"
 
 using namespace NEO;
 

core/unit_tests/gen11/test_preemption_gen11.cpp

@@ -7,13 +7,12 @@
 
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
+#include "opencl/source/built_ins/built_ins.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_csr.h"
 
-#include "built_ins/built_ins.h"
-
 using namespace NEO;
 
 using Gen11PreemptionTests = DevicePreemptionTests;

core/unit_tests/gen8/test_preamble_gen8.cpp

@@ -8,10 +8,9 @@
 #include "core/command_stream/thread_arbitration_policy.h"
 #include "core/helpers/preamble.h"
 #include "core/unit_tests/preamble/preamble_fixture.h"
+#include "opencl/source/gen8/reg_configs.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 
-#include "gen8/reg_configs.h"
-
 using namespace NEO;
 
 typedef PreambleFixture BdwSlm;

core/unit_tests/gen9/skl/test_preamble_skl.cpp

@@ -10,10 +10,9 @@
 #include "core/helpers/preamble.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/preamble/preamble_fixture.h"
+#include "opencl/source/gen9/reg_configs.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 
-#include "gen9/reg_configs.h"
-
 using namespace NEO;
 
 typedef PreambleFixture SklSlm;

core/unit_tests/gen9/test_preemption_gen9.cpp

@@ -8,6 +8,7 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
+#include "opencl/source/built_ins/built_ins.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_buffer.h"
@@ -15,8 +16,6 @@
 #include "unit_tests/mocks/mock_csr.h"
 #include "unit_tests/mocks/mock_submissions_aggregator.h"
 
-#include "built_ins/built_ins.h"
-
 namespace NEO {
 
 template <>

core/unit_tests/helpers/string_to_hash_tests.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "core/helpers/hash.h"
+#include "opencl/source/helpers/string_helpers.h"
 
 #include "gtest/gtest.h"
-#include "helpers/string_helpers.h"
 
 using NEO::Hash;
 

core/unit_tests/image/image_surface_state_fixture.h

@@ -12,6 +12,9 @@
 #include "core/image/image_surface_state.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/surface.h"
+#include "opencl/source/helpers/surface_formats.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/image.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"
@@ -19,10 +22,6 @@
 #include "unit_tests/mocks/mock_gmm_resource_info.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
-#include "helpers/surface_formats.h"
-#include "kernel/kernel.h"
-#include "mem_obj/image.h"
-
 #include <memory>
 
 class ImageSurfaceStateTests : public DeviceFixture,

core/unit_tests/libult/gen11.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "opencl/source/helpers/base_object.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
-#include "helpers/base_object.h"
-
 namespace NEO {
 
 typedef ICLFamily Family;

core/unit_tests/libult/gen12lp.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "opencl/source/helpers/base_object.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
-#include "helpers/base_object.h"
-
 namespace NEO {
 
 typedef TGLLPFamily Family;

core/unit_tests/libult/gen8.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "opencl/source/helpers/base_object.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
-#include "helpers/base_object.h"
-
 namespace NEO {
 
 typedef BDWFamily Family;

core/unit_tests/libult/gen9.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "opencl/source/helpers/base_object.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
-#include "helpers/base_object.h"
-
 namespace NEO {
 
 typedef SKLFamily Family;

core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp

@@ -7,10 +7,9 @@
 
 #include "core/unit_tests/os_interface/aub_memory_operations_handler_tests.h"
 
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "unit_tests/mocks/mock_aub_manager.h"
 
-#include "aub_mem_dump/aub_mem_dump.h"
-
 TEST_F(AubMemoryOperationsHandlerTests, givenNullPtrAsAubManagerWhenMakeResidentCalledThenFalseReturned) {
     getMemoryOperationsHandler()->setAubManager(nullptr);
     auto memoryOperationsInterface = getMemoryOperationsHandler();

core/unit_tests/preamble/preamble_tests.cpp

@@ -10,12 +10,12 @@
 #include "core/helpers/preamble.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/utilities/stackvec.h"
+#include "opencl/source/gen11/reg_configs.h"
 #include "test.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
-#include "gen11/reg_configs.h"
 #include <gtest/gtest.h>
 
 #include <algorithm>

core/unit_tests/preemption/preemption_tests.cpp

@@ -9,6 +9,8 @@
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/helpers/dispatch_info.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_builtins.h"
@@ -16,9 +18,7 @@
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 #include "unit_tests/mocks/mock_kernel.h"
 
-#include "command_queue/command_queue_hw.h"
 #include "gmock/gmock.h"
-#include "helpers/dispatch_info.h"
 
 using namespace NEO;
 

core/unit_tests/program/program_info_from_patchtokens_tests.cpp

@@ -11,11 +11,11 @@
 #include "core/program/program_info_from_patchtokens.h"
 #include "core/unit_tests/compiler_interface/linker_mock.h"
 #include "core/unit_tests/device_binary_format/patchtokens_tests.h"
+#include "opencl/source/program/kernel_info.h"
 
 #include "RelocationInfo.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "program/kernel_info.h"
 
 TEST(PopulateProgramInfoFromPatchtokensTests, WhenRequiresLocalMemoryWindowVAIsCalledThenReturnsTrueOnlyIfAnyOfKernelsRequireLocalMemoryWindowVA) {
     NEO::PatchTokenBinary::ProgramFromPatchtokens emptyProgram;

core/unit_tests/program/program_info_tests.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "core/program/program_info.h"
+#include "opencl/source/program/kernel_info.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "program/kernel_info.h"
 
 TEST(ProgramInfoTests, WhenPrepareLinkerInputStorageGetsCalledTwiceThenLinkerInputStorageIsReused) {
     NEO::ProgramInfo programInfo;

core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h

@@ -8,12 +8,12 @@
 #pragma once
 #include "core/command_stream/preemption.h"
 #include "core/helpers/preamble.h"
+#include "opencl/source/built_ins/built_ins.h"
 #include "test.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
-#include "built_ins/built_ins.h"
 #include <gtest/gtest.h>
 
 template <typename GfxFamily>

offline_compiler/CMakeLists.txt

@@ -42,8 +42,8 @@ set(CLOC_SRCS_LIB
   ${NEO_SOURCE_DIR}/core/compiler_interface/compiler_options/compiler_options_base.cpp
   ${NEO_SOURCE_DIR}/core/compiler_interface/create_main.cpp
   ${NEO_SOURCE_DIR}/core/helpers/hw_info.cpp
-  ${NEO_RUNTIME_SOURCE_DIR}/platform/extensions.cpp
-  ${NEO_RUNTIME_SOURCE_DIR}/platform/extensions.h
+  ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.cpp
+  ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.h
 )
 
 if(${IGA_HEADERS_AVAILABLE})
@@ -61,13 +61,13 @@ if(WIN32)
   list(APPEND CLOC_SRCS_LIB
     ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
     ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
-    ${NEO_RUNTIME_SOURCE_DIR}/dll/windows/options_windows.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/dll/windows/options_windows.cpp
   )
 else()
   list(APPEND CLOC_SRCS_LIB
     ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
     ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
-    ${NEO_RUNTIME_SOURCE_DIR}/dll/linux/options_linux.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
   )
 endif()
 
@@ -83,12 +83,12 @@ set(RUNTIME_GENX_CPP_FILES
 )
 
 macro(macro_for_each_platform)
-  list(APPEND CLOC_SRCS_LIB ${NEO_RUNTIME_SOURCE_DIR}/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
+  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
 endmacro()
 
 macro(macro_for_each_gen)
   foreach(SRC_IT ${RUNTIME_GENX_CPP_FILES})
-    set(SRC_FILE ${NEO_RUNTIME_SOURCE_DIR}/${GEN_TYPE_LOWER}/${SRC_IT})
+    set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/${SRC_IT})
     if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
       list(APPEND CLOC_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
     endif()

offline_compiler/decoder/helper.cpp

@@ -9,9 +9,9 @@
 
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/os_library.h"
+#include "opencl/source/os_interface/os_inc_base.h"
 
 #include "igfxfmid.h"
-#include "os_interface/os_inc_base.h"
 
 #include <algorithm>
 #include <fstream>

offline_compiler/decoder/iga_wrapper.cpp

@@ -9,10 +9,10 @@
 
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/os_library.h"
+#include "opencl/source/os_interface/os_inc_base.h"
 
 #include "helper.h"
 #include "igfxfmid.h"
-#include "os_interface/os_inc_base.h"
 #include "translate_platform_base.h"
 
 #include <memory>

offline_compiler/offline_compiler.cpp

@@ -16,19 +16,19 @@
 #include "core/helpers/hw_info.h"
 #include "core/helpers/string.h"
 #include "core/os_interface/os_library.h"
+#include "opencl/source/helpers/validators.h"
+#include "opencl/source/os_interface/os_inc_base.h"
+#include "opencl/source/platform/extensions.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/helpers/error.h"
 #include "cif/import/library_api.h"
 #include "compiler_options.h"
-#include "helpers/validators.h"
 #include "igfxfmid.h"
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
 #include "ocl_igc_interface/platform_helper.h"
-#include "os_interface/os_inc_base.h"
-#include "platform/extensions.h"
 
 #include <algorithm>
 #include <iomanip>
@@ -577,7 +577,7 @@ std::string OfflineCompiler::parseBinAsCharArray(uint8_t *binary, size_t size, s
     out << "};" << std::endl;
 
     out << std::endl
-        << "#include \"built_ins/registry/built_ins_registry.h\"\n"
+        << "#include \"opencl/source/built_ins/registry/built_ins_registry.h\"\n"
         << std::endl;
     out << "namespace NEO {" << std::endl;
     out << "static RegisterEmbeddedResource register" << builtinName << "Bin(" << std::endl;

opencl/source/CMakeLists.txt

@@ -80,14 +80,14 @@ if(WIN32)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${WDK_INCLUDE_PATHS}
     ${NEO_SOURCE_DIR}/core/os_interface/windows
-    ${NEO_RUNTIME_SOURCE_DIR}/os_interface/windows
+    ${NEO_SOURCE_DIR}/opencl/source/os_interface/windows
   )
   target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1)
 else()
   set(IGDRCL_EXTRA_LIBS dl pthread)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${NEO_SOURCE_DIR}/core/os_interface/linux
-    ${NEO_RUNTIME_SOURCE_DIR}/os_interface/linux
+    ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux
     ${I915_INCLUDES_DIR}
   )
 endif()
@@ -127,7 +127,7 @@ if(${GENERATE_EXECUTABLE})
 
   add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
     ${NEO_DYNAMIC_LIB__TARGET_OBJECTS}
-    ${NEO_RUNTIME_SOURCE_DIR}/aub/aub_stream_interface.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp
   )
 
   if(UNIX)

opencl/source/accelerators/intel_accelerator.cpp

@@ -5,13 +5,12 @@
  *
  */
 
-#include "accelerators/intel_accelerator.h"
+#include "opencl/source/accelerators/intel_accelerator.h"
 
 #include "core/helpers/get_info.h"
 #include "core/helpers/string.h"
-
-#include "context/context.h"
-#include "helpers/get_info_status_mapper.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/helpers/get_info_status_mapper.h"
 
 namespace NEO {
 

opencl/source/accelerators/intel_accelerator.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "api/cl_types.h"
-#include "helpers/base_object.h"
+#include "opencl/source/api/cl_types.h"
+#include "opencl/source/helpers/base_object.h"
 
 //------------------------------------------------------------------------------
 // cl_intel_accelerator Class Stuff

opencl/source/accelerators/intel_motion_estimation.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "accelerators/intel_motion_estimation.h"
+#include "opencl/source/accelerators/intel_motion_estimation.h"
 
 namespace NEO {
 

opencl/source/accelerators/intel_motion_estimation.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "accelerators/intel_accelerator.h"
+#include "opencl/source/accelerators/intel_accelerator.h"
 
 //------------------------------------------------------------------------------
 // VmeAccelerator Class Stuff

opencl/source/api/additional_extensions.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "api/additional_extensions.h"
+#include "opencl/source/api/additional_extensions.h"
 
 namespace NEO {
 void *CL_API_CALL getAdditionalExtensionFunctionAddress(const char *funcName) {

opencl/source/api/api.cpp

@@ -18,38 +18,38 @@
 #include "core/os_interface/os_context.h"
 #include "core/utilities/api_intercept.h"
 #include "core/utilities/stackvec.h"
+#include "opencl/source/accelerators/intel_motion_estimation.h"
+#include "opencl/source/api/additional_extensions.h"
+#include "opencl/source/aub/aub_center.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/vme_builtin.h"
+#include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/context/driver_diagnostics.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/device_queue/device_queue.h"
+#include "opencl/source/event/user_event.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
+#include "opencl/source/helpers/get_info_status_mapper.h"
+#include "opencl/source/helpers/mem_properties_parser_helper.h"
+#include "opencl/source/helpers/memory_properties_flags_helpers.h"
+#include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/helpers/validators.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/kernel/kernel_info_cl.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/mem_obj/mem_obj_helper.h"
+#include "opencl/source/mem_obj/pipe.h"
+#include "opencl/source/platform/platform.h"
+#include "opencl/source/program/program.h"
+#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/sharings/sharing_factory.h"
+#include "opencl/source/tracing/tracing_api.h"
+#include "opencl/source/tracing/tracing_notify.h"
 
 #include "CL/cl.h"
-#include "accelerators/intel_motion_estimation.h"
-#include "api/additional_extensions.h"
-#include "aub/aub_center.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/vme_builtin.h"
-#include "command_queue/command_queue.h"
 #include "config.h"
-#include "context/context.h"
-#include "context/driver_diagnostics.h"
-#include "device/cl_device.h"
-#include "device_queue/device_queue.h"
-#include "event/user_event.h"
-#include "gtpin/gtpin_notify.h"
-#include "helpers/get_info_status_mapper.h"
-#include "helpers/mem_properties_parser_helper.h"
-#include "helpers/memory_properties_flags_helpers.h"
-#include "helpers/queue_helpers.h"
-#include "helpers/validators.h"
-#include "kernel/kernel.h"
-#include "kernel/kernel_info_cl.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
-#include "mem_obj/mem_obj_helper.h"
-#include "mem_obj/pipe.h"
-#include "platform/platform.h"
-#include "program/program.h"
-#include "sampler/sampler.h"
-#include "sharings/sharing_factory.h"
-#include "tracing/tracing_api.h"
-#include "tracing/tracing_notify.h"
 
 #include <algorithm>
 #include <cstring>

opencl/source/api/api.h

@@ -5,11 +5,12 @@
  *
  */
 
+#include "opencl/source/api/api_enter.h"
+#include "opencl/source/api/dispatch.h"
+#include "opencl/source/extensions/public/cl_ext_private.h"
+
 #include "CL/cl.h"
 #include "CL/cl_gl.h"
-#include "api/api_enter.h"
-#include "api/dispatch.h"
-#include "extensions/public/cl_ext_private.h"
 
 #ifdef __cplusplus
 extern "C" {

opencl/source/api/api_enter.h

@@ -6,8 +6,7 @@
  */
 
 #include "core/utilities/perf_profiler.h"
-
-#include "utilities/logger.h"
+#include "opencl/source/utilities/logger.h"
 
 #define API_ENTER(retValPointer) \
     LoggerApiEnterWrapper<NEO::FileLogger<globalDebugFunctionalityLevel>::enabled()> ApiWrapperForSingleCall(__FUNCTION__, retValPointer)

opencl/source/api/cl_types.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "api/dispatch.h"
+#include "opencl/source/api/dispatch.h"
 
 #include <cstdint>
 

opencl/source/aub/aub_center.cpp

@@ -5,13 +5,13 @@
  *
  */
 
-#include "aub/aub_center.h"
+#include "opencl/source/aub/aub_center.h"
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 

opencl/source/aub/aub_center.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/helpers/options.h"
+#include "opencl/source/command_stream/aub_stream_provider.h"
+#include "opencl/source/command_stream/aub_subcapture.h"
+#include "opencl/source/memory_manager/address_mapper.h"
+#include "opencl/source/memory_manager/physical_address_allocator.h"
 
-#include "command_stream/aub_stream_provider.h"
-#include "command_stream/aub_subcapture.h"
-#include "memory_manager/address_mapper.h"
-#include "memory_manager/physical_address_allocator.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace NEO {

opencl/source/aub/aub_helper.cpp

@@ -5,12 +5,11 @@
  *
  */
 
-#include "aub/aub_helper.h"
+#include "opencl/source/aub/aub_helper.h"
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/basic_math.h"
-
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper.h

@@ -9,8 +9,7 @@
 #include "core/helpers/hw_info.h"
 #include "core/helpers/non_copyable_or_moveable.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "gen_common/aub_mapper_base.h"
+#include "opencl/source/gen_common/aub_mapper_base.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper_add_mmio.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
 namespace NEO {

opencl/source/aub/aub_helper_base.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "aub/aub_helper.h"
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub/aub_helper.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper_bdw_plus.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub/aub_helper_base.inl"
+#include "opencl/source/aub/aub_helper_base.inl"
 
 namespace NEO {
 

opencl/source/aub/aub_stream_interface.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub/aub_center.h"
+#include "opencl/source/aub/aub_center.h"
 using namespace aub_stream;
 namespace NEO {
 AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) {

opencl/source/aub_mem_dump/aub_alloc_dump.h

@@ -10,8 +10,7 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 using namespace NEO;
 

opencl/source/aub_mem_dump/aub_alloc_dump.inl

@@ -7,8 +7,8 @@
 
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
+#include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 
-#include "aub_mem_dump/aub_alloc_dump.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
 using namespace NEO;

opencl/source/aub_mem_dump/aub_mem_dump.cpp

@@ -10,8 +10,7 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
-
-#include "aub/aub_helper.h"
+#include "opencl/source/aub/aub_helper.h"
 
 namespace AubMemDump {
 

opencl/source/aub_mem_dump/aub_mem_dump.h

@@ -16,7 +16,7 @@
 #define BIT(x) (((uint64_t)1) << (x))
 #endif
 
-#include "aub_mem_dump/aub_data.h"
+#include "opencl/source/aub_mem_dump/aub_data.h"
 
 namespace NEO {
 class AubHelper;

opencl/source/aub_mem_dump/aub_mem_dump.inl

@@ -8,8 +8,8 @@
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "aub_mem_dump.h"
 
 #include <algorithm>

opencl/source/aub_mem_dump/context_flags.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace AubMemDump {
 void LrcaHelper::setContextSaveRestoreFlags(uint32_t &ctxSrCtlValue) const {

opencl/source/built_ins/aux_translation_builtin.h

@@ -7,10 +7,9 @@
 
 #pragma once
 #include "core/helpers/hw_helper.h"
-
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "helpers/dispatch_info_builder.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
 
 #include <memory>
 

opencl/source/built_ins/built_ins.cpp

@@ -5,22 +5,22 @@
  *
  */
 
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/debug_helpers.h"
+#include "opencl/source/built_ins/aux_translation_builtin.h"
+#include "opencl/source/built_ins/sip.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/helpers/built_ins_helper.h"
+#include "opencl/source/helpers/convert_color.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/program/program.h"
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/sip.h"
 #include "compiler_options.h"
-#include "device/cl_device.h"
-#include "helpers/built_ins_helper.h"
-#include "helpers/convert_color.h"
-#include "helpers/dispatch_info_builder.h"
-#include "kernel/kernel.h"
-#include "mem_obj/image.h"
-#include "program/program.h"
 
 #include <cstdint>
 #include <sstream>

opencl/source/built_ins/built_ins.inl

@@ -5,10 +5,10 @@
  *
  */
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/populate_built_ins.inl"
-#include "kernel/kernel.h"
-#include "mem_obj/buffer.h"
+#include "opencl/source/built_ins/aux_translation_builtin.h"
+#include "opencl/source/built_ins/populate_built_ins.inl"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/buffer.h"
 namespace NEO {
 
 BuiltInOp<EBuiltInOps::AuxTranslation>::BuiltInOp(BuiltIns &kernelsLib, Device &device) : BuiltinDispatchInfoBuilder(kernelsLib) {

opencl/source/built_ins/built_ins_storage.cpp

@@ -7,9 +7,9 @@
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/device/device.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
 #include "os_inc.h"
 
 #include <cstdint>

opencl/source/built_ins/builtinops/built_in_ops.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "built_ins/built_in_ops_base.h"
+#include "opencl/source/built_ins/built_in_ops_base.h"
 
 namespace NEO {
 namespace EBuiltInOps {

opencl/source/built_ins/builtins_dispatch_builder.cpp

@@ -5,25 +5,25 @@
  *
  */
 
-#include "built_ins/builtins_dispatch_builder.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/debug_helpers.h"
+#include "opencl/source/built_ins/aux_translation_builtin.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.inl"
+#include "opencl/source/built_ins/sip.h"
+#include "opencl/source/built_ins/vme_dispatch_builder.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/helpers/built_ins_helper.h"
+#include "opencl/source/helpers/convert_color.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/program/program.h"
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/built_ins.inl"
-#include "built_ins/sip.h"
-#include "built_ins/vme_dispatch_builder.h"
 #include "compiler_options.h"
-#include "device/cl_device.h"
-#include "helpers/built_ins_helper.h"
-#include "helpers/convert_color.h"
-#include "helpers/dispatch_info_builder.h"
-#include "kernel/kernel.h"
-#include "mem_obj/image.h"
-#include "program/program.h"
 
 #include <cstdint>
 #include <sstream>

opencl/source/built_ins/builtins_dispatch_builder.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/helpers/vec.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/kernel/kernel.h"
 
 #include "CL/cl.h"
 #include "built_in_ops.h"
-#include "built_ins/built_ins.h"
-#include "kernel/kernel.h"
 
 #include <array>
 #include <cstdint>

opencl/source/built_ins/kernels/CMakeLists.txt

@@ -98,7 +98,7 @@ macro(macro_for_each_gen)
       set(target_name builtins_${family_name_with_type})
       add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS})
       add_dependencies(builtins ${target_name})
-      set_target_properties(${target_name} PROPERTIES FOLDER "built_ins/${family_name_with_type}")
+      set_target_properties(${target_name} PROPERTIES FOLDER "opencl/source/built_ins/${family_name_with_type}")
     endif()
   endforeach()
 endmacro()

opencl/source/built_ins/registry/built_ins_registry.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 #include <string>
 #include <unordered_map>

opencl/source/built_ins/registry/register_copy_kernels_source.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "built_ins/registry/built_ins_registry.h"
+#include "opencl/source/built_ins/registry/built_ins_registry.h"
 
 #include <string>
 
@@ -17,7 +17,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
@@ -26,7 +26,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectSrc(
@@ -35,7 +35,7 @@ static RegisterEmbeddedResource registerCopyBufferRectSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_rect.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_rect.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
@@ -44,7 +44,7 @@ static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_rect_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_rect_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferSrc(
@@ -53,7 +53,7 @@ static RegisterEmbeddedResource registerFillBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferStatelessSrc(
@@ -62,7 +62,7 @@ static RegisterEmbeddedResource registerFillBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
@@ -71,7 +71,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
@@ -80,7 +80,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_image3d_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_image3d_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
@@ -89,7 +89,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image3d_to_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image3d_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
@@ -98,7 +98,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image3d_to_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image3d_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
@@ -107,7 +107,7 @@ static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image1d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
@@ -116,7 +116,7 @@ static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image2d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
@@ -125,7 +125,7 @@ static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage1dSrc(
@@ -134,7 +134,7 @@ static RegisterEmbeddedResource registerFillImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image1d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage2dSrc(
@@ -143,7 +143,7 @@ static RegisterEmbeddedResource registerFillImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image2d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage3dSrc(
@@ -152,7 +152,7 @@ static RegisterEmbeddedResource registerFillImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerAuxTranslationSrc(
@@ -161,7 +161,7 @@ static RegisterEmbeddedResource registerAuxTranslationSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/aux_translation.builtin_kernel"
+#include "opencl/source/built_ins/kernels/aux_translation.builtin_kernel"
         ));
 
 } // namespace NEO

opencl/source/built_ins/registry/register_ext_vme_source.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "built_ins/built_in_ops_vme.h"
-#include "built_ins/registry/built_ins_registry.h"
+#include "opencl/source/built_ins/built_in_ops_vme.h"
+#include "opencl/source/built_ins/registry/built_ins_registry.h"
 
 #include <string>
 
@@ -18,7 +18,7 @@ static RegisterEmbeddedResource registerVmeSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_motion_estimate_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_motion_estimate_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedSrc(
@@ -27,7 +27,7 @@ static RegisterEmbeddedResource registerVmeAdvancedSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
@@ -36,7 +36,7 @@ static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel"
         ));
 
 } // namespace NEO

opencl/source/built_ins/sip.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "built_ins/sip.h"
+#include "opencl/source/built_ins/sip.h"
 
 #include "core/device/device.h"
 #include "core/execution_environment/execution_environment.h"
@@ -14,10 +14,9 @@
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "built_ins/built_ins.h"
-#include "program/kernel_info.h"
-#include "program/program.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/program/kernel_info.h"
+#include "opencl/source/program/program.h"
 
 namespace NEO {
 

opencl/source/built_ins/unknown_built_in_name.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
 namespace NEO {