GmmClientContext cleanup

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>

CMakeLists.txt

@@ -934,7 +934,6 @@ include_directories(${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options$
 include_directories(${NEO_SHARED_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/gen_common${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
 if(WIN32)
   include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
 else()

level_zero/core/test/unit_tests/main.cpp

@@ -263,7 +263,7 @@ int main(int argc, char **argv) {
 #endif
 
     if (useMockGmm) {
-        NEO::GmmHelper::createGmmContextWrapperFunc = NEO::GmmClientContextBase::create<MockGmmClientContext>;
+        NEO::GmmHelper::createGmmContextWrapperFunc = NEO::GmmClientContext::create<MockGmmClientContext>;
     } else {
         NEO::GmmInterface::initialize(nullptr, nullptr);
     }

opencl/source/platform/platform.cpp

@@ -31,7 +31,6 @@
 #include "opencl/source/sharings/sharing_factory.h"
 
 #include "CL/cl_ext.h"
-#include "gmm_client_context.h"
 
 #include <algorithm>
 #include <map>

opencl/source/xe_hp_core/image_xe_hp_core.cpp

@@ -6,13 +6,12 @@
  */
 
 #include "shared/source/device/device.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "opencl/source/context/context.h"
 #include "opencl/source/mem_obj/image.inl"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 using Family = XeHpFamily;

opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/image/image_surface_state.h"
 #include "shared/source/memory_manager/memory_manager.h"
@@ -18,8 +19,6 @@
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "test.h"
 
-#include "mock_gmm_client_context.h"
-
 #include <functional>
 
 using namespace NEO;

opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_info.h"
@@ -26,7 +27,6 @@
 
 #include "GL/gl.h"
 #include "GL/glext.h"
-#include "gmm_client_context.h"
 #include "gtest/gtest.h"
 #include "igfxfmid.h"
 

opencl/test/unit_test/main.cpp

@@ -476,7 +476,7 @@ int main(int argc, char **argv) {
     }
 #endif
     if (useMockGmm) {
-        GmmHelper::createGmmContextWrapperFunc = GmmClientContextBase::create<MockGmmClientContext>;
+        GmmHelper::createGmmContextWrapperFunc = GmmClientContext::create<MockGmmClientContext>;
     } else {
         GmmInterface::initialize(nullptr, nullptr);
     }

shared/source/command_container/command_encoder_xehp_plus.inl

@@ -14,6 +14,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/constants.h"
@@ -24,7 +25,6 @@
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 
-#include "gmm_client_context.h"
 #include "pipe_control_args.h"
 
 #include <algorithm>

shared/source/command_container/image_surface_state/compression_params_xehp_plus.inl

@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/resource_info.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 template <typename Family>

shared/source/gmm_helper/CMakeLists.txt

@@ -6,10 +6,8 @@
 
 set(NEO_CORE_GMM_HELPER
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context_base.cpp
-    ${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
+    ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp

shared/source/gmm_helper/client_context/gmm_client_context.cpp

@@ -1,12 +1,78 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "gmm_client_context.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
+
+#include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_interface.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/os_interface.h"
+#include "shared/source/sku_info/operations/sku_info_transfer.h"
 
 namespace NEO {
-GmmClientContext::GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo) : GmmClientContextBase(osInterface, hwInfo){};
+GmmClientContext::GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo) : hardwareInfo(hwInfo) {
+    _SKU_FEATURE_TABLE gmmFtrTable = {};
+    _WA_TABLE gmmWaTable = {};
+    SkuInfoTransfer::transferFtrTableForGmm(&gmmFtrTable, &hwInfo->featureTable);
+    SkuInfoTransfer::transferWaTableForGmm(&gmmWaTable, &hwInfo->workaroundTable);
+
+    GMM_INIT_IN_ARGS inArgs{};
+    GMM_INIT_OUT_ARGS outArgs{};
+
+    inArgs.ClientType = GMM_CLIENT::GMM_OCL_VISTA;
+    inArgs.pGtSysInfo = &hwInfo->gtSystemInfo;
+    inArgs.pSkuTable = &gmmFtrTable;
+    inArgs.pWaTable = &gmmWaTable;
+    inArgs.Platform = hwInfo->platform;
+
+    if (osInterface && osInterface->getDriverModel()) {
+        osInterface->getDriverModel()->setGmmInputArgs(&inArgs);
+    }
+
+    auto ret = GmmInterface::initialize(&inArgs, &outArgs);
+
+    UNRECOVERABLE_IF(ret != GMM_SUCCESS);
+
+    clientContext = outArgs.pGmmClientContext;
+}
+GmmClientContext::~GmmClientContext() {
+    GMM_INIT_OUT_ARGS outArgs;
+    outArgs.pGmmClientContext = clientContext;
+
+    GmmInterface::destroy(&outArgs);
+};
+
+MEMORY_OBJECT_CONTROL_STATE GmmClientContext::cachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE usage) {
+    return clientContext->CachePolicyGetMemoryObject(pResInfo, usage);
+}
+
+GMM_RESOURCE_INFO *GmmClientContext::createResInfoObject(GMM_RESCREATE_PARAMS *pCreateParams) {
+    return clientContext->CreateResInfoObject(pCreateParams);
+}
+
+GMM_RESOURCE_INFO *GmmClientContext::copyResInfoObject(GMM_RESOURCE_INFO *pSrcRes) {
+    return clientContext->CopyResInfoObject(pSrcRes);
+}
+
+void GmmClientContext::destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo) {
+    clientContext->DestroyResInfoObject(pResInfo);
+}
+
+GMM_CLIENT_CONTEXT *GmmClientContext::getHandle() const {
+    return clientContext;
+}
+
+uint8_t GmmClientContext::getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) {
+    return clientContext->GetSurfaceStateCompressionFormat(format);
+}
+
+uint8_t GmmClientContext::getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) {
+    return clientContext->GetMediaSurfaceStateCompressionFormat(format);
+}
+
 } // namespace NEO

shared/source/gmm_helper/client_context/gmm_client_context.h

@@ -1,16 +1,54 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/gmm_helper/client_context/gmm_client_context_base.h"
+#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
+
+#include <memory>
 
 namespace NEO {
-class GmmClientContext : public GmmClientContextBase {
+class GmmClientContext;
+class OSInterface;
+struct HardwareInfo;
+
+class GmmClientContext {
   public:
     GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo);
+    MOCKABLE_VIRTUAL ~GmmClientContext();
+
+    MOCKABLE_VIRTUAL MEMORY_OBJECT_CONTROL_STATE cachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE usage);
+    MOCKABLE_VIRTUAL GMM_RESOURCE_INFO *createResInfoObject(GMM_RESCREATE_PARAMS *pCreateParams);
+    MOCKABLE_VIRTUAL GMM_RESOURCE_INFO *copyResInfoObject(GMM_RESOURCE_INFO *pSrcRes);
+    MOCKABLE_VIRTUAL void destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo);
+    GMM_CLIENT_CONTEXT *getHandle() const;
+    template <typename T>
+    static std::unique_ptr<GmmClientContext> create(OSInterface *osInterface, HardwareInfo *hwInfo) {
+        return std::make_unique<T>(osInterface, hwInfo);
+    }
+
+    const HardwareInfo *getHardwareInfo() {
+        return hardwareInfo;
+    }
+
+    MOCKABLE_VIRTUAL uint8_t getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format);
+    MOCKABLE_VIRTUAL uint8_t getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format);
+
+    void setHandleAllocator(std::unique_ptr<GmmHandleAllocator> allocator) {
+        this->handleAllocator = std::move(allocator);
+    }
+
+    GmmHandleAllocator *getHandleAllocator() {
+        return handleAllocator.get();
+    }
+
+  protected:
+    HardwareInfo *hardwareInfo = nullptr;
+    GMM_CLIENT_CONTEXT *clientContext;
+    std::unique_ptr<GmmHandleAllocator> handleAllocator;
 };
 } // namespace NEO

