CMake: rename IGDRCL_SOURCE_DIR to NEO_SOURCE_DIR

use NEO_SOURCE_DIR instead of CMAKE_SOURCE_DIR Change-Id: Ib3774c80147941ded6bc884d83407461c89e7b8e Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-18 22:08:53 +08:00 · 2019-10-10 17:41:59 +02:00
parent 1ecbb5464b
commit 79e7a51908
35 changed files with 277 additions and 277 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,8 @@ endif("${BUILD_TYPE_lower}" STREQUAL "releaseinternal")
 message(STATUS "${CMAKE_BUILD_TYPE} build configuration")

 # Set the runtime source directory
-if(NOT DEFINED IGDRCL_SOURCE_DIR)
-  set(IGDRCL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+if(NOT DEFINED NEO_SOURCE_DIR)
+  set(NEO_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()

 # Set the core source directory
@@ -167,7 +167,7 @@ if(DISABLE_AUB_STREAM)
    unset(AUB_STREAM_DIR)
 endif()

-get_filename_component(I915_INCLUDES_DIR "${IGDRCL_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
+get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
 message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}")

 if(NOT DEFINED KHRONOS_HEADERS_DIR)
@@ -245,7 +245,7 @@ if(NOT IGC__IGC_TARGETS)
    if(DEFINED IGC_DIR)
        get_filename_component(IGC_DIR "${IGC_DIR}" ABSOLUTE)
    else()
-        get_filename_component(IGC_DIR_tmp "${CMAKE_SOURCE_DIR}/../igc" ABSOLUTE)
+        get_filename_component(IGC_DIR_tmp "${NEO_SOURCE_DIR}/../igc" ABSOLUTE)
        if(IS_DIRECTORY "${IGC_DIR_tmp}")
            set(IGC_DIR "${IGC_DIR_tmp}")
        endif()
@@ -359,7 +359,7 @@ if(NOT DEFINED GMMUMD_LIB_NAME)
    if(DEFINED GMM_SOURCE_DIR)
      get_filename_component(GMM_SOURCE_DIR "${GMM_SOURCE_DIR}" ABSOLUTE)
    else()
-      get_filename_component(GMM_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../gmmlib" ABSOLUTE)
+      get_filename_component(GMM_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../gmmlib" ABSOLUTE)
      if(IS_DIRECTORY "${GMM_SOURCE_DIR_tmp}")
        set(GMM_SOURCE_DIR "${GMM_SOURCE_DIR_tmp}")
      endif()
@@ -429,7 +429,7 @@ if(NOT DEFINED INSTRUMENTATION_LIB_NAME)
  if(DEFINED INSTRUMENTATION_SOURCE_DIR)
    get_filename_component(INSTRUMENTATION_SOURCE_DIR "${INSTRUMENTATION_SOURCE_DIR}" ABSOLUTE)
  else()
-    get_filename_component(INSTRUMENTATION_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../instrumentation" ABSOLUTE)
+    get_filename_component(INSTRUMENTATION_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../instrumentation" ABSOLUTE)
    if(IS_DIRECTORY "${INSTRUMENTATION_SOURCE_DIR_tmp}")
      set(INSTRUMENTATION_SOURCE_DIR "${INSTRUMENTATION_SOURCE_DIR_tmp}")
    endif()
@@ -463,7 +463,7 @@ if(NOT DISABLE_LIBVA)
      if(DEFINED LIBVA_SOURCE_DIR)
        get_filename_component(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR}" ABSOLUTE)
      else()
-        get_filename_component(LIBVA_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../libva" ABSOLUTE)
+        get_filename_component(LIBVA_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../libva" ABSOLUTE)
        if(IS_DIRECTORY "${LIBVA_SOURCE_DIR_tmp}")
          set(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR_tmp}")
        endif()
@@ -743,22 +743,22 @@ endif()

 # Project-wide include paths
 # Please keep alphabetical order
-include_directories(${IGDRCL_SOURCE_DIR})
 include_directories(${IGDRCL_BUILD_DIR})
-include_directories(${IGDRCL_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR})
+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}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})

-set(HW_SRC_INCLUDE_PATH ${IGDRCL_SOURCE_DIR}/runtime/gen_common)
+set(HW_SRC_INCLUDE_PATH ${NEO_SOURCE_DIR}/runtime/gen_common)

 if(HAVE_INSTRUMENTATION)
  set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
@@ -767,7 +767,7 @@ if(HAVE_INSTRUMENTATION)
 else()
  set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX "/")
 endif()
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})

 # Define where to put binaries
 if(MSVC)
@@ -839,9 +839,9 @@ else()
 endif()

 set(DONT_LINK_ELF_STATICALLY TRUE)
-if(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
-  add_subdirectory_unique(${IGDRCL_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
-endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
+if(EXISTS ${NEO_SOURCE_DIR}/../internal)
+  add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
+endif(EXISTS ${NEO_SOURCE_DIR}/../internal)

 add_subdirectory_unique(scripts/lint)

--- a/common_macros.cmake
+++ b/common_macros.cmake
@@ -5,12 +5,12 @@
 #

 macro(hide_subdir subdir)
-  file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+  file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
  set(${subdir_relative}_hidden} TRUE)
 endmacro()

 macro(add_subdirectory_unique subdir)
-  file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+  file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
  if(NOT ${subdir_relative}_hidden})
    add_subdirectory(${subdir} ${ARGN})
  endif()
@@ -20,7 +20,7 @@ endmacro()
 macro(add_subdirectories)
  file(GLOB subdirectories RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
  foreach(subdir ${subdirectories})
-    file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+    file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt AND NOT ${subdir_relative}_hidden})
      add_subdirectory(${subdir})
    endif()
@@ -29,7 +29,7 @@ endmacro()

 macro(create_project_source_tree target)
  if(MSVC)
-    set(prefixes ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN} ${IGDRCL_SOURCE_DIR})
+    set(prefixes ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN} ${NEO_SOURCE_DIR})
    get_target_property(source_list ${target} SOURCES)
    foreach(source_file ${source_list})
      if(NOT ${source_file} MATCHES "\<*\>")
