Remove support for static gmmlib

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

https://github.com/intel/compute-runtime/pull/91

Change-Id: I90184d7aabf3dd0d8a74ff40115213241b4ca724

CMakeLists.txt

@@ -240,8 +240,8 @@ endif()
 
 # GmmLib detection
 if(NOT GMMUMD_LIB_NAME)
-  if(TARGET gmm_umd)
+  if(TARGET igfx_gmmumd_dll)
-    set(GMMUMD_LIB_NAME "gmm_umd")
+    set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
   else()
     if(DEFINED GMM_SOURCE_DIR)
       get_filename_component(GMM_SOURCE_DIR "${GMM_SOURCE_DIR}" ABSOLUTE)
@@ -269,7 +269,6 @@ if(NOT GMMUMD_LIB_NAME)
           set(IGDRCL__GMM_LIBRARY_PATH "${IGDRCL__GMM_LIBDIR}")
         endif()
 
-        set(USE_STATIC_GMM FALSE)
         set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
 
         set(IGDRCL__GMM_INCLUDE_DIR ${IGDRCL__GMM_INCLUDE_DIRS})
@@ -288,29 +287,19 @@ if(NOT GMMUMD_LIB_NAME)
         set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
       endif()
 
-      get_target_property(target_type ${GMMUMD_LIB_NAME} TYPE)
-
-      if(target_type STREQUAL "STATIC_LIBRARY")
-        set(USE_STATIC_GMM TRUE)
-      endif()
       set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMMUMD_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
     else()
       message(FATAL_ERROR "GmmLib not found!")
     endif()
   endif()
 else()
-  get_target_property(target_type ${GMMUMD_LIB_NAME} TYPE)
-
-  if(target_type STREQUAL "STATIC_LIBRARY")
-    set(USE_STATIC_GMM TRUE)
-  endif()
   set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMMUMD_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
 set(GMM_LIBRARY_NAME "igdgmm${NEO_BITS}")
 
 macro(copy_gmm_dll_for target)
-  if(NOT USE_STATIC_GMM AND NOT IGDRCL__GMM_FOUND)
+  if(NOT IGDRCL__GMM_FOUND)
     add_dependencies(${target} ${GMMUMD_LIB_NAME})
     add_custom_command(
       TARGET ${target}

runtime/CMakeLists.txt

@@ -82,15 +82,7 @@ else()
   )
 endif()
 
-target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})
+target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC GMM_LIB_DLL DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})
-
-link_directories(${GMM_LIB_PATHS})
-
-if(USE_STATIC_GMM)
-  target_link_libraries(${NEO_STATIC_LIB_NAME} ${GMMUMD_LIB_NAME})
-else()
-  target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC GMM_LIB_DLL)
-endif()
 
 if(INSTRUMENTATION_LIB_NAME)
   add_dependencies(${NEO_STATIC_LIB_NAME} ${INSTRUMENTATION_LIB_NAME})

runtime/gmm_helper/CMakeLists.txt

