upgrade dawn to 13c1635a14574ebb7116b56a69f5519301417fda (#25703)

### Description

Upgrade dawn. Following up of #25461.

This PR includes:
- Fix to bug introduced by
google/dawn@062be63.
Revert temporary workaround
- make corresponding changes to
https://dawn-review.googlesource.com/c/dawn/+/251714 (remove DLL preload
since it's correctly handled in dawn)
- fix Java binding (missing dxc DLLs)



Tasks:
- [x] verify emscripten build (debug/release)
- [ ] verify node.js binding

Author: fs-eire

cmake/deps.txt

@@ -55,6 +55,6 @@ cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.9.2.zip;b7f8dc4a8
 extensions;https://github.com/microsoft/onnxruntime-extensions/archive/c24b7bab0c12f53da76d0c31b03b9f0f8ec8f3b4.zip;239063aee4946a9af147b473a4c3da78ba7413b4
 directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
 cudnn_frontend;https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v1.12.0.zip;7e733cfdc410d777b76122d64232499205589a96
-dawn;https://github.com/google/dawn/archive/794b6fadc4171f7b853a77ffdf0948fbec431f41.zip;77bb02deace0d140411f02a2fb8f5f925ea6a1b6
+dawn;https://github.com/google/dawn/archive/13c1635a14574ebb7116b56a69f5519301417fda.zip;0aadd28fc385cf7d657d5fc70a352372d2d3c76a
 kleidiai;https://github.com/ARM-software/kleidiai/archive/refs/tags/v1.9.0.tar.gz;a2765979f64efb173a4b8ba4de39dcba9c655786
 duktape;https://github.com/svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz;8200c8e417dbab7adcc12c4dbdef7651cfc55794

java/src/main/java/ai/onnxruntime/OnnxRuntime.java

@@ -84,6 +84,12 @@ final class OnnxRuntime {
   /** The short name of the WebGPU DAWN library */
   static final String ONNXRUNTIME_LIBRARY_WEBGPU_DAWN_NAME = "webgpu_dawn";
 
+  /** The short name of the WebGPU DXC library "dxil.dll" */
+  static final String ONNXRUNTIME_LIBRARY_WEBGPU_DXC_DXIL_NAME = "dxil";
+
+  /** The short name of the WebGPU DXC library "dxcompiler.dll" */
+  static final String ONNXRUNTIME_LIBRARY_WEBGPU_DXC_DXCOMPILER_NAME = "dxcompiler";
+
   /** The OS & CPU architecture string */
   private static final String OS_ARCH_STR = initOsArch();
 
@@ -172,9 +178,11 @@ static synchronized void init() throws IOException {
       // the ONNX Runtime native library will load it
       extractProviderLibrary(ONNXRUNTIME_LIBRARY_SHARED_NAME);
 
-      // Extract and prepare the Dawn shared library (if present) but don't try to load it,
-      // the ONNX Runtime native library will load it
+      // Extract and prepare the Dawn shared libraries (if present) but don't try to load them,
+      // the ONNX Runtime native library will load them
       extractProviderLibrary(ONNXRUNTIME_LIBRARY_WEBGPU_DAWN_NAME);
+      extractProviderLibrary(ONNXRUNTIME_LIBRARY_WEBGPU_DXC_DXIL_NAME);
+      extractProviderLibrary(ONNXRUNTIME_LIBRARY_WEBGPU_DXC_DXCOMPILER_NAME);
 
       if (!isAndroid()) {
         load(ONNXRUNTIME_LIBRARY_NAME);

onnxruntime/core/providers/webgpu/webgpu_context.cc

@@ -41,30 +41,6 @@ void WebGpuContext::Initialize(const WebGpuBufferCacheConfig& buffer_cache_confi
   std::call_once(init_flag_, [this, &buffer_cache_config, backend_type, enable_pix_capture]() {
     if (device_ == nullptr) {
       // Create wgpu::Adapter
-#if !defined(__wasm__) && defined(_MSC_VER) && defined(DAWN_ENABLE_D3D12) && !defined(USE_EXTERNAL_DAWN)
-      // If we are using the D3D12 backend on Windows and the build does not use external Dawn, dxil.dll and dxcompiler.dll are required.
-      //
-      // Dawn will try to load them later, but if they are in the different directory to the executable, it may fail to find them.
-      // To avoid this issue, we try to load them from the same directory as current module (usually onnxruntime.dll).
-      auto runtime_path = Env::Default().GetRuntimePath();
-      if (!runtime_path.empty()) {
-        Status status;
-        void* module_handle = nullptr;
-
-        PathString dxil_path = runtime_path + ToPathString(L"dxil.dll");
-        status = Env::Default().LoadDynamicLibrary(dxil_path, false, &module_handle);
-        if (status.IsOK() && module_handle != nullptr) {
-          modules_.Add(dxil_path, module_handle);
-        }
-
-        PathString dxcompiler_path = runtime_path + ToPathString(L"dxcompiler.dll");
-        status = Env::Default().LoadDynamicLibrary(dxcompiler_path, false, &module_handle);
-        if (status.IsOK() && module_handle != nullptr) {
-          modules_.Add(dxcompiler_path, module_handle);
-        }
-      }
-#endif
-
       wgpu::RequestAdapterOptions req_adapter_options = {};
       req_adapter_options.backendType = static_cast<wgpu::BackendType>(backend_type);
       req_adapter_options.powerPreference = wgpu::PowerPreference::HighPerformance;

onnxruntime/core/providers/webgpu/webgpu_context.h

@@ -9,7 +9,6 @@
 #include "core/providers/webgpu/webgpu_external_header.h"
 
 #include "core/common/common.h"
-#include "core/framework/library_handles.h"
 #include "core/providers/webgpu/buffer_manager.h"
 #include "core/providers/webgpu/program_manager.h"
 
@@ -227,8 +226,6 @@ class WebGpuContext final {
 
   std::once_flag init_flag_;
 
-  LibraryHandles modules_;
-
   wgpu::Instance instance_;
   wgpu::Device device_;
 

onnxruntime/wasm/wasm_post_build.js

@@ -47,49 +47,4 @@ if (path.basename(mjsFilePath).includes('-threaded')) {
     );
 }
 
-// STEP.2 - Workaround the issue referred in https://issues.chromium.org/issues/435879324
-
-// Closure compiler will minimize the key of object `FeatureNameString2Enum`, turning `subgroup` into something else.
-
-// This workaround is to replace the generated code as following:
-//
-// (for debug build)
-//
-// > subgroups: "18",
-// --- change to -->
-// > "subgroups": "18",
-//
-// (for release build)
-//
-// > Pe:"18",
-// --- change to -->
-// > "subgroups":"18",
-//
-
-// This step should only be applied for WebGPU EP builds
-if (path.basename(mjsFilePath).includes('.async')) {
-    const regexDebug = 'subgroups: "18"';
-    const regexRelease = '[a-zA-Z_$][a-zA-Z0-9_$]*:"18"';
-
-    const matchesDebug = [...contents.matchAll(new RegExp(regexDebug, 'g'))];
-    const matchesRelease = [...contents.matchAll(new RegExp(regexRelease, 'g'))];
-
-    if (matchesDebug.length === 1 && matchesRelease.length === 0) {
-        contents = contents.replace(
-            new RegExp(regexDebug),
-            '"subgroups": "18"',
-        );
-    } else if (matchesDebug.length === 0 && matchesRelease.length === 1) {
-        contents = contents.replace(
-            new RegExp(regexRelease),
-            '"subgroups":"18"',
-        );
-    } else {
-        throw new Error(
-            `Unexpected number of matches for "${regexDebug}" and "${regexRelease}" in "${mjsFilePath}": Debug=${matchesDebug.length}, Release=${matchesRelease.length}.`,
-        );
-    }
-}
-
-
 fs.writeFileSync(mjsFilePath, contents);