shared/source/gmm_helper/client_context/gmm_client_context_base.cpp

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/gmm_helper/client_context/gmm_client_context_base.h"
-
-#include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/gmm_helper/gmm_interface.h"
-#include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_interface.h"
-#include "shared/source/sku_info/operations/sku_info_transfer.h"
-
-namespace NEO {
-GmmClientContextBase::GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo) : hardwareInfo(hwInfo) {
-    _SKU_FEATURE_TABLE gmmFtrTable = {};
-    _WA_TABLE gmmWaTable = {};
-    SkuInfoTransfer::transferFtrTableForGmm(&gmmFtrTable, &hwInfo->featureTable);
-    SkuInfoTransfer::transferWaTableForGmm(&gmmWaTable, &hwInfo->workaroundTable);
-
-    GMM_INIT_IN_ARGS inArgs{};
-    GMM_INIT_OUT_ARGS outArgs{};
-
-    inArgs.ClientType = GMM_CLIENT::GMM_OCL_VISTA;
-    inArgs.pGtSysInfo = &hwInfo->gtSystemInfo;
-    inArgs.pSkuTable = &gmmFtrTable;
-    inArgs.pWaTable = &gmmWaTable;
-    inArgs.Platform = hwInfo->platform;
-
-    if (osInterface && osInterface->getDriverModel()) {
-        osInterface->getDriverModel()->setGmmInputArgs(&inArgs);
-    }
-
-    auto ret = GmmInterface::initialize(&inArgs, &outArgs);
-
-    UNRECOVERABLE_IF(ret != GMM_SUCCESS);
-
-    clientContext = outArgs.pGmmClientContext;
-}
-GmmClientContextBase::~GmmClientContextBase() {
-    GMM_INIT_OUT_ARGS outArgs;
-    outArgs.pGmmClientContext = clientContext;
-
-    GmmInterface::destroy(&outArgs);
-};
-
-MEMORY_OBJECT_CONTROL_STATE GmmClientContextBase::cachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE usage) {
-    return clientContext->CachePolicyGetMemoryObject(pResInfo, usage);
-}
-
-GMM_RESOURCE_INFO *GmmClientContextBase::createResInfoObject(GMM_RESCREATE_PARAMS *pCreateParams) {
-    return clientContext->CreateResInfoObject(pCreateParams);
-}
-
-GMM_RESOURCE_INFO *GmmClientContextBase::copyResInfoObject(GMM_RESOURCE_INFO *pSrcRes) {
-    return clientContext->CopyResInfoObject(pSrcRes);
-}
-
-void GmmClientContextBase::destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo) {
-    clientContext->DestroyResInfoObject(pResInfo);
-}
-
-GMM_CLIENT_CONTEXT *GmmClientContextBase::getHandle() const {
-    return clientContext;
-}
-
-uint8_t GmmClientContextBase::getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) {
-    return clientContext->GetSurfaceStateCompressionFormat(format);
-}
-
-uint8_t GmmClientContextBase::getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) {
-    return clientContext->GetMediaSurfaceStateCompressionFormat(format);
-}
-
-} // namespace NEO

