Wddm interface [3/n]: Improve constructing Wddm object

BartoszDunajski · Compute-Runtime-Automation · commit bab9ad6cdac4 · 2018-05-10T17:14:25.000+02:00
- Only Wddm object owns Gdi
- Dont pass Gdi object to constructor
- Move Wddm related files to new directory

Change-Id: Iadd26634c7692db760d7d3367211c32d2c2c8121
diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt
@@ -55,7 +55,7 @@ set(RUNTIME_SRCS_DLL_WINDOWS
   ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm_create.cpp
+  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
 )
 
 target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})
diff --git a/runtime/gen8/windows/wddm.cpp b/runtime/gen8/windows/wddm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * 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"),
@@ -21,8 +21,8 @@
  */
 
 #include "hw_cmds.h"
-#include "runtime/os_interface/windows/wddm.h"
-#include "runtime/os_interface/windows/wddm.inl"
+#include "runtime/os_interface/windows/wddm/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.inl"
 
 namespace OCLRT {
 
diff --git a/runtime/gen9/windows/wddm.cpp b/runtime/gen9/windows/wddm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * 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"),
@@ -21,8 +21,8 @@
  */
 
 #include "hw_cmds.h"
-#include "runtime/os_interface/windows/wddm.h"
-#include "runtime/os_interface/windows/wddm.inl"
+#include "runtime/os_interface/windows/wddm/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.inl"
 
 namespace OCLRT {
 
diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
@@ -56,9 +56,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_windows.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h
   ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_32bit_memory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_allocation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h
@@ -71,6 +68,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.inl
 )
 
 if(WIN32)
diff --git a/runtime/os_interface/windows/deferrable_deletion_win.cpp b/runtime/os_interface/windows/deferrable_deletion_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * 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"),
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/deferrable_deletion_win.h"
 
 namespace OCLRT {
diff --git a/runtime/os_interface/windows/device_factory.cpp b/runtime/os_interface/windows/device_factory.cpp
@@ -26,7 +26,7 @@
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/windows/os_interface.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 
 namespace OCLRT {
 
diff --git a/runtime/os_interface/windows/driver_info.cpp b/runtime/os_interface/windows/driver_info.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* 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"),
@@ -20,7 +20,7 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/device/driver_info.h"
 #include "runtime/os_interface/windows/driver_info.h"
 #include "runtime/os_interface/windows/os_interface.h"
diff --git a/runtime/os_interface/windows/os_interface.cpp b/runtime/os_interface/windows/os_interface.cpp
@@ -22,7 +22,7 @@
 
 #include "os_interface.h"
 
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/sys_calls.h"
 
 namespace OCLRT {
diff --git a/runtime/os_interface/windows/os_time.cpp b/runtime/os_interface/windows/os_time.cpp
@@ -21,7 +21,7 @@
 */
 
 #include <memory>
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/os_time.h"
 
diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -27,7 +27,7 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/gmm_helper/page_table_mngr.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/registry_reader.h"
@@ -53,18 +53,16 @@ Wddm::GetSystemInfoFcn Wddm::getSystemInfo = getGetSystemInfo();
 Wddm::VirtualAllocFcn Wddm::virtualAllocFnc = getVirtualAlloc();
 Wddm::VirtualFreeFcn Wddm::virtualFreeFnc = getVirtualFree();
 
-Wddm::Wddm(Gdi *gdi) : initialized(false),
-                       gdiAllocated(false),
-                       gdi(gdi),
-                       adapter(0),
-                       context(0),
-                       device(0),
-                       pagingQueue(0),
-                       pagingQueueSyncObject(0),
-                       pagingFenceAddress(nullptr),
-                       currentPagingFenceValue(0),
-                       hwContextId(0),
-                       trimCallbackHandle(nullptr) {
+Wddm::Wddm() : initialized(false),
+               adapter(0),
+               context(0),
+               device(0),
+               pagingQueue(0),
+               pagingQueueSyncObject(0),
+               pagingFenceAddress(nullptr),
+               currentPagingFenceValue(0),
+               hwContextId(0),
+               trimCallbackHandle(nullptr) {
     featureTable.reset(new FeatureTable());
     waTable.reset(new WorkaroundTable());
     gtSystemInfo.reset(new GT_SYSTEM_INFO);
@@ -81,10 +79,7 @@ Wddm::Wddm(Gdi *gdi) : initialized(false),
     gmmMemory = std::unique_ptr<GmmMemory>(GmmMemory::create());
     minAddress = 0;
     kmDafListener = std::unique_ptr<KmDafListener>(new KmDafListener);
-}
-
-Wddm::Wddm() : Wddm(new Gdi()) {
-    gdiAllocated = true;
+    gdi = std::unique_ptr<Gdi>(new Gdi());
 }
 
 Wddm::~Wddm() {
@@ -95,8 +90,6 @@ Wddm::~Wddm() {
     destroyPagingQueue();
     destroyDevice();
     closeAdapter();
-    if (gdiAllocated)
-        delete gdi;
 }
 
 bool Wddm::enumAdapters(unsigned int devNum, HardwareInfo &outHardwareInfo) {
diff --git a/runtime/os_interface/windows/wddm/wddm.h b/runtime/os_interface/windows/wddm/wddm.h
@@ -50,19 +50,6 @@ struct WorkaroundTable;
 struct KmDafListener;
 
 class Wddm {
-  private:
-    struct MonitoredFence {
-        D3DKMT_HANDLE fenceHandle;
-        D3DGPU_VIRTUAL_ADDRESS gpuAddress;
-        volatile uint64_t *cpuAddress;
-        volatile uint64_t currentFenceValue;
-        uint64_t lastSubmittedFence;
-    };
-
-  protected:
-    Wddm();
-    Wddm(Gdi *gdi);
-
   public:
     typedef HRESULT(WINAPI *CreateDXGIFactoryFcn)(REFIID riid, void **ppFactory);
     typedef void(WINAPI *GetSystemInfoFcn)(SYSTEM_INFO *pSystemInfo);
@@ -71,7 +58,7 @@ class Wddm {
 
     virtual ~Wddm();
 
-    static Wddm *createWddm(Gdi *gdi = nullptr);
+    static Wddm *createWddm();
 
     static bool enumAdapters(unsigned int devNum, HardwareInfo &outHardwareInfo);
 
@@ -140,7 +127,7 @@ class Wddm {
     D3DKMT_HANDLE getDevice() const { return device; }
     D3DKMT_HANDLE getPagingQueue() const { return pagingQueue; }
     D3DKMT_HANDLE getPagingQueueSyncObject() const { return pagingQueueSyncObject; }
-    Gdi *getGdi() const { return gdi; }
+    Gdi *getGdi() const { return gdi.get(); }
 
     PFND3DKMT_ESCAPE getEscapeHandle() const;
 
@@ -175,8 +162,7 @@ class Wddm {
 
   protected:
     bool initialized;
-    bool gdiAllocated;
-    Gdi *gdi;
+    std::unique_ptr<Gdi> gdi;
     D3DKMT_HANDLE adapter;
     D3DKMT_HANDLE context;
     D3DKMT_HANDLE device;
@@ -208,6 +194,7 @@ class Wddm {
     std::unique_ptr<GmmMemory> gmmMemory;
     uintptr_t minAddress;
 
+    Wddm();
     MOCKABLE_VIRTUAL bool mapGpuVirtualAddressImpl(Gmm *gmm, D3DKMT_HANDLE handle, void *cpuPtr, uint64_t size, D3DGPU_VIRTUAL_ADDRESS &gpuPtr, bool allocation32bit, bool use64kbPages, bool useHeap1);
     MOCKABLE_VIRTUAL bool openAdapter();
     bool createDevice();
diff --git a/runtime/os_interface/windows/wddm/wddm.inl b/runtime/os_interface/windows/wddm/wddm.inl
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/gdi_interface.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 
 namespace OCLRT {
 
diff --git a/runtime/os_interface/windows/wddm/wddm_create.cpp b/runtime/os_interface/windows/wddm/wddm_create.cpp
@@ -21,11 +21,11 @@
  */
 
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include <dxgi.h>
 namespace OCLRT {
 
-Wddm *Wddm::createWddm(Gdi *gdi) {
+Wddm *Wddm::createWddm() {
     return new Wddm();
 }
 
diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl
@@ -29,7 +29,7 @@
 #include "runtime/command_stream/preemption.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/translationtable_callbacks.h"
diff --git a/runtime/os_interface/windows/wddm_engine_mapper.h b/runtime/os_interface/windows/wddm_engine_mapper.h
@@ -24,7 +24,7 @@
 
 #include "runtime/helpers/engine_node.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 
 #include <cstdint>
 
diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp
@@ -31,7 +31,7 @@
 #include "runtime/memory_manager/deferrable_deletion.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include <algorithm>
 
 namespace OCLRT {
diff --git a/runtime/os_interface/windows/windows_defs.h b/runtime/os_interface/windows/windows_defs.h
@@ -22,8 +22,19 @@
 
 #pragma once
 
+#include <d3dkmthk.h>
+#include <cstdint>
+
 namespace OCLRT {
 
 constexpr uintptr_t windowsMinAddress = 0x200000;
 
+struct MonitoredFence {
+    D3DKMT_HANDLE fenceHandle;
+    D3DGPU_VIRTUAL_ADDRESS gpuAddress;
+    volatile uint64_t *cpuAddress;
+    volatile uint64_t currentFenceValue;
+    uint64_t lastSubmittedFence;
+};
+
 } // namespace OCLRT
diff --git a/unit_tests/mocks/mock_wddm.h b/unit_tests/mocks/mock_wddm.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include <vector>
 #include <set>
 
@@ -57,7 +57,6 @@ class WddmMock : public Wddm {
     using Wddm::pagingQueue;
 
     WddmMock() : Wddm(){};
-    WddmMock(Gdi *gdi) : Wddm(gdi) {}
     ~WddmMock();
 
     bool makeResident(D3DKMT_HANDLE *handles, uint32_t count, bool cantTrimFurther, uint64_t *numberOfBytesToTrim) override;
diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp
@@ -96,13 +96,15 @@ class WddmCommandStreamWithMockGdiFixture {
     MemoryManager *memManager = nullptr;
     MockDevice *device = nullptr;
     WddmMock *wddm = nullptr;
-    MockGdi gdi;
+    MockGdi *gdi = nullptr;
     DebugManagerStateRestore stateRestore;
     GraphicsAllocation *tagAllocation;
     GraphicsAllocation *preemptionAllocation = nullptr;
 
     virtual void SetUp() {
-        wddm = static_cast<WddmMock *>(Wddm::createWddm(&gdi));
+        wddm = static_cast<WddmMock *>(Wddm::createWddm());
+        gdi = new MockGdi();
+        wddm->gdi.reset(gdi);
         ASSERT_NE(wddm, nullptr);
         DebugManager.flags.CsrDispatchMode.set(static_cast<uint32_t>(DispatchMode::ImmediateDispatch));
         csr = new WddmCommandStreamReceiver<DEFAULT_TEST_FAMILY_NAME>(*platformDevices[0], wddm);
@@ -605,12 +607,12 @@ TEST_F(WddmCommandStreamMockGdiTest, FlushCallsWddmMakeResidentForResidencyAlloc
 
     EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
 
-    gdi.getMakeResidentArg().NumAllocations = 0;
+    gdi->getMakeResidentArg().NumAllocations = 0;
 
     BatchBuffer batchBuffer{cs.getGraphicsAllocation(), 0, 0, nullptr, false, false, QueueThrottle::MEDIUM, cs.getUsed(), &cs};
     csr->flush(batchBuffer, EngineType::ENGINE_RCS, nullptr);
 
-    EXPECT_NE(0u, gdi.getMakeResidentArg().NumAllocations);
+    EXPECT_NE(0u, gdi->getMakeResidentArg().NumAllocations);
 
     memManager->freeGraphicsMemory(commandBuffer);
 }
diff --git a/unit_tests/os_interface/windows/hw_info_config_tests.cpp b/unit_tests/os_interface/windows/hw_info_config_tests.cpp
@@ -23,7 +23,7 @@
 #include "unit_tests/os_interface/windows/hw_info_config_tests.h"
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 
 #include "unit_tests/helpers/debug_manager_state_restore.h"
 #include "unit_tests/libult/mock_gfx_family.h"
diff --git a/unit_tests/os_interface/windows/os_interface_tests.h b/unit_tests/os_interface/windows/os_interface_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * 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"),
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "runtime/os_interface/windows/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
diff --git a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp b/unit_tests/os_interface/windows/wddm_address_space_tests.cpp
@@ -28,7 +28,6 @@ using namespace OCLRT;
 class WddmMockReserveAddress : public WddmMock {
   public:
     WddmMockReserveAddress() : WddmMock() {}
-    WddmMockReserveAddress(Gdi *gdi) : WddmMock(gdi) {}
 
     void *virtualAlloc(void *inPtr, size_t size, unsigned long flags, unsigned long type) override {
         if (returnGood != 0) {
diff --git a/unit_tests/os_interface/windows/wddm_create.cpp b/unit_tests/os_interface/windows/wddm_create.cpp
diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h
diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp
diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h
diff --git a/unit_tests/os_interface/windows/wddm_tests.cpp b/unit_tests/os_interface/windows/wddm_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ set(RUNTIME_SRCS_DLL_WINDOWS`
`55`	`55`	`${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp`
`56`	`56`	`${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp`
`57`	`57`	`${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp`
`58`		`- ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm_create.cpp`
	`58`	`+ ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})`