Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable generic feature level devices in DML EP #20114

Merged
merged 4 commits into from
Mar 29, 2024
Merged

Enable generic feature level devices in DML EP #20114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22bc4a1
Use DirectX-headers
jeffbloo Mar 27, 2024
51bc4b8
Enable generic feature level support with DirectML EP
jeffbloo Mar 28, 2024
ae6454d
Merge remote-tracking branch 'origin/main' into user/jeffbloo/DmlGene…
jeffbloo Mar 28, 2024
ee4280b
Update cgamanifest.json and download-deps.yml for DirectX-Headers and…
jeffbloo Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cgmanifests/generated/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "a43ce67187bab219520fd80f21af8bbd4354bc8c",
"commitHash": "bacfaaa951653cd4e72efe727a543567cb38f7de",
smk2007 marked this conversation as resolved.
Show resolved Hide resolved
"repositoryUrl": "https://github.com/onnx/onnx-tensorrt.git"
},
"comments": "onnx_tensorrt"
Expand Down Expand Up @@ -341,6 +341,16 @@
},
"comments": "composable_kernel"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "de28d93dfa9ebf3e473127c1c657e1920a5345ee",
"repositoryUrl": "https://github.com/microsoft/DirectX-Headers.git"
},
"comments": "directx_headers"
}
}
]
}
1 change: 1 addition & 0 deletions cmake/deps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.zip;757f90a79
utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156
extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c
composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/5356c4a943a35e74d7cdc69486afcb8703b9a59a.zip;522382c2af437e09124287e5879ab64af5b2e299
directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
11 changes: 11 additions & 0 deletions cmake/external/dml.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,14 @@ else()
set(DML_PACKAGE_DIR ${dml_INCLUDE_DIR}/..)
endif()
endif()

FetchContent_Declare(
directx_headers
URL ${DEP_URL_directx_headers}
URL_HASH SHA1=${DEP_SHA1_directx_headers}
)

FetchContent_Populate(directx_headers)
set(directx_headers_INCLUDE_DIRS "${directx_headers_SOURCE_DIR}/include")

include_directories(BEFORE ${directx_headers_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/AllocationInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <wrl/client.h>
#include <wrl/implements.h>
#include <d3d12.h>
#include "directx/d3d12.h"
#include "DmlResourceWrapper.h"

namespace Dml
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/DmlExternalBufferAllocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#pragma once

#include <wrl/client.h>
#include <d3d12.h>
#include "directx/d3d12.h"
#include <wil/wrl.h>
#include <wil/result_macros.h>
#include "External/D3DX12/d3dx12.h"
Expand Down
15 changes: 6 additions & 9 deletions onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,7 @@ namespace Dml
}
}

// ORT release pipelines agent pools do not have 19H1 SDK installed which defines D3D_FEATURE_LEVEL_1_0_CORE.
// Once ORT/WinML github project can be built with VS2019, we can update these pools to use install the 19H1 SDK
// using the command line installer tool with VS2019
// Task 24384515: Update ORT AIInfra release agent pool to install 19H1 SDK on VM bootstrap
#define D3D_FEATURE_LEVEL_1_0_CORE_PRIVATE ((D3D_FEATURE_LEVEL)0x1000)

ExecutionProviderImpl::ExecutionProviderImpl(IDMLDevice* dmlDevice, ID3D12Device* d3d12Device, ID3D12CommandQueue* queue, bool enableMetacommands, bool enableDynamicGraphFusion)
ExecutionProviderImpl::ExecutionProviderImpl(IDMLDevice* dmlDevice, ID3D12Device* d3d12Device, ID3D12CommandQueue* queue, bool enableMetacommands, bool enableDynamicGraphFusion)
: m_d3d12Device(d3d12Device),
m_dmlDevice(dmlDevice),
m_areMetacommandsEnabled(enableMetacommands),
Expand All @@ -157,7 +151,10 @@ namespace Dml
D3D12_FEATURE_DATA_FEATURE_LEVELS featureLevels = {};