--- a/elf/CMakeLists.txt
+++ b/elf/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(elflib STATIC EXCLUDE_FROM_ALL
 create_project_source_tree(elflib)

 target_include_directories(elflib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(elflib PRIVATE ${IGDRCL_SOURCE_DIR})
+target_include_directories(elflib PRIVATE ${NEO_SOURCE_DIR})

 set_target_properties(elflib PROPERTIES FOLDER "elflib")

--- a/offline_compiler/CMakeLists.txt
+++ b/offline_compiler/CMakeLists.txt
@@ -7,50 +7,50 @@
 project(ocloc)

 set(CLOC_SRCS_LIB
-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/helper.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/helper.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/helper.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/offline_compiler.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/options.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/hw_info.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/platform/extensions.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/platform/extensions.h
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
+  ${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
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
+  ${NEO_SOURCE_DIR}/offline_compiler/helper.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.h
+  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.h
+  ${NEO_SOURCE_DIR}/offline_compiler/options.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
+  ${NEO_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/file_io.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/hw_info.cpp
+  ${NEO_SOURCE_DIR}/runtime/platform/extensions.cpp
+  ${NEO_SOURCE_DIR}/runtime/platform/extensions.h
 )

 if(${IGA_HEADERS_AVAILABLE})
  set(CLOC_SRCS_LIB ${CLOC_SRCS_LIB}
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
  )
 else()
  set(CLOC_SRCS_LIB ${CLOC_SRCS_LIB}
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_stubs.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_stubs.cpp
  )
 endif()

 if(WIN32)
  list(APPEND CLOC_SRCS_LIB
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
  )
 else()
  list(APPEND CLOC_SRCS_LIB
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
  )
 endif()

@@ -63,19 +63,19 @@ set(RUNTIME_GENX_CPP_FILES
 )

 macro(macro_for_each_platform)
-  list(APPEND CLOC_SRCS_LIB ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
+  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/runtime/${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 ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT})
+    set(SRC_FILE ${NEO_SOURCE_DIR}/runtime/${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()
  endforeach()
  apply_macro_for_each_platform()
  
-  list(APPEND CLOC_SRCS_LIB ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
 endmacro()

 apply_macro_for_each_gen("SUPPORTED")
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -121,7 +121,7 @@ if(${GENERATE_EXECUTABLE})

  add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
    ${NEO_DYNAMIC_LIB__TARGET_OBJECTS}
-    ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+    ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
  )

  if(UNIX)
@@ -189,7 +189,7 @@ if(UNIX AND NOT (TARGET clang-tidy))
    POST_BUILD
    COMMAND echo clang-tidy...
    COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name *.cpp -print0 | xargs -0 -I{} -P`nproc` clang-tidy -p ${IGDRCL_BINARY_DIR} {} | tee ${IGDRCL_BINARY_DIR}/clang-tidy.log
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
  )
 endif()

--- a/runtime/dll/CMakeLists.txt
+++ b/runtime/dll/CMakeLists.txt
@@ -5,7 +5,7 @@
 #

 if(NOT DISABLED_GTPIN_SUPPORT)
-  set(GTPIN_INIT_FILE "${IGDRCL_SOURCE_DIR}/runtime/gtpin/gtpin_init.cpp")
+  set(GTPIN_INIT_FILE "${NEO_SOURCE_DIR}/runtime/gtpin/gtpin_init.cpp")
 else()
  set(GTPIN_INIT_FILE "")
 endif()
@@ -19,14 +19,14 @@ set(RUNTIME_SRCS_DLL_BASE
  ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp

-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${IGDRCL_SOURCE_DIR}/core/utilities/clflush.cpp
-  ${IGDRCL_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
+  ${NEO_SOURCE_DIR}/core/utilities/clflush.cpp
+  ${NEO_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
+  ${NEO_SOURCE_DIR}/runtime/api/api.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
+  ${NEO_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp

  ${GTPIN_INIT_FILE}
  ${HW_SRC_LINK}
@@ -48,11 +48,11 @@ set(RUNTIME_SRCS_DLL_WINDOWS
  ${CMAKE_CURRENT_SOURCE_DIR}/windows/environment_variables.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/windows/options.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_calls.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
 )

 target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})
--- a/runtime/enable_gens.cmake
+++ b/runtime/enable_gens.cmake
@@ -56,7 +56,7 @@ endmacro()

 macro(macro_for_each_gen)
  set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER})
-  set(CORE_GENX_PREFIX "${IGDRCL_SOURCE_DIR}/core/${GEN_TYPE_LOWER}")
+  set(CORE_GENX_PREFIX "${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}")
  # Add default GEN files
  foreach(SRC_IT ${RUNTIME_SRCS_GENX_H_BASE})
    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT})
--- a/runtime/gen12lp/additional_files_gen12lp.cmake
+++ b/runtime/gen12lp/additional_files_gen12lp.cmake
@@ -11,7 +11,7 @@ set(RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP
  ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp${BRANCH_DIR_SUFFIX}/helpers_gen12lp.cpp
 )

-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
+include_directories(${NEO_SOURCE_DIR}/runtime/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)

 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})
--- a/runtime/sharings/CMakeLists.txt
+++ b/runtime/sharings/CMakeLists.txt
@@ -30,12 +30,12 @@ set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS ${RUNTIME_SRCS_SHARINGS})


 if(WIN32)
