From ce7e80e99c70c44ef0c27488eadf8545761e6e6d Mon Sep 17 00:00:00 2001
From: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:49:09 -0800
Subject: [PATCH] Revert "Upgrade emsdk version to v4.0.3 (#23633)"

This reverts commit e6ae1bb13c9ec5ee1ef3f0428c46ef8607728848.
---
 .gitmodules                                   |   2 +-
 cmake/external/emsdk                          |   2 +-
 .../external/onnxruntime_external_deps.cmake  |  28 ++++++---
 cmake/onnxruntime_webassembly.cmake           |  55 ------------------
 cmake/patches/dawn/dawn.patch                 |  23 --------
 cmake/patches/emscripten/patch_3.1.74.tgz     | Bin 0 -> 4655 bytes
 tools/ci_build/build.py                       |   2 +-
 .../templates/linux-wasm-ci.yml               |  10 ++--
 8 files changed, 28 insertions(+), 94 deletions(-)
 delete mode 100644 cmake/patches/dawn/dawn.patch
 create mode 100644 cmake/patches/emscripten/patch_3.1.74.tgz

diff --git a/.gitmodules b/.gitmodules
index 356447cbf7a98..29ca8821f8eb8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,4 +7,4 @@
 [submodule "cmake/external/emsdk"]
 	path = cmake/external/emsdk
 	url = https://github.com/emscripten-core/emsdk.git
-	branch = 4.0.3
+	branch = 3.1.59
diff --git a/cmake/external/emsdk b/cmake/external/emsdk
index 127ce42cd5f0a..d52c465201248 160000
--- a/cmake/external/emsdk
+++ b/cmake/external/emsdk
@@ -1 +1 @@
-Subproject commit 127ce42cd5f0aabe2d9b5d636041ccef7c66d165
+Subproject commit d52c46520124845b1e0e0525f2759299d840143f
diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake
index 2feff6475ebf7..801d2292e0f74 100644
--- a/cmake/external/onnxruntime_external_deps.cmake
+++ b/cmake/external/onnxruntime_external_deps.cmake
@@ -510,7 +510,7 @@ else()
   message("Setting pybind11_dep")
   set(pybind11_dep pybind11::pybind11)
 endif()
-
+  
 endif()
 onnxruntime_fetchcontent_declare(
   onnx
@@ -559,7 +559,7 @@ if (onnxruntime_USE_XNNPACK)
      find_library(xnnpack_LIBRARY NAMES XNNPACK)
      find_library(microkernels_prod_LIBRARY NAMES microkernels-prod)
      find_package(unofficial-pthreadpool CONFIG REQUIRED)
-
+     
      target_include_directories(xnnpack INTERFACE "${XNNPACK_HDR}")
      set(XNNPACK_INCLUDE_DIR ${XNNPACK_DIR}/include)
      set(onnxruntime_EXTERNAL_LIBRARIES_XNNPACK ${xnnpack_LIBRARY} ${microkernels_prod_LIBRARY} unofficial::pthreadpool unofficial::pthreadpool_interface)
@@ -643,12 +643,10 @@ if (onnxruntime_USE_WEBGPU)
       dawn
       URL ${DEP_URL_dawn}
       URL_HASH SHA1=${DEP_SHA1_dawn}
-      # # All previous patches are merged into the upstream dawn project. We don't need to apply any patches right now.
-      # # if we need to apply patches in the future, we can uncomment the following line.
-      #
-      # The dawn.patch contains the following changes:
-      # - https://dawn-review.googlesource.com/c/dawn/+/225514
-      PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/dawn.patch
+      # All previous patches are merged into the upstream dawn project. We don't need to apply any patches right now.
+      # if we need to apply patches in the future, we can uncomment the following line.
+
+      # PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/dawn.patch
       EXCLUDE_FROM_ALL
     )
   endif()
@@ -659,6 +657,20 @@ if (onnxruntime_USE_WEBGPU)
 
   if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     set(DAWN_EMSCRIPTEN_TOOLCHAIN "${REPO_ROOT}/cmake/external/emsdk/upstream/emscripten" CACHE STRING "" FORCE)
