Destroy WDDM monitor fence during OS Context cleanup

Change-Id: I654bc28891bcd1ec23fa18a07bef79a98edbce2e
Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

runtime/os_interface/windows/os_context_win.cpp

@@ -40,6 +40,7 @@ OsContextWin::OsContextWin(Wddm &wddm, uint32_t contextId, DeviceBitfield device
 
 OsContextWin::~OsContextWin() {
     wddm.getWddmInterface()->destroyHwQueue(hardwareQueue.handle);
+    wddm.getWddmInterface()->destroyMonitorFence(residencyController.getMonitoredFence().fenceHandle);
     wddm.destroyContext(wddmContextHandle);
 }
 

runtime/os_interface/windows/wddm/wddm_interface.cpp

@@ -28,7 +28,6 @@ bool WddmInterface20::createMonitoredFence(OsContextWin &osContext) {
     CreateSynchronizationObject.Info.MonitoredFence.InitialFenceValue = 0;
 
     Status = wddm.getGdi()->createSynchronizationObject2(&CreateSynchronizationObject);
-
     DEBUG_BREAK_IF(STATUS_SUCCESS != Status);
 
     residencyController.resetMonitoredFenceParams(CreateSynchronizationObject.hSyncObject,
@@ -38,6 +37,14 @@ bool WddmInterface20::createMonitoredFence(OsContextWin &osContext) {
     return Status == STATUS_SUCCESS;
 }
 
+void WddmInterface20::destroyMonitorFence(D3DKMT_HANDLE fenceHandle) {
+    NTSTATUS status = STATUS_SUCCESS;
+    D3DKMT_DESTROYSYNCHRONIZATIONOBJECT destroySyncObject = {0};
+    destroySyncObject.hSyncObject = fenceHandle;
+    status = wddm.getGdi()->destroySynchronizationObject(&destroySyncObject);
+    DEBUG_BREAK_IF(STATUS_SUCCESS != status);
+}
+
 const bool WddmInterface20::hwQueuesSupported() {
     return false;
 }
@@ -96,6 +103,9 @@ bool WddmInterface23::createMonitoredFence(OsContextWin &osContext) {
     return true;
 }
 
+void WddmInterface23::destroyMonitorFence(D3DKMT_HANDLE fenceHandle) {
+}
+
 void WddmInterface23::destroyHwQueue(D3DKMT_HANDLE hwQueue) {
     if (hwQueue) {
         D3DKMT_DESTROYHWQUEUE destroyHwQueue = {};

runtime/os_interface/windows/wddm/wddm_interface.h

@@ -28,6 +28,7 @@ class WddmInterface {
     virtual bool createHwQueue(OsContextWin &osContext) = 0;
     virtual void destroyHwQueue(D3DKMT_HANDLE hwQueue) = 0;
     virtual bool createMonitoredFence(OsContextWin &osContext) = 0;
+    virtual void destroyMonitorFence(D3DKMT_HANDLE fenceHandle) = 0;
     virtual const bool hwQueuesSupported() = 0;
     virtual bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, OsContextWin &osContext) = 0;
     Wddm &wddm;
@@ -39,6 +40,7 @@ class WddmInterface20 : public WddmInterface {
     bool createHwQueue(OsContextWin &osContext) override;
     void destroyHwQueue(D3DKMT_HANDLE hwQueue) override;
     bool createMonitoredFence(OsContextWin &osContext) override;
+    void destroyMonitorFence(D3DKMT_HANDLE fenceHandle) override;
     const bool hwQueuesSupported() override;
     bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, OsContextWin &osContext) override;
 };
@@ -49,6 +51,7 @@ class WddmInterface23 : public WddmInterface {
     bool createHwQueue(OsContextWin &osContext) override;
     void destroyHwQueue(D3DKMT_HANDLE hwQueue) override;
     bool createMonitoredFence(OsContextWin &osContext) override;
+    void destroyMonitorFence(D3DKMT_HANDLE fenceHandle) override;
     const bool hwQueuesSupported() override;
     bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, OsContextWin &osContext) override;
 };

unit_tests/mock_gdi/gdi32_mock.def

@@ -1,22 +1,9 @@
-; Copyright (c) 2017 - 2018, Intel Corporation
 ;
-; Permission is hereby granted, free of charge, to any person obtaining a
-; copy of this software and associated documentation files (the "Software"),
-; to deal in the Software without restriction, including without limitation
-; the rights to use, copy, modify, merge, publish, distribute, sublicense,
-; and/or sell copies of the Software, and to permit persons to whom the
-; Software is furnished to do so, subject to the following conditions:
+; Copyright (C) 2017-2019 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
 ;
-; The above copyright notice and this permission notice shall be included
-; in all copies or substantial portions of the Software.
 ;
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-; OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-; OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-; ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-; OTHER DEALINGS IN THE SOFTWARE.
 
 LIBRARY    "gdi32_mock"
 EXPORTS
@@ -81,3 +68,4 @@ getCreateContextData
 getCreateHwQueueData
 getDestroyHwQueueData
 getSubmitCommandToHwQueueData
+getDestroySynchronizationObjectData

unit_tests/mock_gdi/mock_gdi.cpp

@@ -394,6 +394,13 @@ NTSTATUS __stdcall D3DKMTSubmitCommandToHwQueue(IN CONST D3DKMT_SUBMITCOMMANDTOH
     return STATUS_SUCCESS;
 }
 
+static D3DKMT_DESTROYSYNCHRONIZATIONOBJECT destroySynchronizationObjectData = {};
+
+NTSTATUS __stdcall D3DKMTDestroySynchronizationObject(IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *destroySynchronizationObject) {
+    destroySynchronizationObjectData = *destroySynchronizationObject;
+    return STATUS_SUCCESS;
+}
+
 #ifdef __cplusplus
 }
 #endif
@@ -464,3 +471,7 @@ D3DKMT_DESTROYHWQUEUE *getDestroyHwQueueData() {
 D3DKMT_SUBMITCOMMANDTOHWQUEUE *getSubmitCommandToHwQueueData() {
     return &submitCommandToHwQueueData;
 }
+
+D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *getDestroySynchronizationObjectData() {
+    return &destroySynchronizationObjectData;
+}

unit_tests/mock_gdi/mock_gdi.h

@@ -26,7 +26,6 @@
     FUNCTION(Unlock, IN CONST D3DKMT_UNLOCK *)                                                           \
     FUNCTION(Render, IN OUT D3DKMT_RENDER *)                                                             \
     FUNCTION(CreateSynchronizationObject, IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT *)                   \
-    FUNCTION(DestroySynchronizationObject, IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *)               \
     FUNCTION(SignalSynchronizationObject, IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECT *)                 \
     FUNCTION(WaitForSynchronizationObject, IN OUT CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECT *)           \
     FUNCTION(WaitForSynchronizationObjectFromCpu, IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMCPU *) \
@@ -78,4 +77,5 @@ D3DKMT_CREATECONTEXTVIRTUAL *getCreateContextData();
 D3DKMT_CREATEHWQUEUE *getCreateHwQueueData();
 D3DKMT_DESTROYHWQUEUE *getDestroyHwQueueData();
 D3DKMT_SUBMITCOMMANDTOHWQUEUE *getSubmitCommandToHwQueueData();
+D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *getDestroySynchronizationObjectData();
 void InitGfxPartition();

unit_tests/mocks/CMakeLists.txt

@@ -84,6 +84,7 @@ if(WIN32)
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory${BRANCH_DIR_SUFFIX}/mock_gmm_memory.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface20.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface23.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.cpp

unit_tests/mocks/mock_wddm_interface20.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
+
+namespace NEO {
+class WddmMockInterface20 : public WddmInterface20 {
+  public:
+    using WddmInterface20::WddmInterface20;
+
+    void destroyMonitorFence(D3DKMT_HANDLE fenceHandle) override {
+        destroyMonitorFenceCalled++;
+        WddmInterface20::destroyMonitorFence(fenceHandle);
+    }
+
+    uint32_t destroyMonitorFenceCalled = 0;
+};
+} // namespace NEO

unit_tests/mocks/mock_wddm_interface23.h

@@ -20,8 +20,15 @@ class WddmMockInterface23 : public WddmInterface23 {
         return createHwQueueResult;
     }
 
+    void destroyMonitorFence(D3DKMT_HANDLE fenceHandle) override {
+        destroyMonitorFenceCalled++;
+        WddmInterface23::destroyMonitorFence(fenceHandle);
+    }
+
     uint32_t createHwQueueCalled = 0;
     bool forceCreateHwQueueFail = false;
     bool createHwQueueResult = false;
+
+    uint32_t destroyMonitorFenceCalled = 0;
 };
 } // namespace NEO

unit_tests/os_interface/windows/gdi_dll_fixture.h

@@ -41,13 +41,17 @@ struct GdiDllFixture {
         getDestroyHwQueueDataFcn = reinterpret_cast<decltype(&getDestroyHwQueueData)>(mockGdiDll->getProcAddress("getDestroyHwQueueData"));
         getSubmitCommandToHwQueueDataFcn =
             reinterpret_cast<decltype(&getSubmitCommandToHwQueueData)>(mockGdiDll->getProcAddress("getSubmitCommandToHwQueueData"));
+        getDestroySynchronizationObjectDataFcn =
+            reinterpret_cast<decltype(&getDestroySynchronizationObjectData)>(mockGdiDll->getProcAddress("getDestroySynchronizationObjectData"));
         setMockLastDestroyedResHandleFcn((D3DKMT_HANDLE)0);
+        *getDestroySynchronizationObjectDataFcn() = {};
     }
 
     virtual void TearDown() {
         *getCreateHwQueueDataFcn() = {};
         *getDestroyHwQueueDataFcn() = {};
         *getSubmitCommandToHwQueueDataFcn() = {};
+        *getDestroySynchronizationObjectDataFcn() = {};
         setMapGpuVaFailConfigFcn(0, 0);
     }
 
@@ -68,4 +72,5 @@ struct GdiDllFixture {
     decltype(&getCreateHwQueueData) getCreateHwQueueDataFcn = nullptr;
     decltype(&getDestroyHwQueueData) getDestroyHwQueueDataFcn = nullptr;
     decltype(&getSubmitCommandToHwQueueData) getSubmitCommandToHwQueueDataFcn = nullptr;
+    decltype(&getDestroySynchronizationObjectData) getDestroySynchronizationObjectDataFcn = nullptr;
 };