-  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows)
+  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/os_interface/windows)
 else()
-  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux)
+  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/os_interface/linux)
 endif()

 add_subdirectories()

-create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME} ${IGDRCL_SOURCE_DIR}/runtime)
+create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME} ${NEO_SOURCE_DIR}/runtime)
 set(MSVC_DEF_ADDITIONAL_EXPORTS ${MSVC_DEF_ADDITIONAL_EXPORTS} PARENT_SCOPE)
--- a/scripts/lint/CMakeLists.txt
+++ b/scripts/lint/CMakeLists.txt
@@ -1,21 +1,21 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-if(IS_DIRECTORY ${IGDRCL_SOURCE_DIR}/.git)
+if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
  add_custom_target(lint
-    ${IGDRCL_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
  )
  set_target_properties(lint PROPERTIES
    EXCLUDE_FROM_DEFAULT_BUILD TRUE
    EXCLUDE_FROM_ALL TRUE
  )
  add_custom_target(lint_head
-    ${IGDRCL_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
  )
  set_target_properties(lint_head PROPERTIES
    EXCLUDE_FROM_DEFAULT_BUILD TRUE
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -41,7 +41,7 @@ set(IGDRCL_SRCS_tests_local
 )

 if(WIN32)
-   list(APPEND IGDRCL_SRCS_tests_local ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp)
+   list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp)
 endif()

 add_subdirectory(libult)
@@ -82,14 +82,14 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS

 if(DEFINED AUB_STREAM_DIR)
  add_library (aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
-    ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
  )
  list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
    $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>
    $<TARGET_OBJECTS:aub_stream_mock_lib>
  )
 else()
-   list(APPEND IGDRCL_SRCS_tests_local ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp)
+   list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp)
 endif()

 add_executable(igdrcl_tests
@@ -142,7 +142,7 @@ else()
 endif()

 target_include_directories(igdrcl_tests PRIVATE
-  ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
+  ${NEO_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
  ${ENGINE_NODE_DIR}
  ${KHRONOS_GL_HEADERS_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
@@ -150,7 +150,7 @@ target_include_directories(igdrcl_tests PRIVATE

 target_link_libraries(igdrcl_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})

-set(BUILT_IN_KERNEL_DIR "${IGDRCL_SOURCE_DIR}/runtime/built_ins")
+set(BUILT_IN_KERNEL_DIR "${NEO_SOURCE_DIR}/runtime/built_ins")

 function(neo_copy_test_files target product)
  set(outputdir "${TargetDir}/${product}")
@@ -163,10 +163,10 @@ function(neo_copy_test_files target product)
    COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}/cl_cache
    COMMAND echo copying built-in kernel files from ${BUILT_IN_KERNEL_DIR}/kernels to ${outputdir}/test_files
    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILT_IN_KERNEL_DIR}/kernels ${outputdir}/test_files
-    COMMAND echo copying test files from ${IGDRCL_SOURCE_DIR}/unit_tests/test_files to ${outputdir}/test_files
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${IGDRCL_SOURCE_DIR}/unit_tests/test_files ${outputdir}/test_files
+    COMMAND echo copying test files from ${NEO_SOURCE_DIR}/unit_tests/test_files to ${outputdir}/test_files
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${NEO_SOURCE_DIR}/unit_tests/test_files ${outputdir}/test_files
    COMMAND WORKING_DIRECTORY ${TargetDir}
-    DEPENDS ${IGDRCL_SOURCE_DIR}/unit_tests/test_files
+    DEPENDS ${NEO_SOURCE_DIR}/unit_tests/test_files
  )
  add_dependencies(${target} copy_compiler_files)
  set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${product}")
@@ -186,7 +186,7 @@ endif()
 set_target_properties(unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_target_properties(run_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

-target_include_directories(igdrcl_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})

 if(WIN32)
  set(cloc_cmd_prefix ocloc)
@@ -525,7 +525,7 @@ apply_macro_for_each_gen("TESTED")
 add_subdirectories()
 add_dependencies(unit_tests mock_gmm)
 add_dependencies(igdrcl_tests mock_gmm)
-create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
+create_project_source_tree(igdrcl_tests ${NEO_SOURCE_DIR}/runtime)

 set(UltPchHeader "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.h")
 set(UltPchSource "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.cpp")
--- a/unit_tests/aub_tests/CMakeLists.txt
+++ b/unit_tests/aub_tests/CMakeLists.txt
@@ -10,8 +10,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake)

 list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
  ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
+  ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
  $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
  $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
  $<TARGET_OBJECTS:igdrcl_libult>
@@ -40,21 +40,21 @@ set_target_properties(run_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

 if(WIN32)
  target_include_directories(igdrcl_aub_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
  )
 endif()

 target_include_directories(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

 target_sources(igdrcl_aub_tests PRIVATE
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )

 if(WIN32)
  target_sources(igdrcl_aub_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
+    ${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
  )
 endif()

@@ -66,7 +66,7 @@ target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME})
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
 target_link_libraries(igdrcl_aub_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})

-target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX})

 macro(macro_for_each_test_config)
  if(NOT TARGET ${PLATFORM_IT_LOWER}_aub_tests)