@@ -4,12 +4,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(UNIX AND USE_STATIC_GMM)
-  set(GMM_INTERFACE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_static.cpp)
-else()
-  set(GMM_INTERFACE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_dynamic.cpp)
-endif()
-
 set(RUNTIME_SRCS_GMM_HELPER_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm.cpp
@@ -18,9 +12,9 @@ set(RUNTIME_SRCS_GMM_HELPER_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context_base.h
   ${CMAKE_CURRENT_SOURCE_DIR}/client_context${BRANCH_DIR_SUFFIX}/gmm_client_context.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/client_context${BRANCH_DIR_SUFFIX}/gmm_client_context.h
-  ${GMM_INTERFACE_FILE}
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
   ${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/resource_info_impl.cpp

runtime/gmm_helper/gmm_interface_static.cpp

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "runtime/gmm_helper/gmm_helper.h"
-
-namespace OCLRT {
-GMM_STATUS GMM_STDCALL myPfnCreateSingletonContext(const PLATFORM platform, const void *pSkuTable, const void *pWaTable, const void *pGtSysInfo) {
-    return GmmInitGlobalContext(platform, reinterpret_cast<const SKU_FEATURE_TABLE *>(pSkuTable), reinterpret_cast<const WA_TABLE *>(pWaTable), reinterpret_cast<const GT_SYSTEM_INFO *>(pGtSysInfo), GMM_CLIENT::GMM_OCL_VISTA);
-}
-
-void GmmHelper::loadLib() {
-    gmmEntries.pfnCreateSingletonContext = myPfnCreateSingletonContext;
-    gmmEntries.pfnDestroySingletonContext = GmmDestroyGlobalContext;
-    gmmEntries.pfnCreateClientContext = GmmCreateClientContext;
-    gmmEntries.pfnDeleteClientContext = GmmDeleteClientContext;
-}
-} // namespace OCLRT

unit_tests/gmm_helper/CMakeLists.txt

@@ -7,9 +7,7 @@
 set(IGDRCL_SRCS_tests_gmm_helper
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_tests.cpp
 )
-if(NOT USE_STATIC_GMM)
-  list(APPEND IGDRCL_SRCS_tests_gmm_helper ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_tests.cpp)
-endif()
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gmm_helper})
 add_subdirectories()

unit_tests/mock_gmm/CMakeLists.txt

@@ -4,35 +4,32 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(NOT USE_STATIC_GMM)
+set(target_name mock_gmm)
-  set(target_name mock_gmm)
+project(${target_name})
-  project(${target_name})
 
-  # Setting up our local list of test files
+# Setting up our local list of test files
-  set(IGDRCL_SRCS_tests_mock_gmm
+set(IGDRCL_SRCS_tests_mock_gmm
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.def
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.def
-  )
+)
-  add_library(${target_name} EXCLUDE_FROM_ALL SHARED ${IGDRCL_SRCS_tests_mock_gmm})
+add_library(${target_name} EXCLUDE_FROM_ALL SHARED ${IGDRCL_SRCS_tests_mock_gmm})
 
-  target_include_directories(${target_name} PRIVATE
+target_include_directories(${target_name} PRIVATE
-    ${WDK_INCLUDE_PATHS}
+  ${WDK_INCLUDE_PATHS}
-    ${UMKM_SHAREDDATA_INCLUDE_PATHS}
+  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  )
+)
 
-  set_target_properties(
+set_target_properties(
-    ${target_name}
+  ${target_name}
-    PROPERTIES DEBUG_OUTPUT_NAME ${target_name}
+  PROPERTIES DEBUG_OUTPUT_NAME ${target_name}
-    RELEASE_OUTPUT_NAME ${target_name}
+  RELEASE_OUTPUT_NAME ${target_name}
-    RELEASEINTERNAL_OUTPUT_NAME ${target_name}
+  RELEASEINTERNAL_OUTPUT_NAME ${target_name}
-    OUTPUT_NAME ${target_name}
+  OUTPUT_NAME ${target_name}
-  )
+)
+
+create_project_source_tree(${target_name})
+set_target_properties(${target_name} PROPERTIES FOLDER "test mocks")
+target_compile_definitions(${target_name} PUBLIC)
+add_dependencies(unit_tests ${target_name})
 
-  create_project_source_tree(${target_name})
-  set_target_properties(${target_name} PROPERTIES FOLDER "test mocks")
-  target_compile_definitions(${target_name} PUBLIC)
-  if(NOT USE_STATIC_GMM)
-    add_dependencies(unit_tests ${target_name})
-  endif()
-endif()

unit_tests/mt_tests/CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 
 add_custom_target(run_mt_unit_tests)
 
-add_dependencies(igdrcl_mt_tests test_dynamic_lib)
+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)
 
@@ -58,10 +58,6 @@ endif()
 
 set_target_properties(run_mt_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 
-if(NOT USE_STATIC_GMM)
-  add_dependencies(igdrcl_mt_tests mock_gmm)
-endif()
-
 function(run_mt_tests target slices subslices eu_per_ss)
   add_custom_target(run_${target}_mt_unit_tests DEPENDS igdrcl_mt_tests)
   if(NOT WIN32)