+
+    # Add the missing files from the emsdk installation
+    #
+    # For a "standard" emscripten build, the folder "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/maint/" is not used. This is the
+    # reason why EMSDK installation does not include it.
+    # However, currently the WebGPU support in Emscripten is still being developed and the Dawn project is maintaining
+    # a fork of the Emscripten toolchain. As an extra build step, Dawn needs to generate some files using the file
+    # "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/maint/gen_struct_info.py" from emscripten, which is missing in the emscripten
+    # installed by emsdk.
+    #
+    # We keep a copy of the missing file(s) in ${PROJECT_SOURCE_DIR}/patches/emscripten/, and now we extract them to the
+    # emscripten toolchain folder.
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar x "${PROJECT_SOURCE_DIR}/patches/emscripten/patch_3.1.74.tgz"
+                    WORKING_DIRECTORY ${DAWN_EMSCRIPTEN_TOOLCHAIN})
   else()
     if (onnxruntime_BUILD_DAWN_MONOLITHIC_LIBRARY)
       set(DAWN_BUILD_MONOLITHIC_LIBRARY ON CACHE BOOL "" FORCE)
diff --git a/cmake/onnxruntime_webassembly.cmake b/cmake/onnxruntime_webassembly.cmake
index 2c4cdebcf450a..6cd05d1ad024b 100644
--- a/cmake/onnxruntime_webassembly.cmake
+++ b/cmake/onnxruntime_webassembly.cmake
@@ -472,59 +472,4 @@ jsepDownload:_pp_")
   endif()
 
   set_target_properties(onnxruntime_webassembly PROPERTIES OUTPUT_NAME ${target_name} SUFFIX ".mjs")