@@ -123,4 +123,4 @@ macro(macro_for_each_gen)
 endmacro()

 apply_macro_for_each_gen("TESTED")
-create_project_source_tree(igdrcl_aub_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(igdrcl_aub_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)
--- a/unit_tests/aub_tests/gen11/CMakeLists.txt
+++ b/unit_tests/aub_tests/gen11/CMakeLists.txt
@@ -8,7 +8,7 @@ if(TESTS_GEN11)
  target_sources(igdrcl_aub_tests PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen11.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen11/unit_test_helper_gen11.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/gen11/unit_test_helper_gen11.cpp
  )
  add_subdirectories()
 endif()
--- a/unit_tests/aub_tests/gen12lp/CMakeLists.txt
+++ b/unit_tests/aub_tests/gen12lp/CMakeLists.txt
@@ -9,8 +9,8 @@ if(TESTS_GEN12LP)
    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump_tests_gen12lp.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen12lp.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp
  )
  add_subdirectories()
 endif()
--- a/unit_tests/aub_tests/gen8/CMakeLists.txt
+++ b/unit_tests/aub_tests/gen8/CMakeLists.txt
@@ -8,7 +8,7 @@ if(TESTS_GEN8)
  target_sources(igdrcl_aub_tests PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen8/unit_test_helper_gen8.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/gen8/unit_test_helper_gen8.cpp
  )
  add_subdirectories()
 endif()