D3D_FEATURE_LEVEL featureLevelsList[] = {
D3D_FEATURE_LEVEL_1_0_CORE_PRIVATE,
#ifndef _GAMING_XBOX
D3D_FEATURE_LEVEL_1_0_GENERIC,
#endif
D3D_FEATURE_LEVEL_1_0_CORE,
D3D_FEATURE_LEVEL_11_0,
D3D_FEATURE_LEVEL_11_1,
D3D_FEATURE_LEVEL_12_0,
Expand All @@ -181,7 +178,7 @@ namespace Dml
m_native16BitShaderOpsSupported = featureOptions.Native16BitShaderOpsSupported;
}

m_isMcdmDevice = (featureLevels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_1_0_CORE_PRIVATE);
m_isMcdmDevice = (featureLevels.MaxSupportedFeatureLevel <= D3D_FEATURE_LEVEL_1_0_CORE);
m_areCustomHeapsSupported = !m_isMcdmDevice;

if (m_isMcdmDevice)
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/IExecutionProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <d3d12.h>
#include "directx/d3d12.h"

#include "core/providers/dml/DmlExecutionProvider/inc/DmlExecutionProvider.h"

Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/DmlDFT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../../../OperatorAuthorHelper/OperatorHelper.h"

#include "../External/D3DX12/d3dx12.h"
#include <d3d12.h>
#include "directx/d3d12.h"

// NOTE: When this operator's implementation is moved into DML, the associated FP16 fallback
// should be removed from IsCustomOpShader(...) in
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/DmlGridSample.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../MLOperatorAuthorImpl.h"

#include "../External/D3DX12/d3dx12.h"
#include <d3d12.h>
#include "directx/d3d12.h"

// NOTE: When this operator's implementation is moved into DML, the associated FP16 fallback
// should be removed from IsCustomOpShader(...) in
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/dml/DmlExecutionProvider/src/precomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <d3d12_x.h>
#include <d3dx12_x.h>
#else // Desktop
#include <d3d12.h>
#include "directx/d3d12.h"
#include <d3d12sdklayers.h>
#include "External/D3DX12/d3dx12.h"
#endif
Expand Down
40 changes: 31 additions & 9 deletions onnxruntime/core/providers/dml/dml_provider_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#include <dxcore.h>
#include <vector>

#define INITGUID
#include <guiddef.h>

Check warning on line 7 in onnxruntime/core/providers/dml/dml_provider_factory.cc

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 Found C system header after C++ system header. Should be: dml_provider_factory.h, c system, c++ system, other.  [build/include_order] [4]

Raw Output:
onnxruntime/core/providers/dml/dml_provider_factory.cc:7:  Found C system header after C++ system header. Should be: dml_provider_factory.h, c system, c++ system, other.  [build/include_order] [4]
#include <directx/dxcore.h>

Check warning on line 8 in onnxruntime/core/providers/dml/dml_provider_factory.cc

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 Found C system header after C++ system header. Should be: dml_provider_factory.h, c system, c++ system, other.  [build/include_order] [4]

Raw Output:
onnxruntime/core/providers/dml/dml_provider_factory.cc:8:  Found C system header after C++ system header. Should be: dml_provider_factory.h, c system, c++ system, other.  [build/include_order] [4]
#undef INITGUID

#include "directx/d3d12.h"

#include <DirectML.h>
#ifndef _GAMING_XBOX
#include <dxgi1_4.h>
Expand Down Expand Up @@ -157,12 +163,15 @@
// When DXCore APIs are available QI for relevant enumeration interfaces
constexpr bool use_dxcore_workload_enumeration = false;
if (!use_dxcore_workload_enumeration) {
// Get a list of all the adapters that support compute
GUID attributes[]{ DXCORE_ADAPTER_ATTRIBUTE_D3D12_CORE_COMPUTE };
ORT_THROW_IF_FAILED(
adapter_factory->CreateAdapterList(_countof(attributes),
jeffbloo marked this conversation as resolved.
Show resolved Hide resolved
attributes,
adapter_factory->CreateAdapterList(1,
&DXCORE_ADAPTER_ATTRIBUTE_D3D12_GENERIC_ML,
adapter_list.GetAddressOf()));

if (adapter_list->GetAdapterCount() == 0)
{
ORT_THROW_IF_FAILED(adapter_factory->CreateAdapterList(1, &DXCORE_ADAPTER_ATTRIBUTE_D3D12_CORE_COMPUTE, adapter_list.GetAddressOf()));
}
}

return adapter_list;
Expand Down Expand Up @@ -477,6 +486,9 @@
D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels = {};

D3D_FEATURE_LEVEL feature_levels_list[] = {
#ifndef _GAMING_XBOX
D3D_FEATURE_LEVEL_1_0_GENERIC,
#endif
D3D_FEATURE_LEVEL_1_0_CORE,
D3D_FEATURE_LEVEL_11_0,
D3D_FEATURE_LEVEL_11_1,
Expand All @@ -492,8 +504,9 @@
sizeof(feature_levels)
));