-
-  #
-  # The following POST_BUILD script is a workaround for enabling:
-  # - using onnxruntime-web with Multi-threading enabled when import from CDN
-  # - using onnxruntime-web when consumed in some frameworks like Vite
-  #
-  # In the use case mentioned above, the file name of the script may be changed. So we need to replace the line:
-  # `new Worker(new URL("ort-wasm-*.mjs", import.meta.url),`
-  # with
-  # `new Worker(new URL(import.meta.url),`
-  #
-  # This behavior is introduced in https://github.com/emscripten-core/emscripten/pull/22165. Since it's unlikely to be
-  # reverted, and there is no config to disable this behavior, we have to use a post-build script to workaround it.
-  #
-
-  # Generate a script to do the post-build work
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/wasm_post_build.js "
-    const fs = require('fs');
-    const path = require('path');
-
-    // node wasm_post_build.js <mjsFilePath>
-    const mjsFilePath = process.argv[2];
-    let contents = fs.readFileSync(mjsFilePath).toString();
-
-    const regex = 'new Worker\\\\(new URL\\\\(\".+?\", ?import\\\\.meta\\\\.url\\\\),';
-    const matches = [...contents.matchAll(new RegExp(regex, 'g'))];
-    if (matches.length !== 1) {
-      throw new Error(
-        `Unexpected number of matches for \"${regex}\" in \"${filepath}\": ${matches.length}.`,
-      );
-    }
-
-    // Replace the only occurrence.
-    contents = contents.replace(
-      new RegExp(regex),
-      `new Worker(new URL(import.meta.url),`,
-    );
-
-    fs.writeFileSync(mjsFilePath, contents);
-  "
-  )
-
-  find_program(NODE_EXECUTABLE node required)
-  if (NOT NODE_EXECUTABLE)
-    message(FATAL_ERROR "Node is required to run the post-build script")
-  endif()
-
-  add_custom_command(
-    TARGET onnxruntime_webassembly
-    POST_BUILD
-    # Backup file at $<TARGET_FILE_NAME:onnxruntime_webassembly>.bak
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE_NAME:onnxruntime_webassembly>" "$<TARGET_FILE_NAME:onnxruntime_webassembly>.bak"
-    COMMAND ${CMAKE_COMMAND} -E echo "Performing post-process for $<TARGET_FILE_NAME:onnxruntime_webassembly>"
-    COMMAND ${NODE_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/wasm_post_build.js" "$<TARGET_FILE_NAME:onnxruntime_webassembly>"
-  )
 endif()
diff --git a/cmake/patches/dawn/dawn.patch b/cmake/patches/dawn/dawn.patch
deleted file mode 100644
index e7fd935cb9cb1..0000000000000
--- a/cmake/patches/dawn/dawn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/emdawnwebgpu/CMakeLists.txt b/src/emdawnwebgpu/CMakeLists.txt
-index 6e8ae37593..633af91eef 100644
---- a/src/emdawnwebgpu/CMakeLists.txt
-+++ b/src/emdawnwebgpu/CMakeLists.txt
-@@ -77,9 +77,17 @@ if (${DAWN_ENABLE_EMSCRIPTEN})
-                 "${arg_UNPARSED_ARGUMENTS}")
-         endif()
- 
-+        # since Emscripten 4.0.3, file gen_struct_info.py is moved to outside of directory maint.
-+        if (EXISTS "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/gen_struct_info.py")
-+            set(EM_GEN_STRUCT_INFO_SCRIPT "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/gen_struct_info.py")
-+        elseif (EXISTS "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/maint/gen_struct_info.py")
-+            set(EM_GEN_STRUCT_INFO_SCRIPT "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/maint/gen_struct_info.py")
-+        else()
-+            message(FATAL_ERROR "Dawn: Failed to locate file gen_struct_info.py from Emscripten.")
-+        endif()
-         set(ARGS
-             ${Python3_EXECUTABLE}
--            "${DAWN_EMSCRIPTEN_TOOLCHAIN}/tools/maint/gen_struct_info.py"
-+            "${EM_GEN_STRUCT_INFO_SCRIPT}"
-             -q
-             "${EM_BUILD_GEN_DIR}/struct_info_webgpu.json"
-             "-I=${EM_BUILD_GEN_DIR}/include"
diff --git a/cmake/patches/emscripten/patch_3.1.74.tgz b/cmake/patches/emscripten/patch_3.1.74.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..cfb52de6386538aede41508e829843fecc858433
GIT binary patch
literal 4655
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

literal 0
HcmV?d00001

diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index c234a69a73ed8..36de85ea2ebdb 100644
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -488,7 +488,7 @@ def convert_arg_line_to_args(self, arg_line):
     # WebAssembly build
     parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly")
     parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build for WebAssembly static library")
-    parser.add_argument("--emsdk_version", default="4.0.3", help="Specify version of emsdk")
+    parser.add_argument("--emsdk_version", default="3.1.59", help="Specify version of emsdk")
 
     parser.add_argument("--enable_wasm_simd", action="store_true", help="Enable WebAssembly SIMD")
     parser.add_argument("--enable_wasm_threads", action="store_true", help="Enable WebAssembly multi-threads support")
diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
index 44d7d2482b141..c0bc9605212b9 100644
--- a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
@@ -45,7 +45,7 @@ jobs:
     name: ${{ parameters.PoolName }}
   variables:
     buildArch: x64
-    CommonBuildArgs: '--parallel --config ${{ parameters.BuildConfig }} --skip_submodule_sync --build_wasm --enable_wasm_simd --enable_wasm_threads ${{ parameters.ExtraBuildArgs }}'
+    CommonBuildArgs: '--parallel --config ${{ parameters.BuildConfig }} --skip_submodule_sync --build_wasm --enable_wasm_simd --enable_wasm_threads --use_extensions --cmake_extra_defines onnxruntime_WEBASSEMBLY_DEFAULT_EXTENSION_FLAGS=ON ${{ parameters.ExtraBuildArgs }}'
     runCodesignValidationInjection: false
     TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
     ORT_CACHE_DIR: $(Agent.TempDirectory)/ort_ccache
@@ -82,15 +82,15 @@ jobs:
       - script: |
           set -ex
           cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
-          ./emsdk install 4.0.3 ccache-git-emscripten-64bit
-          ./emsdk activate 4.0.3 ccache-git-emscripten-64bit
+          ./emsdk install 3.1.59 ccache-git-emscripten-64bit
+          ./emsdk activate 3.1.59 ccache-git-emscripten-64bit
         displayName: 'emsdk install and activate ccache for emscripten'
   - ${{if eq(parameters.WithCache, false)}}:
       - script: |
           set -ex
           cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
-          ./emsdk install 4.0.3
-          ./emsdk activate 4.0.3
+          ./emsdk install 3.1.59
+          ./emsdk activate 3.1.59
         displayName: 'emsdk install and activate ccache for emscripten'
 
   - template: build-linux-wasm-step.yml