mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-12 00:59:23 +00:00
7a8fa12850
### Description This PR adds the actual implementation of the WebGPU EP based on https://github.com/microsoft/onnxruntime/pull/22318. This change includes the following: <details> <summary><b>core framework of WebGPU EP</b></summary> - WebGPU EP factory classes for: - handling WebGPU options - creating WebGPU EP instance - creating WebGPU context - WebGPU Execution Provider classes - GPU Buffer allocator - data transfer - Buffer management classes - Buffer Manager - BufferCacheManager - DisabledCacheManager - SimpleCacheManager - LazyReleaseCacheManager - BucketCacheManager - Program classes - Program (base) - Program Cache Key - Program Manager - Shader helper classes - Shader Helper - ShaderIndicesHelper - ShaderVariableHelper - Utils - GPU Query based profiler - compute context - string utils - Miscs - Python binding webgpu support (basic) </details> <details> <summary><b>Kernel implementation</b></summary> - onnx.ai (default opset): - Elementwise (math): Abs, Neg, Floor, Ceil, Reciprocal, Sqrt, Exp, Erf, Log, Sin, Cos, Tan, Asin, Acos, Atan, Sinh, Cosh, Asinh, Acosh, Atanh, Tanh, Not, Cast - Elementwise (activation): Sigmoid, HardSigmoid, Clip, Elu, Relu, LeakyRelu, ThresholdedRelu, Gelu - Binary (math): Add, Sub, Mul, Div, Pow, Equal, Greater, GreaterOrEqual, Less, LessOrEqual - (Tensors): Shape, Reshape, Squeeze, Unsqueeze - Where - Transpose - Concat - Expand - Gather - Tile - Range - LayerNormalization - com.microsoft - FastGelu - MatMulNBits - MultiHeadAttention - RotaryEmbedding - SkipLayerNormalization - LayerNormalization - SimplifiedLayerNormalization - SkipSimplifiedLayerNormalization </details> <details> <summary><b>Build, test and CI pipeline integration</b></summary> - build works for Windows, macOS and iOS - support onnxruntime_test_all and python node test - added a new unit test for `--use_external_dawn` build flag. - updated MacOS pipeline to build with WebGPU support - added a new pipeline for WebGPU Windows </details> This change does not include: - Node.js binding support for WebGPU (will be a separate PR)
81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
|
|
index 9c0bd6fa4e..bf8a57aeac 100644
|
|
--- a/src/dawn/native/CMakeLists.txt
|
|
+++ b/src/dawn/native/CMakeLists.txt
|
|
@@ -857,6 +857,11 @@ if (DAWN_ENABLE_SWIFTSHADER)
|
|
target_compile_definitions(dawn_native PRIVATE "DAWN_ENABLE_SWIFTSHADER")
|
|
endif()
|
|
|
|
+if (IOS)
|
|
+ target_compile_options(dawn_native_objects PRIVATE -fno-objc-arc)
|
|
+ target_compile_options(dawn_native PRIVATE -fno-objc-arc)
|
|
+endif()
|
|
+
|
|
if (DAWN_BUILD_MONOLITHIC_LIBRARY)
|
|
###############################################################################
|
|
# Do the 'complete_lib' build.
|
|
diff --git a/src/dawn/native/Surface_metal.mm b/src/dawn/native/Surface_metal.mm
|
|
index ce55acbd43..2cfd363479 100644
|
|
--- a/src/dawn/native/Surface_metal.mm
|
|
+++ b/src/dawn/native/Surface_metal.mm
|
|
@@ -33,10 +33,18 @@
|
|
|
|
#import <QuartzCore/CAMetalLayer.h>
|
|
|
|
+#include "dawn/common/Platform.h"
|
|
+
|
|
namespace dawn::native {
|
|
|
|
bool InheritsFromCAMetalLayer(void* obj) {
|
|
- id<NSObject> object = static_cast<id>(obj);
|
|
+ id<NSObject> object =
|
|
+#if DAWN_PLATFORM_IS(IOS)
|
|
+ (__bridge id)obj;
|
|
+#else // DAWN_PLATFORM_IS(IOS)
|
|
+ static_cast<id>(obj);
|
|
+#endif // DAWN_PLATFORM_IS(IOS)
|
|
+
|
|
return [object isKindOfClass:[CAMetalLayer class]];
|
|
}
|
|
|
|
diff --git a/src/dawn/native/metal/SharedFenceMTL.mm b/src/dawn/native/metal/SharedFenceMTL.mm
|
|
index bde8bfea07..8906185d6f 100644
|
|
--- a/src/dawn/native/metal/SharedFenceMTL.mm
|
|
+++ b/src/dawn/native/metal/SharedFenceMTL.mm
|
|
@@ -25,6 +25,8 @@
|
|
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
+#include "dawn/common/Platform.h"
|
|
+
|
|
#include "dawn/native/metal/SharedFenceMTL.h"
|
|
|
|
#include "dawn/native/ChainUtils.h"
|
|
@@ -39,8 +41,13 @@ ResultOrError<Ref<SharedFence>> SharedFence::Create(
|
|
const SharedFenceMTLSharedEventDescriptor* descriptor) {
|
|
DAWN_INVALID_IF(descriptor->sharedEvent == nullptr, "MTLSharedEvent is missing.");
|
|
if (@available(macOS 10.14, iOS 12.0, *)) {
|
|
- return AcquireRef(new SharedFence(
|
|
- device, label, static_cast<id<MTLSharedEvent>>(descriptor->sharedEvent)));
|
|
+ return AcquireRef(new SharedFence(device, label,
|
|
+#if DAWN_PLATFORM_IS(IOS)
|
|
+ (__bridge id<MTLSharedEvent>)(descriptor->sharedEvent)
|
|
+#else // DAWN_PLATFORM_IS(IOS)
|
|
+ static_cast<id<MTLSharedEvent>>(descriptor->sharedEvent)
|
|
+#endif // DAWN_PLATFORM_IS(IOS)
|
|
+ ));
|
|
} else {
|
|
return DAWN_INTERNAL_ERROR("MTLSharedEvent not supported.");
|
|
}
|
|
diff --git a/src/tint/api/BUILD.cmake b/src/tint/api/BUILD.cmake
|
|
index 0037d83276..6372c4ee77 100644
|
|
--- a/src/tint/api/BUILD.cmake
|
|
+++ b/src/tint/api/BUILD.cmake
|
|
@@ -57,6 +57,7 @@ tint_target_add_dependencies(tint_api lib
|
|
tint_lang_wgsl_ast_transform
|
|
tint_lang_wgsl_common
|
|
tint_lang_wgsl_features
|
|
+ tint_lang_wgsl_inspector
|
|
tint_lang_wgsl_program
|
|
tint_lang_wgsl_sem
|
|
tint_lang_wgsl_writer_ir_to_program
|