Move gmm callbacks to shared

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/source/enable_gens.cmake

@@ -4,19 +4,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(RUNTIME_SRCS_GENX_CPP_WINDOWS
-    windows/gmm_callbacks
-)
-
-set(RUNTIME_SRCS_GENX_CPP_LINUX
-)
-
-if(NOT DISABLE_WDDM_LINUX)
-  list(APPEND RUNTIME_SRCS_GENX_CPP_LINUX
-       ${RUNTIME_SRCS_GENX_CPP_WINDOWS}
-  )
-endif()
-
 set(RUNTIME_SRCS_GENX_CPP_BASE
     aub_mem_dump
     buffer
@@ -59,12 +46,10 @@ macro(macro_for_each_gen)
       endif()
     endif()
 
-    foreach(OS_IT "BASE" "WINDOWS" "LINUX")
-      foreach(SRC_IT ${RUNTIME_SRCS_GENX_CPP_${OS_IT}})
-        if(EXISTS ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
-          list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
-        endif()
-      endforeach()
+    foreach(SRC_IT ${RUNTIME_SRCS_GENX_CPP_BASE})
+      if(EXISTS ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
+        list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
+      endif()
     endforeach()
 
     foreach(BRANCH ${BRANCH_DIR_LIST})

opencl/source/helpers/CMakeLists.txt

@@ -62,7 +62,6 @@ if(SUPPORT_XEHP_AND_LATER)
 endif()
 
 set(RUNTIME_SRCS_HELPERS_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks_tgllp_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/kmd_notify_properties_windows.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gl_helper.h
 )

shared/source/enable_gens.cmake

@@ -29,6 +29,7 @@ set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
 set(CORE_RUNTIME_SRCS_GENX_CPP_WINDOWS
     windows/command_stream_receiver
     windows/direct_submission
+    windows/gmm_callbacks
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_LINUX

…ce/gen11/windows/gmm_callbacks_gen11.cpp …ce/gen11/windows/gmm_callbacks_gen11.cppopencl/source/gen11/windows/gmm_callbacks_gen11.cpp renamed to shared/source/gen11/windows/gmm_callbacks_gen11.cpp opencl/source/gen11/windows/gmm_callbacks_gen11.cpp renamed to shared/source/gen11/windows/gmm_callbacks_gen11.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/gen12lp/hw_cmds.h"
-
-#include "opencl/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
+#include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
 
 namespace NEO {
 template struct DeviceCallbacks<TGLLPFamily>;

…en12lp/windows/gmm_callbacks_gen12lp.cpp …en12lp/windows/gmm_callbacks_gen12lp.cppopencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp renamed to shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp opencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp renamed to shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp

@@ -145,6 +145,7 @@ set(NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.h
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks_tgllp_and_later.inl
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS ${NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS})

…urce/gen8/windows/gmm_callbacks_gen8.cpp …urce/gen8/windows/gmm_callbacks_gen8.cppopencl/source/gen8/windows/gmm_callbacks_gen8.cpp renamed to shared/source/gen8/windows/gmm_callbacks_gen8.cpp opencl/source/gen8/windows/gmm_callbacks_gen8.cpp renamed to shared/source/gen8/windows/gmm_callbacks_gen8.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
-#include "opencl/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-
 namespace NEO {
 template struct DeviceCallbacks<XeHpFamily>;
 template struct TTCallbacks<XeHpFamily>;