[3/n] Wddm Cleanup.

- remove different flavors of Wddm
- rename files for better meaning
- remove unnecessary files
- remove unnecessary methods

Change-Id: I73a35e186a9a99169260bb157958ff795b36e20d

Author: MichalMrozek

runtime/os_interface/windows/device_factory.cpp

@@ -45,7 +45,7 @@ bool DeviceFactory::getDevices(HardwareInfo **pHWInfos, size_t &numDevices, Exec
     numDevices = 0;
 
     while (numDevices < totalDeviceCount) {
-        std::unique_ptr<Wddm> wddm(Wddm ::createWddm(Wddm::pickWddmInterfaceVersion(tempHwInfos[numDevices])));
+        std::unique_ptr<Wddm> wddm(Wddm ::createWddm());
         if (!wddm->enumAdapters(tempHwInfos[numDevices])) {
             return false;
         }

runtime/os_interface/windows/wddm/wddm.cpp

@@ -909,13 +909,4 @@ void Wddm::resetMonitoredFenceParams(D3DKMT_HANDLE &handle, uint64_t *cpuAddress
     monitoredFence.cpuAddress = cpuAddress;
     monitoredFence.gpuAddress = gpuAddress;
 }
-
-WddmInterfaceVersion Wddm::pickWddmInterfaceVersion(const HardwareInfo &hwInfo) {
-    if (hwInfo.pSkuTable && hwInfo.pSkuTable->ftrWddmHwQueues) {
-        return WddmInterfaceVersion::Wddm23;
-    }
-    // Use default version when hwInfo is not yet populated (eg. during enumAdapter call)
-    return WddmInterfaceVersion::Wddm20;
-}
-
 } // namespace OCLRT

runtime/os_interface/windows/wddm/wddm.h

@@ -63,8 +63,7 @@ class Wddm {
 
     virtual ~Wddm();
 
-    static Wddm *createWddm(WddmInterfaceVersion interfaceVersion);
-    static WddmInterfaceVersion pickWddmInterfaceVersion(const HardwareInfo &hwInfo);
+    static Wddm *createWddm();
     bool enumAdapters(HardwareInfo &outHardwareInfo);
 
     MOCKABLE_VIRTUAL bool evict(D3DKMT_HANDLE *handleList, uint32_t numOfHandles, uint64_t &sizeToTrim);
@@ -223,7 +222,4 @@ class Wddm {
     std::unique_ptr<KmDafListener> kmDafListener;
     std::unique_ptr<WddmInterface> wddmInterface;
 };
-
-using Wddm20 = Wddm;
-
 } // namespace OCLRT

runtime/os_interface/windows/wddm/wddm23.cpp

@@ -22,18 +22,9 @@
 
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
-#include "runtime/os_interface/windows/wddm/wddm23.h"
 
 namespace OCLRT {
-Wddm *Wddm::createWddm(WddmInterfaceVersion interfaceVersion) {
-    switch (interfaceVersion) {
-    case WddmInterfaceVersion::Wddm20:
-        return new Wddm20();
-    case WddmInterfaceVersion::Wddm23:
-        return new Wddm23();
-    default:
-        UNRECOVERABLE_IF(true);
-        return nullptr;
-    }
+Wddm *Wddm::createWddm() {
+    return new Wddm();
 }
 } // namespace OCLRT

runtime/os_interface/windows/wddm/wddm23.h

@@ -52,7 +52,7 @@ WddmCommandStreamReceiver<GfxFamily>::WddmCommandStreamReceiver(const HardwareIn
     : BaseClass(hwInfoIn, executionEnvironment) {
     this->wddm = wddm;
     if (this->wddm == nullptr) {
-        this->wddm = Wddm::createWddm(Wddm::pickWddmInterfaceVersion(hwInfoIn));
+        this->wddm = Wddm::createWddm();
     }
     GPUNODE_ORDINAL nodeOrdinal = GPUNODE_3D;
     UNRECOVERABLE_IF(!WddmEngineMapper<GfxFamily>::engineNodeMap(hwInfoIn.capabilityTable.defaultEngineType, nodeOrdinal));

runtime/os_interface/windows/wddm/wddm_create.cpp

@@ -23,7 +23,7 @@
 #include "unit_tests/mocks/mock_ostime.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_ostime_win.h"
-#include "unit_tests/mocks/mock_wddm20.h"
+#include "unit_tests/mocks/mock_wddm.h"
 #include "test.h"
 
 using namespace OCLRT;

runtime/os_interface/windows/wddm_device_command_stream.inl

@@ -79,6 +79,9 @@ 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_interface23.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.cpp
     ${IGDRCL_SRC_tests_mock_wddm}
   )
 else()

unit_tests/device/device_win_timers_tests.cpp

@@ -23,7 +23,7 @@
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
-#include "unit_tests/mocks/mock_wddm20.h"
+#include "unit_tests/mocks/mock_wddm.h"
 #include "unit_tests/mock_gdi/mock_gdi.h"
 
 #include "gtest/gtest.h"
@@ -237,38 +237,3 @@ bool WddmMock::reserveValidAddressRange(size_t size, void *&reservedMem) {
 GmmMemory *WddmMock::getGmmMemory() const {
     return gmmMemory.get();
 }
-
-bool WddmMock::initializeWithoutConfiguringAddressSpace() {
-    if (gdi != nullptr && gdi->isInitialized() && !initialized) {
-        if (!openAdapter()) {
-            return false;
-        }
-        if (!queryAdapterInfo()) {
-            return false;
-        }
-
-        if (featureTable->ftrWddmHwQueues) {
-            wddmInterface = std::make_unique<WddmInterface23>(*this);
-        } else {
-            wddmInterface = std::make_unique<WddmInterface20>(*this);
-        }
-
-        if (!createDevice()) {
-            return false;
-        }
-        if (!createPagingQueue()) {
-            return false;
-        }
-        if (!createContext()) {
-            return false;
-        }
-        if (wddmInterface->hwQueuesSupported() && !wddmInterface->createHwQueue(preemptionMode)) {
-            return false;
-        }
-        if (!wddmInterface->createMonitoredFence()) {
-            return false;
-        }
-        initialized = true;
-    }
-    return initialized;
-}