shared/source/gmm_helper/client_context/gmm_client_context_base.h

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
-
-#include <memory>
-
-namespace NEO {
-class GmmClientContext;
-class OSInterface;
-struct HardwareInfo;
-
-class GmmClientContextBase {
-  public:
-    virtual ~GmmClientContextBase();
-
-    MOCKABLE_VIRTUAL MEMORY_OBJECT_CONTROL_STATE cachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE usage);
-    MOCKABLE_VIRTUAL GMM_RESOURCE_INFO *createResInfoObject(GMM_RESCREATE_PARAMS *pCreateParams);
-    MOCKABLE_VIRTUAL GMM_RESOURCE_INFO *copyResInfoObject(GMM_RESOURCE_INFO *pSrcRes);
-    MOCKABLE_VIRTUAL void destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo);
-    GMM_CLIENT_CONTEXT *getHandle() const;
-    template <typename T>
-    static std::unique_ptr<GmmClientContext> create(OSInterface *osInterface, HardwareInfo *hwInfo) {
-        return std::make_unique<T>(osInterface, hwInfo);
-    }
-
-    const HardwareInfo *getHardwareInfo() {
-        return hardwareInfo;
-    }
-
-    MOCKABLE_VIRTUAL uint8_t getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format);
-    MOCKABLE_VIRTUAL uint8_t getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format);
-
-    void setHandleAllocator(std::unique_ptr<GmmHandleAllocator> allocator) {
-        this->handleAllocator = std::move(allocator);
-    }
-
-    GmmHandleAllocator *getHandleAllocator() {
-        return handleAllocator.get();
-    }
-
-  protected:
-    HardwareInfo *hardwareInfo = nullptr;
-    GMM_CLIENT_CONTEXT *clientContext;
-    GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo);
-    std::unique_ptr<GmmHandleAllocator> handleAllocator;
-};
-} // namespace NEO

shared/source/gmm_helper/gmm_helper.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/gmm_helper/gmm_helper.h"
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
@@ -14,8 +15,6 @@
 #include "shared/source/os_interface/os_library.h"
 #include "shared/source/sku_info/operations/sku_info_transfer.h"
 
