Reorganization directory structure [3/n]

Change-Id: If3dfa3f6007f8810a6a1ae1a4f0c7da38544648d

CMakeLists.txt

@@ -111,7 +111,7 @@ 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)
+  set(NEO_CORE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/source)
 endif()
 
 if(SKIP_UNIT_TESTS)
@@ -780,17 +780,17 @@ endif()
 
 # Project-wide include paths
 # Please keep alphabetical order
-include_directories(core)
+include_directories(shared/source)
 include_directories(${NEO_BUILD_DIR})
 include_directories(${NEO_SOURCE_DIR})
-include_directories(${NEO_SOURCE_DIR}/core/command_stream/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/core/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/core/debug_settings/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/core/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/core/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
-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_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}/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})
+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/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})
@@ -828,7 +828,7 @@ else()
         set(NEO_CORE_MOCKABLE_LIB_NAME "neo_core_mockable")
     endif()
 endif()
-add_subdirectory_unique(core)
+add_subdirectory_unique(shared/source)
 
 macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
     set(NEO_STATIC_LIB_NAME ${LIB_NAME})

manifests/manifest.yml

@@ -14,7 +14,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: a0b04a1678e59383351e967ea1c69fcd5d535a9c
+    revision: ecf3373fbbf3e722a8aa9ce9d3e7c72ce6e219ab
     type: git
   internal:
     branch: master

offline_compiler/CMakeLists.txt

@@ -7,21 +7,21 @@
 project(ocloc)
 
 set(CLOC_SRCS_LIB
-  ${NEO_SOURCE_DIR}/core/device_binary_format/ar/ar.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/ar/ar_decoder.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/ar/ar_decoder.cpp
-  ${NEO_SOURCE_DIR}/core/device_binary_format/ar/ar_encoder.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/ar/ar_encoder.cpp
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/elf.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/elf_decoder.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/elf_decoder.cpp
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/elf_encoder.h
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/elf_encoder.cpp
-  ${NEO_SOURCE_DIR}/core/device_binary_format/elf/ocl_elf.h
-  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/os_library.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_decoder.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_decoder.cpp
+  ${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_encoder.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_encoder.cpp
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_decoder.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_decoder.cpp
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_encoder.h
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_encoder.cpp
+  ${NEO_CORE_DIRECTORY}/device_binary_format/elf/ocl_elf.h
+  ${NEO_CORE_DIRECTORY}/helpers/abort.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/file_io.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/os_library.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
@@ -39,9 +39,9 @@ set(CLOC_SRCS_LIB
   ${NEO_SOURCE_DIR}/offline_compiler/multi_command.h
   ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler_options.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
-  ${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_CORE_DIRECTORY}/compiler_interface/compiler_options/compiler_options_base.cpp
+  ${NEO_CORE_DIRECTORY}/compiler_interface/create_main.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/hw_info.cpp
   ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.cpp
   ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.h
 )
@@ -59,14 +59,14 @@ endif()
 
 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_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
     ${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_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
     ${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
   )
 endif()
@@ -95,7 +95,7 @@ macro(macro_for_each_gen)
   endforeach()
   apply_macro_for_each_platform()
   
-  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND CLOC_SRCS_LIB ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
 endmacro()
 
 apply_macro_for_each_gen("SUPPORTED")

opencl/source/CMakeLists.txt

@@ -79,14 +79,14 @@ if(WIN32)
   set(IGDRCL_EXTRA_LIBS Ws2_32)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${WDK_INCLUDE_PATHS}
-    ${NEO_SOURCE_DIR}/core/os_interface/windows
+    ${NEO_CORE_DIRECTORY}/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_CORE_DIRECTORY}/os_interface/linux
     ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux
     ${I915_INCLUDES_DIR}
   )
@@ -159,7 +159,7 @@ if(${GENERATE_EXECUTABLE})
     target_link_libraries(${NEO_DYNAMIC_LIB_NAME} dxgi)
     add_dependencies(${NEO_DYNAMIC_LIB_NAME} ${GMM_TARGET_NAME})
     target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE
-      ${NEO_SOURCE_DIR}/core/os_interface/windows/gmm_interface_win.cpp
+      ${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
     )
   else()
     target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${GMM_LINK_NAME})
