Revert "Create wrapper for GmmClientContext"

This reverts commit 50c3187.

Change-Id: Id154ca2d217e5e45623750f641ebad5dc5e840a2

Author: JablonskiMateusz

CMakeLists.txt

@@ -501,7 +501,6 @@ include_directories(${IGDRCL_BUILD_DIR})
 include_directories(${IGDRCL_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
 include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
 
 set(HW_SRC_INCLUDE_PATH ${IGDRCL_SOURCE_DIR}/runtime/gen_common)
 

runtime/gmm_helper/CMakeLists.txt

@@ -20,10 +20,6 @@
 
 set(RUNTIME_SRCS_GMM_HELPER_BASE
   ${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}/gmm_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h

runtime/gmm_helper/client_context/gmm_client_context.cpp

@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "gmm_client_context.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/get_info.h"
@@ -55,14 +54,15 @@ bool Gmm::initContext(const PLATFORM *pPlatform,
         }
         bool success = GMM_SUCCESS == initGlobalContextFunc(*pPlatform, &gmmFtrTable, &gmmWaTable, pGtSysInfo, GMM_CLIENT::GMM_OCL_VISTA);
         UNRECOVERABLE_IF(!success);
-        Gmm::gmmClientContext = Gmm::createGmmContextWrapperFunc(GMM_CLIENT::GMM_OCL_VISTA);
+        Gmm::gmmClientContext = createClientContextFunc(GMM_CLIENT::GMM_OCL_VISTA);
     }
     return Gmm::gmmClientContext != nullptr;
 }
 
 void Gmm::destroyContext() {
     if (Gmm::gmmClientContext) {
-        Gmm::gmmClientContext.reset(nullptr);
+        deleteClientContextFunc(Gmm::gmmClientContext);
+        Gmm::gmmClientContext = nullptr;
         destroyGlobalContextFunc();
     }
 }
@@ -76,7 +76,7 @@ uint32_t Gmm::getMOCS(uint32_t type) {
         }
     }
 
-    MEMORY_OBJECT_CONTROL_STATE mocs = Gmm::gmmClientContext->cachePolicyGetMemoryObject(nullptr, static_cast<GMM_RESOURCE_USAGE_TYPE>(type));
+    MEMORY_OBJECT_CONTROL_STATE mocs = Gmm::gmmClientContext->CachePolicyGetMemoryObject(nullptr, static_cast<GMM_RESOURCE_USAGE_TYPE>(type));
 
     return static_cast<uint32_t>(mocs.DwordValue);
 }
@@ -392,11 +392,8 @@ bool Gmm::unifiedAuxTranslationCapable() const {
     return gmmFlags->Gpu.CCS && gmmFlags->Gpu.UnifiedAuxSurface && gmmFlags->Info.RenderCompressed;
 }
 
-Gmm::~Gmm() {}
-
-std::unique_ptr<GmmClientContext> (*Gmm::createGmmContextWrapperFunc)(GMM_CLIENT) = GmmClientContextBase::create<GmmClientContext>;
 bool Gmm::useSimplifiedMocsTable = false;
-std::unique_ptr<GmmClientContext> Gmm::gmmClientContext = nullptr;
+GMM_CLIENT_CONTEXT *Gmm::gmmClientContext = nullptr;
 bool Gmm::isLoaded = false;
 
 } // namespace OCLRT

runtime/gmm_helper/client_context/gmm_client_context.h

@@ -34,7 +34,6 @@ struct WorkaroundTable;
 struct ImageInfo;
 class GraphicsAllocation;
 class GmmResourceInfo;
-class GmmClientContext;
 
 enum OCLPlane {
     NO_PLANE = 0,
@@ -51,7 +50,7 @@ class Gmm {
   public:
     static const uint32_t maxPossiblePitch = 2147483648;
 
-    virtual ~Gmm();
+    virtual ~Gmm() = default;
 
     void create();
     static Gmm *create(const void *alignedPtr, size_t alignedSize, bool uncacheable);
@@ -97,11 +96,10 @@ class Gmm {
     static decltype(&GmmDestroyGlobalContext) destroyGlobalContextFunc;
     static decltype(&GmmCreateClientContext) createClientContextFunc;
     static decltype(&GmmDeleteClientContext) deleteClientContextFunc;
-    static std::unique_ptr<GmmClientContext> (*createGmmContextWrapperFunc)(GMM_CLIENT);
 
     bool isRenderCompressed = false;
     static bool useSimplifiedMocsTable;
-    static std::unique_ptr<GmmClientContext> gmmClientContext;
+    static GMM_CLIENT_CONTEXT *gmmClientContext;
     static bool isLoaded;
 };
 } // namespace OCLRT

runtime/gmm_helper/client_context/gmm_client_context_base.cpp

@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "gmm_client_context.h"
 #include "runtime/gmm_helper/gmm_memory_base.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 
@@ -34,7 +33,7 @@ bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,
                                                 BOOLEAN BDWL3Coherency,
                                                 GMM_GFX_SIZE_T SizeOverride,
                                                 GMM_GFX_SIZE_T SlmGfxSpaceReserve) {
-    return clientContext->ConfigureDeviceAddressSpace(
+    return Gmm::gmmClientContext->ConfigureDeviceAddressSpace(
                {hAdapter},
                {hDevice},
                {pfnEscape},
@@ -47,10 +46,7 @@ bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,
 }
 
 uintptr_t GmmMemoryBase::getInternalGpuVaRangeLimit() {
-    return static_cast<uintptr_t>(clientContext->GetInternalGpuVaRangeLimit());
-}
-GmmMemoryBase::GmmMemoryBase() {
-    clientContext = Gmm::gmmClientContext->getHandle();
+    return static_cast<uintptr_t>(Gmm::gmmClientContext->GetInternalGpuVaRangeLimit());
 }
 
 }; // namespace OCLRT

runtime/gmm_helper/client_context/gmm_client_context_base.h

@@ -42,7 +42,6 @@ class GmmMemoryBase {
     MOCKABLE_VIRTUAL uintptr_t getInternalGpuVaRangeLimit();
 
   protected:
-    GMM_CLIENT_CONTEXT *clientContext = nullptr;
-    GmmMemoryBase();
+    GmmMemoryBase() = default;
 };
 } // namespace OCLRT