Use detected shader model in gfx/d3d12. (#1996)

* Use detected shader model in gfx/d3d12.

* Enable all d3d12 tests on Github.

* Improve d3d12 software device detection.

* Disable d3d12 tests on github for now.

Co-authored-by: Yong He <yhe@nvidia.com>

3 files changed, 96 insertions, 9 deletions

diff --git a/tools/gfx/d3d/d3d-util.cpp b/tools/gfx/d3d/d3d-util.cpp
index d73b3f519..84b5de844 100644
--- a/tools/gfx/d3d/d3d-util.cpp
+++ b/tools/gfx/d3d/d3d-util.cpp
@@ -609,6 +609,31 @@ bool D3DUtil::isUAVBinding(slang::BindingType bindingType)
     }
 }
 
+int D3DUtil::getShaderModelFromProfileName(const char* name)
+{
+    UnownedStringSlice nameSlice(name);
+
+    if (nameSlice.endsWith("5_1"))
+        return D3D_SHADER_MODEL_5_1;
+    if (nameSlice.endsWith("6_0"))
+        return D3D_SHADER_MODEL_6_0;
+    if (nameSlice.endsWith("6_1"))
+        return D3D_SHADER_MODEL_6_1;
+    if (nameSlice.endsWith("6_2"))
+        return D3D_SHADER_MODEL_6_2;
+    if (nameSlice.endsWith("6_3"))
+        return D3D_SHADER_MODEL_6_3;
+    if (nameSlice.endsWith("6_4"))
+        return D3D_SHADER_MODEL_6_4;
+    if (nameSlice.endsWith("6_5"))
+        return D3D_SHADER_MODEL_6_5;
+    if (nameSlice.endsWith("6_6"))
+        return D3D_SHADER_MODEL_6_6;
+    if (nameSlice.endsWith("6_7"))
+        return 0x67;
+    return 0;
+}
+
 /* static */SlangResult D3DUtil::findAdapters(DeviceCheckFlags flags, const UnownedStringSlice& adapterName, IDXGIFactory* dxgiFactory, List<ComPtr<IDXGIAdapter>>& outDxgiAdapters)
 {
     Slang::String lowerAdapterName = Slang::String(adapterName).toLower();
diff --git a/tools/gfx/d3d/d3d-util.h b/tools/gfx/d3d/d3d-util.h
index e570c6ff6..4bca89612 100644
--- a/tools/gfx/d3d/d3d-util.h
+++ b/tools/gfx/d3d/d3d-util.h
@@ -94,6 +94,8 @@ class D3DUtil
 
     static bool isUAVBinding(slang::BindingType bindingType);
 
+    static int getShaderModelFromProfileName(const char* profile);
+
 };
 
 #if SLANG_GFX_HAS_DXR_SUPPORT
diff --git a/tools/gfx/d3d12/render-d3d12.cpp b/tools/gfx/d3d12/render-d3d12.cpp
index aa945fd85..d296e1edb 100644
--- a/tools/gfx/d3d12/render-d3d12.cpp
+++ b/tools/gfx/d3d12/render-d3d12.cpp
@@ -182,9 +182,11 @@ public:
             m_desc = {}; 
             m_desc1 = {};
             m_isWarp = false;
+            m_isSoftware = false;
         }
 
         bool m_isWarp;
+        bool m_isSoftware;
         ComPtr<IDXGIFactory> m_dxgiFactory;
         ComPtr<ID3D12Device> m_device;
         ComPtr<ID3D12Device5> m_device5;
@@ -4232,6 +4234,8 @@ Result D3D12Device::_createDevice(DeviceCheckFlags deviceCheckFlags, const Unown
     outDeviceInfo.m_dxgiFactory = dxgiFactory;
     outDeviceInfo.m_adapter = adapter;
     outDeviceInfo.m_isWarp = D3DUtil::isWarp(dxgiFactory, adapter);
+    outDeviceInfo.m_isSoftware = outDeviceInfo.m_isWarp || ((outDeviceInfo.m_desc1.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) != 0)
+        || outDeviceInfo.m_desc.VendorId == 5140;
 
     return SLANG_OK;
 }