--- a/unit_tests/aub_tests/gen9/CMakeLists.txt
+++ b/unit_tests/aub_tests/gen9/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(TESTS_GEN9)
  target_sources(igdrcl_aub_tests PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen9/unit_test_helper_gen9.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/gen9/unit_test_helper_gen9.cpp
  )
  add_subdirectories()
 endif()
--- a/unit_tests/elflib/CMakeLists.txt
+++ b/unit_tests/elflib/CMakeLists.txt
@@ -9,10 +9,10 @@ project(elflib_tests)
 set(CLELFLIB_UNIT_TESTS_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/elflib_tests.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h
-  ${IGDRCL_SOURCE_DIR}/core/unit_tests/helpers/memory_management.cpp
-  ${IGDRCL_SOURCE_DIR}/core/unit_tests/helpers/memory_management.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h
+  ${NEO_SOURCE_DIR}/core/unit_tests/helpers/memory_management.cpp
+  ${NEO_SOURCE_DIR}/core/unit_tests/helpers/memory_management.h
 )

 add_executable(elflib_tests ${CLELFLIB_UNIT_TESTS_SRCS})
@@ -33,4 +33,4 @@ add_dependencies(run_unit_tests run_elflib_tests)

 set_target_properties(elflib_tests PROPERTIES FOLDER "elflib")
 set_target_properties(run_elflib_tests PROPERTIES FOLDER "elflib")
