Add back DxCore support to WinMLRunner (#217)

* Add back DxCore support to winmlrunner

* Add delay load

* Dynamic allocate description str

* Fix spacing

* Make adaptername comparison simpler

* remove adapter index selection because there is no guarantee deterministic indexes

* Updated readme

Author: ryanlai2

Tools/WinMLRunner/README.md

@@ -35,6 +35,7 @@ Required command-Line arguments:
 -GPU : run model on default GPU
 -GPUHighPerformance : run model on GPU with highest performance
 -GPUMinPower : run model on GPU with the least power
+-GPUAdapterName <adapter name substring>: run model on GPU specified by its name. NOTE: Please only use this flag on DXCore supported machines.
 -CreateDeviceOnClient : create the D3D device on the client and pass it to WinML to create session
 -CreateDeviceInWinML : create the device inside WinML
 -CPUBoundInput : bind the input to the CPU

Tools/WinMLRunner/WinMLRunner.vcxproj

@@ -160,6 +160,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
       <Command>$(ProjectDir)src\GenerateVersionStrings.cmd $(ProjectDir) $(IntDir)</Command>
@@ -185,6 +186,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(IntDir)</AdditionalIncludeDirectories>
@@ -211,6 +213,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(IntDir)</AdditionalIncludeDirectories>
@@ -241,6 +244,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(IntDir)</AdditionalIncludeDirectories>
@@ -272,6 +276,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(IntDir)</AdditionalIncludeDirectories>
@@ -304,6 +309,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>WindowsApp.lib; mincore.lib; DXGI.lib</AdditionalDependencies>
+      <DelayLoadDLLs>"ext-ms-win-dxcore-l1-1-0.dll"</DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
       <Command>$(ProjectDir)src\GenerateVersionStrings.cmd $(ProjectDir) $(IntDir)</Command>

Tools/WinMLRunner/src/CommandLineArgs.cpp

@@ -19,6 +19,10 @@ void CommandLineArgs::PrintUsage()
     std::cout << "  -GPU : run model on default GPU" << std::endl;
     std::cout << "  -GPUHighPerformance : run model on GPU with highest performance" << std::endl;
     std::cout << "  -GPUMinPower : run model on GPU with the least power" << std::endl;
+#ifdef DXCORE_SUPPORTED_BUILD
+    std::cout << "  -GPUAdapterName <adapter name substring>: run model on GPU specified by its name. NOTE: Please only use this flag on DXCore supported machines." 
+              << std::endl;
+#endif
     std::cout << "  -CreateDeviceOnClient : create the D3D device on the client and pass it to WinML to create session" << std::endl;
     std::cout << "  -CreateDeviceInWinML : create the device inside WinML" << std::endl;
     std::cout << "  -CPUBoundInput : bind the input to the CPU" << std::endl;
@@ -87,6 +91,22 @@ CommandLineArgs::CommandLineArgs(const std::vector<std::wstring>& args)
         {
             m_useGPUMinPower = true;
         }
+#ifdef DXCORE_SUPPORTED_BUILD
+        else if ((_wcsicmp(args[i].c_str(), L"-GPUAdapterName") == 0) || (_wcsicmp(args[i].c_str(), L"-GPUAdapterIndex") == 0))
+        {
+            CheckNextArgument(args, i);
+            HMODULE library = nullptr;
+            library = LoadLibrary(L"dxcore.dll");
+            if (!library)
+            {
+                throw hresult_invalid_argument(
+                    L"ERROR: DXCORE isn't supported on this machine. "
+                    L"GpuAdapterName flag should only be used with DXCore supported machines.");
+                }
+            m_adapterName = args[++i];
+            m_useGPU = true;
+        }
+#endif
         else if ((_wcsicmp(args[i].c_str(), L"-CreateDeviceOnClient") == 0))
         {
             m_createDeviceOnClient = true;

Tools/WinMLRunner/src/CommandLineArgs.h

@@ -30,6 +30,9 @@ class CommandLineArgs
     const std::wstring& FolderPath() const { return m_modelFolderPath; }
     const std::wstring& ModelPath() const { return m_modelPath; }
     const std::wstring& TensorOutputPath() const { return m_tensorOutputPath; }
+#ifdef DXCORE_SUPPORTED_BUILD
+    const std::wstring& GetGPUAdapterName() const { return m_adapterName; }
+#endif
 
     bool UseRGB() const
     {
@@ -139,6 +142,9 @@ class CommandLineArgs
     std::wstring m_imagePath;
     std::wstring m_csvData;
     std::wstring m_inputData;
+#ifdef DXCORE_SUPPORTED_BUILD
+    std::wstring m_adapterName;
+#endif
     std::wstring m_perfOutputPath;
     std::wstring m_tensorOutputPath;
     uint32_t m_numIterations = 1;

Tools/WinMLRunner/src/Common.h

@@ -25,6 +25,12 @@
 #include "TimerHelper.h"
 #include "DirectXPackedVector.h"
 
+#if __has_include("dxcore.h")
+#include <initguid.h>
+#include <dxcore.h>
+#define DXCORE_SUPPORTED_BUILD
+#endif
+
 enum WINML_MODEL_TEST_PERF
 {
     ENTIRE_TEST = 0,