@@ -4354,6 +4358,15 @@ Result D3D12Device::initialize(const Desc& desc)
     // Set the device
     m_device = m_deviceInfo.m_device;
 
+    if (m_deviceInfo.m_isSoftware)
+    {
+        m_features.add("software-device");
+    }
+    else
+    {
+        m_features.add("hardware-device");
+    }
+
     // NVAPI
     if (desc.nvapiExtnSlot >= 0)
     {
@@ -4387,30 +4400,31 @@ Result D3D12Device::initialize(const Desc& desc)
 
     }
 
+    D3D12_FEATURE_DATA_SHADER_MODEL shaderModelData = {};
+    shaderModelData.HighestShaderModel = D3D_SHADER_MODEL_6_6;
+
     // Find what features are supported
     {
         // Check this is how this is laid out...
         SLANG_COMPILE_TIME_ASSERT(D3D_SHADER_MODEL_6_0 == 0x60);
 
         {
-            D3D12_FEATURE_DATA_SHADER_MODEL featureShaderModel;
-            featureShaderModel.HighestShaderModel = D3D_SHADER_MODEL(0x62);
-
             // TODO: Currently warp causes a crash when using half, so disable for now
-            if (SLANG_SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_SHADER_MODEL, &featureShaderModel, sizeof(featureShaderModel))) &&
+            if (SLANG_SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_SHADER_MODEL, &shaderModelData, sizeof(shaderModelData))) &&
                 m_deviceInfo.m_isWarp == false &&
-                featureShaderModel.HighestShaderModel >= 0x62)
+                shaderModelData.HighestShaderModel >= 0x62)
             {
                 // With sm_6_2 we have half
                 m_features.add("half");
             }
         }
-        // Check what min precision support we have
+        // Check double precision support
         {
             D3D12_FEATURE_DATA_D3D12_OPTIONS options;
             if (SLANG_SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options))))
             {
-                auto minPrecisionSupport = options.MinPrecisionSupport;
+                if (options.DoublePrecisionFloatShaderOps)
+                    m_features.add("double");
             }
         }
         // Check ray tracing support
@@ -4474,10 +4488,56 @@ Result D3D12Device::initialize(const Desc& desc)
     m_device->QueryInterface<ID3D12Device5>(m_deviceInfo.m_device5.writeRef());
     m_device5 = m_deviceInfo.m_device5.get();
 #endif
+    // Check shader model version.
+    SlangCompileTarget compileTarget = SLANG_DXBC;
+    const char* profileName = "sm_5_1";
+    switch (shaderModelData.HighestShaderModel)
+    {
+    case D3D_SHADER_MODEL_5_1:
+        compileTarget = SLANG_DXBC;
+        profileName = "sm_5_1";
+        break;
+    case D3D_SHADER_MODEL_6_0:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_0";
+        break;
+    case D3D_SHADER_MODEL_6_1:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_1";
+        break;
+    case D3D_SHADER_MODEL_6_2:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_2";
+        break;
+    case D3D_SHADER_MODEL_6_3:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_3";
+        break;
+    case D3D_SHADER_MODEL_6_4:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_4";
+        break;
+    case D3D_SHADER_MODEL_6_5:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_5";
+        break;
+    default:
+        compileTarget = SLANG_DXIL;
+        profileName = "sm_6_6";
+        break;
+    }
+    // If user specified a higher shader model than what the system supports, return failure.
+    int userSpecifiedShaderModel = D3DUtil::getShaderModelFromProfileName(desc.slang.targetProfile);
+    if (userSpecifiedShaderModel > shaderModelData.HighestShaderModel)
+    {
+        getDebugCallback()->handleMessage(gfx::DebugMessageType::Error, gfx::DebugMessageSource::Layer,
+            "The requested shader model is not supported by the system.");
+        return SLANG_E_NOT_AVAILABLE;
+    }
     SLANG_RETURN_ON_FAIL(slangContext.initialize(
         desc.slang,
-        m_device5 ? SLANG_DXIL : SLANG_DXBC,
-        m_device5 ? "sm_6_5" : "sm_5_1",
+        compileTarget,
+        profileName,
         makeArray(slang::PreprocessorMacroDesc{"__D3D12__", "1"}).getView()));
 
     m_isInitialized = true;