Rename cmake variables

IGDRCL__* to NEO__* UMKM_SHAREDDATA_INCLUDE_PATHS to NEO__GMM_INCLUDE_DIR Change-Id: I565eedfbf572badd6bdbfaf9e09e62dbb2efb017 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-19 06:24:51 +08:00 · 2020-01-14 14:38:19 +01:00
parent d838ed8a24
commit d24735b38f
17 changed files with 106 additions and 107 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,26 +277,26 @@ if(NOT IGC__IGC_TARGETS)
            set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
            set(ENV{PKG_CONFIG_PATH} "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig")
        endif()
-        pkg_check_modules(IGDRCL__IGC igc-opencl)
+        pkg_check_modules(NEO__IGC igc-opencl)
        if(DEFINED __tmp_LIBDIR)
            set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
-            set(IGDRCL__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/")
+            set(NEO__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/")
        endif()

-        if(IGDRCL__IGC_FOUND)
+        if(NEO__IGC_FOUND)
            if(DEFINED IGC_DIR AND IS_DIRECTORY "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig/")
-                string(REPLACE "${IGDRCL__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" IGDRCL__IGC_INCLUDE_DIRS "${IGDRCL__IGC_INCLUDE_DIRS}")
+                string(REPLACE "${NEO__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" NEO__IGC_INCLUDE_DIRS "${NEO__IGC_INCLUDE_DIRS}")
            endif()

-            set(IGDRCL__IGC_INCLUDE_DIR ${IGDRCL__IGC_INCLUDE_DIRS})
-            message(STATUS "IGC include dirs: ${IGDRCL__IGC_INCLUDE_DIR}")
+            set(NEO__IGC_INCLUDE_DIR ${NEO__IGC_INCLUDE_DIRS})
+            message(STATUS "IGC include dirs: ${NEO__IGC_INCLUDE_DIR}")
        endif()
        if(DEFINED __tmp_LIBDIR)
            unset(__tmp_LIBDIR)
        endif()
    endif()

-    if(IGDRCL__IGC_FOUND)
+    if(NEO__IGC_FOUND)
        # do nothing
    elseif(EXISTS "${IGC_DIR}/CMakeLists.txt")
        message(STATUS "IGC source dir is: ${IGC_DIR}")
@@ -305,23 +305,23 @@ if(NOT IGC__IGC_TARGETS)
        set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF)
        add_subdirectory_unique("${IGC_DIR}" "${NEO_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)

-        set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
-        foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
-            list(APPEND IGDRCL__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
-            list(APPEND IGDRCL__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
+        set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
+        foreach(TARGET_tmp ${NEO__IGC_TARGETS})
+            list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
+            list(APPEND NEO__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
        endforeach(TARGET_tmp)
-        message(STATUS "IGC targets: ${IGDRCL__IGC_TARGETS}")
+        message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
    else()
        message(FATAL_ERROR "Intel Graphics Compiler not found!")
    endif()
 else()
-    set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
-    foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
-        list(APPEND IGDRCL__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
-        list(APPEND IGDRCL__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>)
+    set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
+    foreach(TARGET_tmp ${NEO__IGC_TARGETS})
+        list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
+        list(APPEND NEO__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>)
    endforeach(TARGET_tmp)
-    string(REPLACE ";" ":" IGDRCL__IGC_LIBRARY_PATH "${IGDRCL__IGC_LIBRARY_PATH}")
-    message(STATUS "IGC targets: ${IGDRCL__IGC_TARGETS}")
+    string(REPLACE ";" ":" NEO__IGC_LIBRARY_PATH "${NEO__IGC_LIBRARY_PATH}")
+    message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
 endif()

 # VISA headers - always relative to IGC
@@ -331,8 +331,8 @@ elseif(IS_DIRECTORY "${IGC_DIR}/visa")
    set(VISA_DIR "${IGC_DIR}/visa")
 elseif(IS_DIRECTORY "${IGC_DIR}/include/visa")
    set(VISA_DIR "${IGC_DIR}/include/visa")
-elseif(IS_DIRECTORY "${IGDRCL__IGC_INCLUDEDIR}/../visa")
-    get_filename_component(VISA_DIR "${IGDRCL__IGC_INCLUDEDIR}/../visa" ABSOLUTE)
+elseif(IS_DIRECTORY "${NEO__IGC_INCLUDEDIR}/../visa")
+    get_filename_component(VISA_DIR "${NEO__IGC_INCLUDEDIR}/../visa" ABSOLUTE)
 elseif(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../../visa")
    get_filename_component(VISA_DIR "${IGC_OCL_ADAPTOR_DIR}/../../visa" ABSOLUTE)
 endif()
@@ -375,8 +375,8 @@ endif()
 if(TARGET igfx_gmmumd_dll)
  set(GMM_TARGET_NAME "igfx_gmmumd_dll")
  set(GMM_LINK_NAME $<TARGET_PROPERTY:${GMM_TARGET_NAME},OUTPUT_NAME>)
-  set(IGDRCL__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
-  set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+  set(NEO__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
+  set(NEO__GMM_INCLUDE_DIR $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
 else()
  if(DEFINED GMM_DIR)
    get_filename_component(GMM_DIR "${GMM_DIR}" ABSOLUTE)
@@ -401,24 +401,23 @@ else()
      set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
      set(ENV{PKG_CONFIG_PATH} "${GMM_DIR}/${__tmp_LIBDIR}/pkgconfig/")
    endif()
-    pkg_check_modules(IGDRCL__GMM igdgmm)
+    pkg_check_modules(NEO__GMM igdgmm)
    if(DEFINED __tmp_LIBDIR)
      set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
    endif()

-    if(IGDRCL__GMM_FOUND)
+    if(NEO__GMM_FOUND)
      if(DEFINED __tmp_LIBDIR)
-        string(REPLACE "${IGDRCL__GMM_INCLUDEDIR}" "${GMM_DIR}/include/igdgmm" IGDRCL__GMM_INCLUDE_DIRS "${IGDRCL__GMM_INCLUDE_DIRS}")
-        string(REPLACE "${IGDRCL__GMM_LIBDIR}" "${GMM_DIR}/${__tmp_LIBDIR}" IGDRCL__GMM_LIBDIR "${IGDRCL__GMM_LIBDIR}")
-        set(IGDRCL__GMM_LIBRARY_PATH "${IGDRCL__GMM_LIBDIR}")
+        string(REPLACE "${NEO__GMM_INCLUDEDIR}" "${GMM_DIR}/include/igdgmm" NEO__GMM_INCLUDE_DIRS "${NEO__GMM_INCLUDE_DIRS}")
+        string(REPLACE "${NEO__GMM_LIBDIR}" "${GMM_DIR}/${__tmp_LIBDIR}" NEO__GMM_LIBDIR "${NEO__GMM_LIBDIR}")
+        set(NEO__GMM_LIBRARY_PATH "${NEO__GMM_LIBDIR}")
      endif()

      set(GMM_TARGET_NAME "igfx_gmmumd_dll")
-      set(GMM_LINK_NAME ${IGDRCL__GMM_LIBRARIES})
+      set(GMM_LINK_NAME ${NEO__GMM_LIBRARIES})

-      set(IGDRCL__GMM_INCLUDE_DIR ${IGDRCL__GMM_INCLUDE_DIRS})
-      set(UMKM_SHAREDDATA_INCLUDE_PATHS "${IGDRCL__GMM_INCLUDE_DIR}")
-      message(STATUS "GmmLib include dirs: ${IGDRCL__GMM_INCLUDE_DIR}")
+      set(NEO__GMM_INCLUDE_DIR ${NEO__GMM_INCLUDE_DIRS})
+      message(STATUS "GmmLib include dirs: ${NEO__GMM_INCLUDE_DIR}")
    else()
      message(FATAL_ERROR "GmmLib not found!")
    endif()
@@ -434,8 +433,8 @@ else()
        set(GMM_TARGET_NAME "igfx_gmmumd_dll")
      endif()

-      set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
-      set(IGDRCL__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
+      set(NEO__GMM_INCLUDE_DIR $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+      set(NEO__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
      set(GMM_LINK_NAME $<TARGET_PROPERTY:${GMM_TARGET_NAME},OUTPUT_NAME>)
    else()
      message(FATAL_ERROR "GmmLib not found!")
@@ -454,7 +453,7 @@ macro(copy_gmm_dll_for target)
  endif()
 endmacro()

-link_directories(${IGDRCL__GMM_LIBRARY_PATH})
+link_directories(${NEO__GMM_LIBRARY_PATH})

 # Instrumentation detection
 if(NOT DEFINED INSTRUMENTATION_LIB_NAME)
@@ -487,9 +486,9 @@ endif()
 if(NOT DISABLE_LIBVA)
    # LibVA detection
    if(UNIX)
-      set(IGDRCL__LIBVA_IS_REQUIRED "")
+      set(NEO__LIBVA_IS_REQUIRED "")
      if(IGDRCL_FORCE_USE_LIBVA)
-        set(IGDRCL__LIBVA_IS_REQUIRED "REQUIRED")
+        set(NEO__LIBVA_IS_REQUIRED "REQUIRED")
      endif()

      if(DEFINED LIBVA_SOURCE_DIR)
@@ -506,29 +505,29 @@ if(NOT DISABLE_LIBVA)
        set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
        set(ENV{PKG_CONFIG_PATH} "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
      endif()
-      pkg_check_modules(IGDRCL__LIBVA ${IGDRCL__LIBVA_IS_REQUIRED} libva>=1.0.0)
+      pkg_check_modules(NEO__LIBVA ${NEO__LIBVA_IS_REQUIRED} libva>=1.0.0)
      include(CheckLibraryExists)
      if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
        set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
      endif()

-      if(IGDRCL__LIBVA_FOUND)
-        CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${IGDRCL__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)
+      if(NEO__LIBVA_FOUND)
+        CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${NEO__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)

        add_definitions(-DLIBVA)
        message(STATUS "Using libva ")

        if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
-          string(REPLACE "${IGDRCL__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" IGDRCL__LIBVA_INCLUDE_DIRS "${IGDRCL__LIBVA_INCLUDE_DIRS}")
-          string(REPLACE "${IGDRCL__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" IGDRCL__LIBVA_LIBDIR "${IGDRCL__LIBVA_LIBDIR}")
-          set(IGDRCL__LIBVA_LIBRARY_PATH "${IGDRCL__LIBVA_LIBDIR}")
+          string(REPLACE "${NEO__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" NEO__LIBVA_INCLUDE_DIRS "${NEO__LIBVA_INCLUDE_DIRS}")
+          string(REPLACE "${NEO__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" NEO__LIBVA_LIBDIR "${NEO__LIBVA_LIBDIR}")
+          set(NEO__LIBVA_LIBRARY_PATH "${NEO__LIBVA_LIBDIR}")
        endif()

-        list(LENGTH IGDRCL__LIBVA_INCLUDE_DIRS __len)
+        list(LENGTH NEO__LIBVA_INCLUDE_DIRS __len)
        if(__len GREATER 0)
-          set(IGDRCL__LIBVA_INCLUDE_DIR ${IGDRCL__LIBVA_INCLUDE_DIRS})
-          include_directories("${IGDRCL__LIBVA_INCLUDE_DIR}")
-          message(STATUS "LibVA include dirs: ${IGDRCL__LIBVA_INCLUDE_DIR}")
+          set(NEO__LIBVA_INCLUDE_DIR ${NEO__LIBVA_INCLUDE_DIRS})
+          include_directories("${NEO__LIBVA_INCLUDE_DIR}")
+          message(STATUS "LibVA include dirs: ${NEO__LIBVA_INCLUDE_DIR}")
        endif()
      endif()
    endif()
@@ -793,13 +792,13 @@ include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH


 if(HAVE_INSTRUMENTATION)
-  set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
+  set(NEO__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
  message(STATUS "Instrumentation include dirs: ${INSTRUMENTATION_INCLUDE_PATHS}")
  include_directories(${INSTRUMENTATION_INCLUDE_PATHS})
 else()
-  set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX "/")
+  set(NEO__INSTRUMENTATION_DIR_SUFFIX "/")
 endif()
-include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${NEO__INSTRUMENTATION_DIR_SUFFIX})

 # Define where to put binaries
 set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
@@ -877,7 +876,7 @@ if(EXISTS ${NEO_SOURCE_DIR}/scripts/format)
 endif()

 configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
-if(WIN32 AND NOT IGDRCL__IGC_FOUND)
+if(WIN32 AND NOT NEO__IGC_FOUND)
    configure_file(igc.opencl.h.in ${NEO_BUILD_DIR}/igc.opencl.h)
 endif()
 configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
--- a/offline_compiler/CMakeLists.txt
+++ b/offline_compiler/CMakeLists.txt
@@ -106,9 +106,9 @@ set(CLOC_INCLUDES
  ${ENGINE_NODE_DIR}
  ${IGC_OCL_ADAPTOR_DIR}
  ${CIF_BASE_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+  ${NEO__GMM_INCLUDE_DIR}
  ${KHRONOS_HEADERS_DIR}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
 )

 target_include_directories(ocloc BEFORE PRIVATE ${CLOC_INCLUDES})
@@ -116,7 +116,7 @@ target_include_directories(ocloc BEFORE PRIVATE ${IGA_INCLUDE_DIR})

 target_compile_definitions(ocloc PUBLIC ${CLOC_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_GEN_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM} 
                                        IGA_LIBRARY_NAME=${CMAKE_SHARED_LIBRARY_PREFIX}${IGA_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-target_compile_definitions(ocloc PRIVATE ${IGDRCL__IGC_COMPILE_DEFINITIONS})
+target_compile_definitions(ocloc PRIVATE ${NEO__IGC_COMPILE_DEFINITIONS})

 if(MSVC)
  target_link_libraries(ocloc dbghelp)
@@ -130,11 +130,11 @@ target_link_libraries(ocloc elflib)

 set_target_properties(ocloc PROPERTIES FOLDER "offline_compiler")

-add_custom_target(copy_compiler_files DEPENDS ${IGDRCL__IGC_TARGETS})
+add_custom_target(copy_compiler_files DEPENDS ${NEO__IGC_TARGETS})
 set_target_properties(copy_compiler_files PROPERTIES FOLDER "opencl runtime")

 if(WIN32)
-  foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
+  foreach(TARGET_tmp ${NEO__IGC_TARGETS})
    add_custom_command(
      TARGET copy_compiler_files
      PRE_BUILD
--- a/package.cmake
+++ b/package.cmake
@@ -107,19 +107,19 @@ if(UNIX)
    endif()
  endif()

-  if(IGDRCL__GMM_FOUND)
-    list(APPEND _external_package_dependencies_debian "intel-gmmlib(=${IGDRCL__GMM_VERSION})")
-    list(APPEND _external_package_dependencies_rpm "intel-gmmlib = ${IGDRCL__GMM_VERSION}")
+  if(NEO__GMM_FOUND)
+    list(APPEND _external_package_dependencies_debian "intel-gmmlib(=${NEO__GMM_VERSION})")
+    list(APPEND _external_package_dependencies_rpm "intel-gmmlib = ${NEO__GMM_VERSION}")
  else()
    list(APPEND _external_package_dependencies_debian "intel-gmmlib")
    list(APPEND _external_package_dependencies_rpm "intel-gmmlib")
  endif()

-  if(IGDRCL__IGC_FOUND)
-    list(APPEND _external_package_dependencies_debian "intel-igc-opencl(=${IGDRCL__IGC_VERSION})")
-    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl = ${IGDRCL__IGC_VERSION}")
-    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl(=${IGDRCL__IGC_VERSION})")
-    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl = ${IGDRCL__IGC_VERSION}")
+  if(NEO__IGC_FOUND)
+    list(APPEND _external_package_dependencies_debian "intel-igc-opencl(=${NEO__IGC_VERSION})")
+    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl = ${NEO__IGC_VERSION}")
+    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl(=${NEO__IGC_VERSION})")
+    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl = ${NEO__IGC_VERSION}")
  else()
    list(APPEND _external_package_dependencies_debian "intel-igc-opencl")
    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl")
@@ -133,11 +133,11 @@ if(UNIX)
  string(REPLACE ";" ", " CPACK_RPM_OCLOC_PACKAGE_REQUIRES "${_igc_package_dependencies_rpm}")

  set(CPACK_PROPERTIES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/package_config.cmake")
-  set(CPACK_LD_LIBRARY_PATH "${IGDRCL__GMM_LIBRARY_PATH}")
+  set(CPACK_LD_LIBRARY_PATH "${NEO__GMM_LIBRARY_PATH}")
  include(CPack)

  get_directory_property(__HAS_PARENT PARENT_DIRECTORY)
  if(__HAS_PARENT)
-    set(IGDRCL__COMPONENT_NAME "opencl" PARENT_SCOPE)
+    set(NEO__COMPONENT_NAME "opencl" PARENT_SCOPE)
  endif()
 endif(UNIX)
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
 )

 add_subdirectories()
-add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
+add_subdirectory(instrumentation${NEO__INSTRUMENTATION_DIR_SUFFIX})
 include(enable_gens.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/core_files.cmake)

@@ -66,15 +66,15 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
  ${GMM_INCLUDE_PATHS}
  ${IGC_OCL_ADAPTOR_DIR}
  ${VISA_INCLUDE_DIR}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+  ${NEO__GMM_INCLUDE_DIR}
  ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
 )

 target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC
  ""
-  ${IGDRCL__IGC_COMPILE_DEFINITIONS}
+  ${NEO__IGC_COMPILE_DEFINITIONS}
 )

 if(WIN32)
--- a/runtime/built_ins/builtins_binary.cmake
+++ b/runtime/built_ins/builtins_binary.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -65,7 +65,7 @@ target_include_directories(${BUILTINS_BINARIES_LIB_NAME} PRIVATE
  ${ENGINE_NODE_DIR}
  ${KHRONOS_HEADERS_DIR}
  ${KHRONOS_GL_HEADERS_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__GMM_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
 )
--- a/runtime/built_ins/kernels/CMakeLists.txt
+++ b/runtime/built_ins/kernels/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -63,8 +63,8 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
  if(WIN32)
    set(cloc_cmd_prefix ocloc)
  else()
-    if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
+    if(DEFINED NEO__IGC_LIBRARY_PATH)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
    else()
      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
    endif()
--- a/runtime/built_ins/registry/CMakeLists.txt
+++ b/runtime/built_ins/registry/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -18,7 +18,7 @@ target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE
  ${ENGINE_NODE_DIR}
  ${KHRONOS_HEADERS_DIR}
  ${KHRONOS_GL_HEADERS_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__GMM_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
 )
--- a/runtime/builtin_kernels_simulation/CMakeLists.txt
+++ b/runtime/builtin_kernels_simulation/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -47,10 +47,10 @@ apply_macro_for_each_gen("SUPPORTED")
 add_library(${BIKSIM_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${BUILTIN_KERNELS_SIMULATION_SRCS})
 target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
  ${ENGINE_NODE_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+  ${NEO__GMM_INCLUDE_DIR}
  ${KHRONOS_HEADERS_DIR}
  ${KHRONOS_GL_HEADERS_DIR}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
 )
 set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "built_ins")
--- a/runtime/scheduler/scheduler_binary.cmake
+++ b/runtime/scheduler/scheduler_binary.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,8 +9,8 @@ set(SCHEDULER_OUTDIR_WITH_ARCH "${TargetDir}/scheduler/${NEO_ARCH}")
 set_target_properties(scheduler PROPERTIES FOLDER "scheduler")

 set (SCHEDULER_KERNEL scheduler.cl)
-if(DEFINED IGDRCL__IGC_INCLUDE_DIR)
-  list(APPEND __cloc__options__ "-I$<JOIN:${IGDRCL__IGC_INCLUDE_DIR}, -I>")
+if(DEFINED NEO__IGC_INCLUDE_DIR)
+  list(APPEND __cloc__options__ "-I$<JOIN:${NEO__IGC_INCLUDE_DIR}, -I>")
 endif()

 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
@@ -34,8 +34,8 @@ function(compile_kernel target gen_type platform_type kernel)
  if(WIN32)
    set(cloc_cmd_prefix ocloc)
  else()
-    if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
+    if(DEFINED NEO__IGC_LIBRARY_PATH)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
    else()
      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
    endif()
@@ -91,7 +91,7 @@ add_dependencies(${SCHEDULER_BINARY_LIB_NAME} scheduler)
 target_include_directories(${SCHEDULER_BINARY_LIB_NAME} PRIVATE
  ${ENGINE_NODE_DIR}
  ${KHRONOS_HEADERS_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__GMM_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
 )
--- a/runtime/sharings/CMakeLists.txt
+++ b/runtime/sharings/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -12,8 +12,8 @@ set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER "opencl run
 target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE
  ${KHRONOS_HEADERS_DIR}
  ${KHRONOS_GL_HEADERS_DIR}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${IGDRCL__IGC_INCLUDE_DIR}
+  ${NEO__GMM_INCLUDE_DIR}
+  ${NEO__IGC_INCLUDE_DIR}
  ${THIRD_PARTY_DIR}
 )

--- a/runtime/sharings/va/CMakeLists.txt
+++ b/runtime/sharings/va/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -18,6 +18,6 @@ set(RUNTIME_SRCS_SHARINGS_VA
 )
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS_VA ${RUNTIME_SRCS_SHARINGS_VA})

-if(IGDRCL__LIBVA_FOUND)
+if(NEO__LIBVA_FOUND)
  target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS_VA})
-endif(IGDRCL__LIBVA_FOUND)
+endif(NEO__LIBVA_FOUND)
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -205,8 +205,8 @@ target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_SOURCE_DIR}/core/un
 if(WIN32)
  set(cloc_cmd_prefix ocloc)
 else()
-  if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-    set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
+  if(DEFINED NEO__IGC_LIBRARY_PATH)
+    set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
  else()
    set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
  endif()
--- a/unit_tests/aub_tests/common.cmake
+++ b/unit_tests/aub_tests/common.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -16,10 +16,10 @@ function(neo_run_aub_target gen gen_name product slices subslices eu_per_ss opti
        COMMAND ${CMAKE_COMMAND} -E make_directory ${TargetDir}/${gen}_aub/cl_cache
    )

-    if(WIN32 OR NOT DEFINED IGDRCL__GMM_LIBRARY_PATH)
+    if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH)
        set(aub_cmd_prefix $<TARGET_FILE:igdrcl_aub_tests>)
    else()
-        set(aub_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__GMM_LIBRARY_PATH} IGDRCL_TEST_SELF_EXEC=off $<TARGET_FILE:igdrcl_aub_tests>)
+        set(aub_cmd_prefix LD_LIBRARY_PATH=${NEO__GMM_LIBRARY_PATH} IGDRCL_TEST_SELF_EXEC=off $<TARGET_FILE:igdrcl_aub_tests>)
    endif()

    add_custom_command(
--- a/unit_tests/linux/CMakeLists.txt
+++ b/unit_tests/linux/CMakeLists.txt
@@ -32,9 +32,9 @@ set(IGDRCL_SRCS_linux_dll_tests
  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )

-if(IGDRCL__LIBVA_FOUND)
+if(NEO__LIBVA_FOUND)
  list(APPEND IGDRCL_SRCS_linux_dll_tests ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)
-endif(IGDRCL__LIBVA_FOUND)
+endif(NEO__LIBVA_FOUND)

 macro(macro_for_each_platform)
  list(APPEND IGDRCL_SRCS_linux_dll_tests ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
--- a/unit_tests/mock_gdi/CMakeLists.txt
+++ b/unit_tests/mock_gdi/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -25,7 +25,7 @@ if(WIN32)

  target_include_directories(mock_gdi PRIVATE
    ${WDK_INCLUDE_PATHS}
-    ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+    ${NEO__GMM_INCLUDE_DIR}
  )

  set_target_properties(
--- a/unit_tests/mock_gmm/CMakeLists.txt
+++ b/unit_tests/mock_gmm/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(${target_name} EXCLUDE_FROM_ALL OBJECT ${IGDRCL_SRCS_tests_mock_gmm}

 target_include_directories(${target_name} PRIVATE
  ${WDK_INCLUDE_PATHS}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+  ${NEO__GMM_INCLUDE_DIR}
 )

 create_project_source_tree(${target_name})
--- a/unit_tests/sharings/va/CMakeLists.txt
+++ b/unit_tests/sharings/va/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -19,7 +19,7 @@ set(IGDRCL_SRCS_tests_sharings_va
 )
 set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_sharings_va ${IGDRCL_SRCS_tests_sharings_va})

-if(IGDRCL__LIBVA_FOUND)
+if(NEO__LIBVA_FOUND)
  list(APPEND IGDRCL_SRCS_tests_sharings_va ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_enable_tests.cpp)
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sharings_va})
-endif(IGDRCL__LIBVA_FOUND)
+endif(NEO__LIBVA_FOUND)