-#include "gmm_client_context.h"
-
 #include <algorithm>
 
 namespace NEO {
@@ -47,5 +46,5 @@ GmmHelper::GmmHelper(OSInterface *osInterface, const HardwareInfo *pHwInfo) : hw
 
 GmmHelper::~GmmHelper() = default;
 
-decltype(GmmHelper::createGmmContextWrapperFunc) GmmHelper::createGmmContextWrapperFunc = GmmClientContextBase::create<GmmClientContext>;
+decltype(GmmHelper::createGmmContextWrapperFunc) GmmHelper::createGmmContextWrapperFunc = GmmClientContext::create<GmmClientContext>;
 } // namespace NEO

shared/source/gmm_helper/page_table_mngr_impl.cpp

@@ -5,13 +5,12 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/gmm_helper/resource_info.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 GmmPageTableMngr::~GmmPageTableMngr() {
     if (clientContext) {

shared/source/gmm_helper/resource_info_impl.cpp

@@ -5,11 +5,10 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 GmmResourceInfo::GmmResourceInfo(GmmClientContext *clientContext, GMM_RESCREATE_PARAMS *resourceCreateParams) : clientContext(clientContext) {

shared/source/gmm_helper/windows/gmm_configure_device_address_space_drm_or_wddm.cpp

@@ -5,12 +5,11 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/windows/gmm_memory_base.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/windows/windows_defs.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,

shared/source/gmm_helper/windows/gmm_configure_device_address_space_wddm.cpp

@@ -5,12 +5,11 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/windows/gmm_memory_base.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/windows/windows_defs.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,

shared/source/gmm_helper/windows/gmm_memory_base.cpp

@@ -7,11 +7,10 @@
 
 #include "shared/source/gmm_helper/windows/gmm_memory_base.h"
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/windows/windows_defs.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 GmmMemoryBase::GmmMemoryBase(GmmClientContext *gmmClientContext) : clientContext(*gmmClientContext->getHandle()) {
 }

shared/source/helpers/blit_commands_helper_xehp_plus.inl

@@ -7,14 +7,13 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/blit_commands_helper_base.inl"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 template <typename GfxFamily>

shared/source/helpers/state_base_address_xehp_plus.inl

@@ -7,11 +7,10 @@
 
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/state_base_address_base.inl"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 template <typename GfxFamily>

shared/source/os_interface/linux/page_table_manager_functions.cpp

@@ -1,17 +1,16 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 
 #include "opencl/source/platform/platform.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableFlags);

shared/source/os_interface/windows/page_table_manager_functions.cpp

@@ -1,17 +1,16 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 
 #include "opencl/source/platform/platform.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableCb, translationTableFlags);

shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
@@ -16,7 +17,6 @@
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "gmm_client_context.h"
 #include "gmm_memory.h"
 
 namespace NEO {

shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
@@ -16,7 +17,6 @@
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "gmm_client_context.h"
 #include "gmm_memory.h"
 
 namespace NEO {

shared/source/os_interface/windows/wddm/set_gmm_input_args_drm_or_wddm.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 void Wddm::setGmmInputArgs(void *args) {

shared/source/os_interface/windows/wddm/set_gmm_input_args_wddm.cpp

@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "gmm_client_context.h"
-
 namespace NEO {
 
 void Wddm::setGmmInputArgs(void *args) {

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
@@ -39,7 +40,6 @@
 #include "shared/source/sku_info/operations/windows/sku_info_receiver.h"
 #include "shared/source/utilities/stackvec.h"
 
-#include "gmm_client_context.h"
 #include "gmm_memory.h"
 
 namespace NEO {

shared/test/common/mocks/mock_gmm_client_context_base.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "gmm_client_context.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 
 namespace NEO {
 class MockGmmClientContextBase : public GmmClientContext {

shared/test/unit_test/main.cpp

@@ -442,7 +442,7 @@ int main(int argc, char **argv) {
     SetUnhandledExceptionFilter(&UltExceptionFilter);
 #endif
     if (useMockGmm) {
-        GmmHelper::createGmmContextWrapperFunc = GmmClientContextBase::create<MockGmmClientContext>;
+        GmmHelper::createGmmContextWrapperFunc = GmmClientContext::create<MockGmmClientContext>;
     } else {
         GmmInterface::initialize(nullptr, nullptr);
     }