auto is_feature_level_1_0_core = (feature_levels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_1_0_CORE);
if (is_feature_level_1_0_core) {
auto use_compute_command_list = (feature_levels.MaxSupportedFeatureLevel <= D3D_FEATURE_LEVEL_1_0_CORE);
if (use_compute_command_list)
{
return D3D12_COMMAND_LIST_TYPE_COMPUTE;
}

Expand Down Expand Up @@ -533,12 +546,21 @@

auto feature_level = D3D_FEATURE_LEVEL_11_0;
if (IsNPU(adapter.Get())) {
feature_level = D3D_FEATURE_LEVEL_1_0_CORE;
feature_level = D3D_FEATURE_LEVEL_1_0_GENERIC;
}

// Create D3D12 Device from DXCore Adapter
ComPtr<ID3D12Device> d3d12_device;
ORT_THROW_IF_FAILED(D3D12CreateDevice(adapter.Get(), feature_level, IID_GRAPHICS_PPV_ARGS(d3d12_device.ReleaseAndGetAddressOf())));
if (feature_level == D3D_FEATURE_LEVEL_1_0_GENERIC) {
// Attempt to create a D3D_FEATURE_LEVEL_1_0_CORE device first, in case the device supports this
// feature level and the D3D runtime does not support D3D_FEATURE_LEVEL_1_0_GENERIC
jeffbloo marked this conversation as resolved.
Show resolved Hide resolved
HRESULT hrUnused = D3D12CreateDevice(adapter.Get(), D3D_FEATURE_LEVEL_1_0_CORE, IID_GRAPHICS_PPV_ARGS(d3d12_device.ReleaseAndGetAddressOf()));
}

Check warning on line 559 in onnxruntime/core/providers/dml/dml_provider_factory.cc

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]

Raw Output:
onnxruntime/core/providers/dml/dml_provider_factory.cc:559:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
if (!d3d12_device) {
ORT_THROW_IF_FAILED(D3D12CreateDevice(adapter.Get(), feature_level, IID_GRAPHICS_PPV_ARGS(d3d12_device.ReleaseAndGetAddressOf())));
}

return CreateDMLDeviceAndProviderFactory(d3d12_device.Get(), disable_metacommands, enable_dynamic_graph_fusion);
}

Expand Down
4 changes: 2 additions & 2 deletions onnxruntime/core/providers/dml/dml_provider_factory_creator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
#include <memory>

#include <wrl/client.h>
#include <d3d12.h>
#include "directx/d3d12.h"
#include "core/framework/provider_options.h"
#include "core/providers/providers.h"
#include "core/providers/dml/dml_provider_factory.h"

#include <dxcore.h>
#include <directx/dxcore.h>

Check warning on line 14 in onnxruntime/core/providers/dml/dml_provider_factory_creator.h

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 Found C system header after other header. Should be: dml_provider_factory_creator.h, c system, c++ system, other.  [build/include_order] [4]

Raw Output:
onnxruntime/core/providers/dml/dml_provider_factory_creator.h:14:  Found C system header after other header. Should be: dml_provider_factory_creator.h, c system, c++ system, other.  [build/include_order] [4]
#include <vector>

namespace onnxruntime {
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/download-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
packageType: upack
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
version: 1.0.145
version: 1.0.149
jeffbloo marked this conversation as resolved.
Show resolved Hide resolved
downloadPath: $(Build.BinariesDirectory)/deps

# The private ADO project
Expand All @@ -22,7 +22,7 @@ steps:
packageType: upack
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
version: 1.0.145
version: 1.0.149
downloadPath: $(Build.BinariesDirectory)/deps

# You can add more ADO accounts at here.
Loading