-create_project_source_tree(elflib_tests ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(elflib_tests ${NEO_SOURCE_DIR}/unit_tests)
--- a/unit_tests/gtpin/CMakeLists.txt
+++ b/unit_tests/gtpin/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,7 +9,7 @@ set(IGDRCL_SRCS_tests_gtpin
  ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_tests.cpp
 )
 macro(macro_for_each_gen)
-  list(APPEND IGDRCL_SRCS_tests_gtpin ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND IGDRCL_SRCS_tests_gtpin ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
 endmacro()
 apply_macro_for_each_gen("TESTED")
 if(NOT DISABLED_GTPIN_SUPPORT)
--- a/unit_tests/libult/CMakeLists.txt
+++ b/unit_tests/libult/CMakeLists.txt
@@ -6,38 +6,38 @@

 macro(macro_for_each_gen)
  list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
-    ${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full_${GEN_TYPE_LOWER}.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
  )

-  if(EXISTS "${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    include_directories(${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
+  if(EXISTS "${NEO_SOURCE_DIR}/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}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
+    include_directories(${NEO_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
  endif()
 endmacro()

 apply_macro_for_each_gen("TESTED")

 set(IGDRCL_SRCS_LIB_ULT
-  ${IGDRCL_SOURCE_DIR}/core/unit_tests/utilities/clflush.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/built_ins_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/execution_environment_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/execution_environment_helper.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_tbx_sockets.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/source_level_debugger.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/ult_aub_command_stream_receiver.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/ult_command_stream_receiver.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/utilities/debug_settings_reader_creator.cpp
+  ${NEO_SOURCE_DIR}/core/unit_tests/utilities/clflush.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/abort.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/built_ins_helper.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/execution_environment_helper.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/execution_environment_helper.h
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.h
+  ${NEO_SOURCE_DIR}/unit_tests/libult/create_tbx_sockets.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.h
+  ${NEO_SOURCE_DIR}/unit_tests/libult/ult_aub_command_stream_receiver.h
+  ${NEO_SOURCE_DIR}/unit_tests/libult/ult_command_stream_receiver.h
+  ${NEO_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/utilities/debug_settings_reader_creator.cpp
  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.cpp
  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.h
  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_management.cpp
@@ -45,7 +45,7 @@ set(IGDRCL_SRCS_LIB_ULT
 )

 set(IGDRCL_SRCS_LIB_ULT_WINDOWS
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/mock_environment_variables.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/mock_environment_variables.cpp
 )

 add_library (igdrcl_libult OBJECT EXCLUDE_FROM_ALL
@@ -57,8 +57,8 @@ if(UNIX)
 endif()

 set(IGDRCL_SRCS_LIB_ULT_CS
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.h
+  ${NEO_SOURCE_DIR}/unit_tests/libult/create_command_stream.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/create_command_stream.h
 )
 add_library (igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL
  ${IGDRCL_SRCS_LIB_ULT_CS}
@@ -68,47 +68,47 @@ target_include_directories(igdrcl_libult PRIVATE
 )

 set(IGDRCL_SRCS_LIB_ULT_ENV
-  ${IGDRCL_SOURCE_DIR}/unit_tests/custom_event_listener.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/ult_config_listener.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/ult_config_listener.h
+  ${NEO_SOURCE_DIR}/unit_tests/custom_event_listener.h
+  ${NEO_SOURCE_DIR}/unit_tests/global_environment.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/global_environment.h
+  ${NEO_SOURCE_DIR}/unit_tests/main.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/options.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/device_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/program_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h
+  ${NEO_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.h
+  ${NEO_SOURCE_DIR}/unit_tests/ult_config_listener.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/ult_config_listener.h
 )
 add_library (igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL
  ${IGDRCL_SRCS_LIB_ULT_ENV}
 )

 set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/sys_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_calls.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/sys_calls.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.h
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_calls.cpp
 )

 set(IGDRCL_SRCS_LIB_ULT_ENV_LINUX
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/allocator_helper.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/allocator_helper.cpp
 )

 if(WIN32)
@@ -120,7 +120,7 @@ endif()

 target_include_directories(igdrcl_libult_env PRIVATE
  $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
-  ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
+  ${NEO_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
 )

 set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW})
--- a/unit_tests/linux/CMakeLists.txt
+++ b/unit_tests/linux/CMakeLists.txt
@@ -7,11 +7,11 @@
 set(IGDRCL_SRCS_linux_tests
  ${CMAKE_CURRENT_SOURCE_DIR}/linux_tests_configuration.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/main_linux.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/allocator_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/allocator_helper.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )

@@ -22,13 +22,13 @@ set(IGDRCL_SRCS_linux_dll_tests
  ${CMAKE_CURRENT_SOURCE_DIR}/drm_wrap.h
  ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/options.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/linux/os_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )

@@ -37,7 +37,7 @@ if(IGDRCL__LIBVA_FOUND)
 endif(IGDRCL__LIBVA_FOUND)

 macro(macro_for_each_platform)
-  list(APPEND IGDRCL_SRCS_linux_dll_tests ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
+  list(APPEND IGDRCL_SRCS_linux_dll_tests ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
 endmacro()
 macro(macro_for_each_gen)
  apply_macro_for_each_platform()
@@ -54,9 +54,9 @@ foreach(target_name linux_tests linux_dll_tests)

  set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
  target_include_directories(igdrcl_${target_name} PRIVATE
-    ${IGDRCL_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/devices${BRANCH_DIR_SUFFIX}
-    ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/devices${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX}
    ${CMAKE_CURRENT_SOURCE_DIR}
  )
  add_dependencies(unit_tests igdrcl_${target_name})
--- a/unit_tests/mocks/CMakeLists.txt
+++ b/unit_tests/mocks/CMakeLists.txt
@@ -105,7 +105,7 @@ add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks})

 if(WIN32)
  target_include_directories(igdrcl_mocks PUBLIC
-    ${IGDRCL_SOURCE_DIR}/unit_tests/mocks/gmm_memory${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/unit_tests/mocks/gmm_memory${BRANCH_DIR_SUFFIX}
  )
 endif()

--- a/unit_tests/mocks/gl/CMakeLists.txt
+++ b/unit_tests/mocks/gl/CMakeLists.txt
@@ -16,7 +16,7 @@ if(WIN32)
  set(IGDRCL_SRCS_mock_opengl32
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
-    ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
  )

  add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32})
--- a/unit_tests/mt_tests/CMakeLists.txt
+++ b/unit_tests/mt_tests/CMakeLists.txt
@@ -8,9 +8,9 @@ project(igdrcl_mt_tests)

 add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/ult_configuration.cpp
+  ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
  $<TARGET_OBJECTS:igdrcl_libult>
  $<TARGET_OBJECTS:igdrcl_libult_cs>
@@ -29,7 +29,7 @@ target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${IGDRCL_EXTRA_LIBS})

 if(WIN32)
  target_sources(igdrcl_mt_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
  )
 endif()

@@ -47,7 +47,7 @@ add_custom_target(run_mt_unit_tests)

 add_dependencies(igdrcl_mt_tests test_dynamic_lib mock_gmm)

-create_project_source_tree(igdrcl_mt_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(igdrcl_mt_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)

 set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS})
@@ -74,7 +74,7 @@ function(run_mt_tests target slices subslices eu_per_ss)
  )
 endfunction()

-target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${IGDRCL_SOURCE_DIR}/runtime/gen_common)
+target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/runtime/gen_common)

 macro(macro_for_each_test_config)
  run_mt_tests(${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS})
--- a/unit_tests/mt_tests/api/CMakeLists.txt
+++ b/unit_tests/mt_tests/api/CMakeLists.txt
@@ -9,10 +9,10 @@ set(IGDRCL_SRCS_mt_tests_api
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/api/cl_api_tests.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/api/cl_create_user_event_tests_mt.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/api/cl_get_platform_ids_tests_mt.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/api/cl_intel_tracing_tests_mt.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/api/cl_api_tests.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/api/cl_create_user_event_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/api/cl_get_platform_ids_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/api/cl_intel_tracing_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_api})
--- a/unit_tests/mt_tests/command_queue/CMakeLists.txt
+++ b/unit_tests/mt_tests/command_queue/CMakeLists.txt
@@ -9,9 +9,9 @@ set(IGDRCL_SRCS_mt_tests_command_queue
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_command_queue})
--- a/unit_tests/mt_tests/event/CMakeLists.txt
+++ b/unit_tests/mt_tests/event/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,6 +9,6 @@ set(IGDRCL_SRCS_mt_tests_event
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/event/user_events_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/event/user_events_tests_mt.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_event})
--- a/unit_tests/mt_tests/fixtures/CMakeLists.txt
+++ b/unit_tests/mt_tests/fixtures/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,7 +9,7 @@ set(IGDRCL_SRCS_mt_tests_fixtures
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_fixtures})
--- a/unit_tests/mt_tests/helpers/CMakeLists.txt
+++ b/unit_tests/mt_tests/helpers/CMakeLists.txt
@@ -10,6 +10,6 @@ set(IGDRCL_SRCS_mt_tests_helpers
  ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max_mt_tests.cpp

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/base_object_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/base_object_tests_mt.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_helpers})
--- a/unit_tests/mt_tests/memory_manager/CMakeLists.txt
+++ b/unit_tests/mt_tests/memory_manager/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -10,6 +10,6 @@ set(IGDRCL_SRCS_mt_tests_memory_manager
  ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_clear_queue_mt_tests.cpp

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_memory_manager})
--- a/unit_tests/mt_tests/platform/CMakeLists.txt
+++ b/unit_tests/mt_tests/platform/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,6 +9,6 @@ set(IGDRCL_SRCS_mt_tests_platform
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

  # necessary dependencies from igdrcl_tests
-  ${IGDRCL_SOURCE_DIR}/unit_tests/platform/platform_tests_mt.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/platform/platform_tests_mt.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_platform})
--- a/unit_tests/offline_compiler/CMakeLists.txt
+++ b/unit_tests/offline_compiler/CMakeLists.txt
@@ -8,9 +8,9 @@ project(ocloc_tests)


 set(IGDRCL_SRCS_cloc
-${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
-${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
-${IGDRCL_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
+${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
+${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
+${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
 )

 set(IGDRCL_SRCS_offline_compiler_mock
@@ -21,20 +21,20 @@ ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_offline_compiler.h
 )

 set(CLOC_SRCS_UTILITIES
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/safety_caller.h
+  ${NEO_SOURCE_DIR}/offline_compiler/utilities/safety_caller.h
 )

 if(WIN32)
  list(APPEND CLOC_SRCS_UTILITIES
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/safety_caller_windows.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
+    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_caller_windows.cpp
+    ${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
  )
 else()
  list(APPEND CLOC_SRCS_UTILITIES
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/linux/safety_caller_linux.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/linux/safety_guard_linux.h
+    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_caller_linux.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_guard_linux.h
  )
 endif()

@@ -48,11 +48,11 @@ set(IGDRCL_SRCS_offline_compiler_tests
  ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.h
-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/file_io.cpp
+  ${NEO_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.cpp
+  ${NEO_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.h
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
  ${IGDRCL_SRCS_cloc}
  ${IGDRCL_SRCS_offline_compiler_mock}
  ${CLOC_SRCS_LIB}
@@ -61,11 +61,11 @@ set(IGDRCL_SRCS_offline_compiler_tests

 if(WIN32)
  list(APPEND IGDRCL_SRCS_offline_compiler_tests
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/os_thread_win.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_thread_win.cpp
  )
 else()
  list(APPEND IGDRCL_SRCS_offline_compiler_tests
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux/os_thread_linux.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_thread_linux.cpp
  )
 endif()

--- a/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
+++ b/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
@@ -8,23 +8,23 @@ set(CLOC_SEGFAULT_TEST_SOURCES
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
  ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/os_library.h
-  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/os_library.h
+  ${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
 )

 if(WIN32)
  list(APPEND CLOC_SEGFAULT_TEST_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
+    ${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
+    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
  )
 else()
  list(APPEND CLOC_SEGFAULT_TEST_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
  )
 endif()

@@ -40,7 +40,7 @@ if(UNIX)
 endif()

 set(CLOC_SEGFAULT_TEST_INCLUDES
-  ${IGDRCL_SOURCE_DIR}
+  ${NEO_SOURCE_DIR}
  ${THIRD_PARTY_DIR}
 )

@@ -52,7 +52,7 @@ get_property(CLOC_FOLDER TARGET ocloc PROPERTY FOLDER)
 set_property(TARGET ocloc_segfault_test PROPERTY FOLDER ${CLOC_FOLDER})

 target_include_directories(ocloc_segfault_test BEFORE PRIVATE ${CLOC_SEGFAULT_TEST_INCLUDES})
-create_project_source_tree(ocloc_segfault_test ${IGDRCL_SOURCE_DIR}/offline_compiler ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(ocloc_segfault_test ${NEO_SOURCE_DIR}/offline_compiler ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)

 add_custom_target(run_ocloc_segfault_test ALL
  DEPENDS ocloc_segfault_test
--- a/unit_tests/tbx/CMakeLists.txt
+++ b/unit_tests/tbx/CMakeLists.txt
@@ -7,11 +7,11 @@
 add_executable(igdrcl_tbx_tests
  ${CMAKE_CURRENT_SOURCE_DIR}/main_tbx.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/tbx_tests_configuration.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/options.cpp
  $<TARGET_OBJECTS:igdrcl_libult>
 )

@@ -19,29 +19,29 @@ target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmo

 if(WIN32)
  target_include_directories(igdrcl_tbx_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
+    ${NEO_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
  )
  target_include_directories(igdrcl_tbx_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
  target_sources(igdrcl_tbx_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/options.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/sys_calls.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_calls.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/sys_calls.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_calls.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
  )
  target_link_libraries(igdrcl_tbx_tests dbghelp)
 else()
  target_sources(igdrcl_tbx_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/options.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
+    ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
  )
 endif()

 copy_gmm_dll_for(igdrcl_tbx_tests)
-create_project_source_tree(igdrcl_tbx_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(igdrcl_tbx_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)

 add_custom_target(run_tbx_tests ALL DEPENDS unit_tests igdrcl_tbx_tests)
 add_custom_command(
--- a/unit_tests/windows/CMakeLists.txt
+++ b/unit_tests/windows/CMakeLists.txt
@@ -14,12 +14,12 @@ set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS

 add_executable(igdrcl_windows_dll_tests
  ${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
-  ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
-  ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp
+  ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/windows/os_interface.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/ult_configuration.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
@@ -29,12 +29,12 @@ add_executable(igdrcl_windows_dll_tests
 target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})

 target_include_directories(igdrcl_windows_dll_tests PRIVATE
-  ${IGDRCL_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
-  ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX}
+  ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX}
  ${CMAKE_CURRENT_SOURCE_DIR}
 )

-create_project_source_tree(igdrcl_windows_dll_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+create_project_source_tree(igdrcl_windows_dll_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)

 add_custom_target(run_windows_dll_tests ALL DEPENDS unit_tests igdrcl_windows_dll_tests)
 add_custom_command(
--- a/version.cmake
+++ b/version.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,8 +8,8 @@ if(UNIX)
  if(NOT DEFINED NEO_DRIVER_VERSION)
    find_program(GIT NAMES git)
    if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
-      if(IS_DIRECTORY ${IGDRCL_SOURCE_DIR}/.git)
-        set(GIT_arg --git-dir=${IGDRCL_SOURCE_DIR}/.git show -s --format=%ct)
+      if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
+        set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git show -s --format=%ct)
        execute_process(
          COMMAND ${GIT} ${GIT_arg}
          OUTPUT_VARIABLE GIT_output