IGC interface cleanup

Change-Id: I4dc1a35cea636e00187c5f793a1539c4fdfac5f1

CMakeLists.txt

@@ -56,6 +56,8 @@ if(TR_DEPRECATED)
     add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
 endif(TR_DEPRECATED)
 
+add_definitions(-DIGC_CLEANUP)
+
 if(RELEASE_WITH_REGKEYS)
     message(STATUS "Enabling RegKey reading in release build")
     add_definitions(-D_RELEASE_BUILD_WITH_REGKEYS)

level_zero/cmake/l0_tests.cmake

@@ -129,7 +129,6 @@ if(WIN32)
             ${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_wddm.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_compilers_windows.cpp
     )
 
     target_link_libraries(compute_runtime_mockable_extra

opencl/test/unit_test/mocks/CMakeLists.txt

@@ -10,15 +10,7 @@ set(IGDRCL_SRCS_tests_compiler_mocks
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
 )
-if(WIN32)
-  list(APPEND IGDRCL_SRCS_tests_compiler_mocks
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers_windows.cpp
-  )
-else()
-  list(APPEND IGDRCL_SRCS_tests_compiler_mocks
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_compilers_linux.cpp
-  )
-endif()
+
 set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_compiler_mocks ${IGDRCL_SRCS_tests_compiler_mocks})
 
 set(IGDRCL_SRCS_tests_mocks

opencl/test/unit_test/mocks/mock_compilers.cpp

@@ -188,6 +188,8 @@ DEFINE_GET_SET(GTSystemInfo, 1, MaxSubSlicesSupported, uint32_t);
 DEFINE_GET_SET(GTSystemInfo, 1, IsL3HashModeEnabled, bool);
 DEFINE_GET_SET(GTSystemInfo, 1, IsDynamicallyPopulated, bool);
 
+DEFINE_GET_SET(GTSystemInfo, 3, DualSubSliceCount, uint32_t);
+
 #undef DEFINE_GET_SET
 
 // IgcFeaturesAndWorkarounds stubs

opencl/test/unit_test/mocks/mock_compilers_linux.cpp

@@ -1,6 +0,0 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */

opencl/test/unit_test/mocks/mock_compilers_windows.cpp

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
-#include "cif/macros/enable.h"
-#include "ocl_igc_interface/igc_ocl_device_ctx.h"
-
-namespace IGC {
-
-#define DEFINE_GET_SET(INTERFACE, VERSION, NAME, TYPE)                                      \
-    TYPE CIF_GET_INTERFACE_CLASS(INTERFACE, VERSION)::Get##NAME() const { return (TYPE)0; } \
-    void CIF_GET_INTERFACE_CLASS(INTERFACE, VERSION)::Set##NAME(TYPE v) {}
-
-DEFINE_GET_SET(GTSystemInfo, 2, DualSubSliceCount, uint32_t);
-
-#undef DEFINE_GET_SET
-} // namespace IGC

shared/offline_compiler/source/offline_compiler.cpp

@@ -29,6 +29,8 @@
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
+
+#undef IGC_CLEANUP
 #include "ocl_igc_interface/platform_helper.h"
 
 #include <algorithm>

shared/source/compiler_interface/compiler_interface.cpp

@@ -21,6 +21,8 @@
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
+
+#undef IGC_CLEANUP
 #include "ocl_igc_interface/platform_helper.h"
 
 #include <fstream>