@@ -174,7 +174,7 @@ if(${GENERATE_EXECUTABLE})
     )
     set_property(TARGET ${NEO_DYNAMIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
     target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE
-      ${NEO_SOURCE_DIR}/core/os_interface/linux/gmm_interface_linux.cpp
+      ${NEO_CORE_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
     )
   endif()
 

opencl/source/device/device_info.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "opencl/source/extensions/public/cl_ext_private.h"
-#include <core/utilities/stackvec.h>
+#include <shared/source/utilities/stackvec.h>
 
 #include "CL/cl.h"
 #include "CL/cl_ext.h"

opencl/source/dll/CMakeLists.txt

@@ -21,13 +21,13 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
 
-  ${NEO_SOURCE_DIR}/core/gmm_helper/resource_info.cpp
-  ${NEO_SOURCE_DIR}/core/gmm_helper/page_table_mngr.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/allow_deferred_deleter.cpp
-  ${NEO_SOURCE_DIR}/core/utilities/cpuintrinsics.cpp
-  ${NEO_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
+  ${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
+  ${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/abort.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/allow_deferred_deleter.cpp
+  ${NEO_CORE_DIRECTORY}/utilities/cpuintrinsics.cpp
+  ${NEO_CORE_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
   ${NEO_SOURCE_DIR}/opencl/source/api/api.cpp
   ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
   ${NEO_SOURCE_DIR}/opencl/source/helpers/built_ins_helper.cpp
@@ -47,7 +47,7 @@ set(RUNTIME_SRCS_DLL_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/linux/sys_calls_linux.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
 )
 
 set(RUNTIME_SRCS_DLL_WINDOWS
@@ -55,10 +55,10 @@ set(RUNTIME_SRCS_DLL_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/environment_variables.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/windows/sys_calls.cpp
-  ${NEO_SOURCE_DIR}/core/gmm_helper/windows/gmm_memory.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_calls.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/sys_calls.cpp
+  ${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
 )
 
 target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})

opencl/source/enable_gens.cmake

@@ -89,7 +89,7 @@ macro(macro_for_each_gen)
 
   apply_macro_for_each_platform()
 
-  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
 
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${GEN_TYPE_LOWER}.cpp)
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${GEN_TYPE_LOWER}.cpp)

opencl/test/unit_test/CMakeLists.txt

@@ -199,7 +199,7 @@ set_target_properties(unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_target_properties(run_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 
-target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
 
 if(WIN32)
   set(cloc_cmd_prefix ocloc)

opencl/test/unit_test/aub_tests/CMakeLists.txt

@@ -47,20 +47,20 @@ endif()
 target_include_directories(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_sources(igdrcl_aub_tests PRIVATE
-  ${NEO_SOURCE_DIR}/core/unit_tests/page_fault_manager/default_asan_options.cpp
-  ${NEO_SOURCE_DIR}/core/gmm_helper/resource_info.cpp
+  ${NEO_CORE_DIRECTORY}/unit_tests/page_fault_manager/default_asan_options.cpp
+  ${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )
 
 if(WIN32)
   target_sources(igdrcl_aub_tests PRIVATE
-    ${NEO_SOURCE_DIR}/core/os_interface/windows/gmm_interface_win.cpp
-    ${NEO_SOURCE_DIR}/core/gmm_helper/windows/gmm_memory.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
+    ${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp
   )
 else()
   target_sources(igdrcl_aub_tests PRIVATE
-    ${NEO_SOURCE_DIR}/core/os_interface/linux/gmm_interface_linux.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
   )
 endif()
@@ -77,10 +77,10 @@ if(UNIX)
 else()
   add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
   target_sources(igdrcl_aub_tests PRIVATE
-    ${NEO_SOURCE_DIR}/core/os_interface/windows/gmm_interface_win.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
   )
 endif()
-target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
 
 macro(macro_for_each_test_config)
   if(NOT TARGET ${PLATFORM_IT_LOWER}_aub_tests)

opencl/test/unit_test/libult/CMakeLists.txt

@@ -6,25 +6,25 @@
 
 macro(macro_for_each_gen)
   list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
-    ${NEO_SOURCE_DIR}/core/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
-    ${NEO_SOURCE_DIR}/core/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
-    ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
-    ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
-    ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_DIRECTORY}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp
     ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp
   )
 
-  if(EXISTS "${NEO_SOURCE_DIR}/core/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_SOURCE_DIR}/core/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    include_directories(${NEO_SOURCE_DIR}/core/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
+  if(EXISTS "${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
+    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
+    include_directories(${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
   endif()
 endmacro()
 
 apply_macro_for_each_gen("TESTED")
 
 set(IGDRCL_SRCS_LIB_ULT
-  ${NEO_SOURCE_DIR}/core/helpers/allow_deferred_deleter.cpp
-  ${NEO_SOURCE_DIR}/core/unit_tests/utilities/cpuintrinsics.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/allow_deferred_deleter.cpp
+  ${NEO_CORE_DIRECTORY}/unit_tests/utilities/cpuintrinsics.cpp
   ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp

opencl/test/unit_test/linux/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(igdrcl_${target_name}
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
-  ${NEO_SOURCE_DIR}/core/os_interface/linux/sys_calls_linux.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
@@ -36,7 +36,7 @@ target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_
 
 set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
 target_include_directories(igdrcl_${target_name} PRIVATE
-  ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
   ${CMAKE_CURRENT_SOURCE_DIR}

opencl/test/unit_test/mocks/CMakeLists.txt

@@ -81,7 +81,7 @@ set(IGDRCL_SRCS_tests_mocks
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h
-  ${NEO_SOURCE_DIR}/core/gmm_helper/page_table_mngr_impl.cpp
+  ${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
   ${IGDRCL_SRCS_tests_compiler_mocks}
 )
 
@@ -107,7 +107,7 @@ else()
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h
-    ${NEO_SOURCE_DIR}/core/os_interface/linux/page_table_manager_functions.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/page_table_manager_functions.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.h
   )

opencl/test/unit_test/mt_tests/CMakeLists.txt

@@ -79,7 +79,7 @@ function(run_mt_tests target slices subslices eu_per_ss)
   )
 endfunction()
 
-target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/gen_common)
+target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/gen_common)
 
 macro(macro_for_each_test_config)
   run_mt_tests(${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS})

opencl/test/unit_test/offline_compiler/CMakeLists.txt

@@ -54,10 +54,10 @@ set(IGDRCL_SRCS_offline_compiler_tests
   ${CMAKE_CURRENT_SOURCE_DIR}/ocloc_fatbinary_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.h
-  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp
-  ${NEO_SOURCE_DIR}/core/memory_manager/deferred_deleter.cpp
-  ${NEO_SOURCE_DIR}/core/memory_manager/deferred_deleter.h
+  ${NEO_CORE_DIRECTORY}/helpers/abort.cpp
+  ${NEO_CORE_DIRECTORY}/helpers/file_io.cpp
+  ${NEO_CORE_DIRECTORY}/memory_manager/deferred_deleter.cpp
+  ${NEO_CORE_DIRECTORY}/memory_manager/deferred_deleter.h
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/test_files.cpp
   ${IGDRCL_SRCS_cloc}
   ${IGDRCL_SRCS_offline_compiler_mock}
@@ -68,11 +68,11 @@ set(IGDRCL_SRCS_offline_compiler_tests
 
 if(WIN32)
   list(APPEND IGDRCL_SRCS_offline_compiler_tests
-    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_thread_win.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/os_thread_win.cpp
   )
 else()
   list(APPEND IGDRCL_SRCS_offline_compiler_tests
-    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_thread_linux.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/os_thread_linux.cpp
   )
 endif()
 

opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt

@@ -8,16 +8,16 @@ set(CLOC_SEGFAULT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/os_library.h
+  ${NEO_CORE_DIRECTORY}/helpers/abort.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/os_library.h
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp
 )
 
 if(WIN32)
   list(APPEND CLOC_SEGFAULT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
-    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
-    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
@@ -25,8 +25,8 @@ if(WIN32)
 else()
   list(APPEND CLOC_SEGFAULT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
-    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
-    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
+    ${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
   )
 endif()
 

opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt

@@ -25,7 +25,7 @@ target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_TES
 if(WIN32)
   target_sources(neo_page_fault_manager_tests PRIVATE
   ${CPU_PAGE_FAULT_MANAGER_WINDOWS_TESTS}
-  ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
 )
 else()
   target_sources(neo_page_fault_manager_tests PRIVATE
@@ -37,7 +37,7 @@ endif()
 target_link_libraries(neo_page_fault_manager_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
 
 target_include_directories(neo_page_fault_manager_tests PRIVATE
-  ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
 )
 

opencl/test/unit_test/windows/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(igdrcl_windows_dll_tests
   ${NEO_SOURCE_DIR}/opencl/source/dll/create_command_stream.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
-  ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
@@ -30,7 +30,7 @@ add_executable(igdrcl_windows_dll_tests
 target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
 
 target_include_directories(igdrcl_windows_dll_tests PRIVATE
-  ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )

shared/source/CMakeLists.txt

@@ -38,12 +38,12 @@ function(generate_core_lib LIB_NAME MOCKABLE)
   if(WIN32)
     target_include_directories(${LIB_NAME} PUBLIC
       ${WDK_INCLUDE_PATHS}
-      ${NEO_SOURCE_DIR}/core/os_interface/windows
+      ${NEO_CORE_DIRECTORY}/os_interface/windows
     )
   else()
     target_include_directories(${LIB_NAME} PUBLIC
       ${I915_INCLUDES_DIR}
-      ${NEO_SOURCE_DIR}/core/os_interface/linux
+      ${NEO_CORE_DIRECTORY}/os_interface/linux
     )
   endif()
   create_project_source_tree(${LIB_NAME})