From d6340046fa3b6849b59708300546b36c45d04ab5 Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Fri, 19 Jul 2024 12:37:05 -0700 Subject: [PATCH 1/6] Upgrade emsdk from 3.1.59 to 3.1.62 --- cgmanifests/generated/cgmanifest.json | 2 +- cmake/external/emsdk | 2 +- tools/ci_build/build.py | 2 +- .../github/azure-pipelines/templates/linux-wasm-ci.yml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 66b305a6d36de..6804144432ce1 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -6,7 +6,7 @@ "component": { "type": "git", "git": { - "commitHash": "d52c46520124845b1e0e0525f2759299d840143f", + "commitHash": "0fde04880048f743056bed17cb0543a42e040fae", "repositoryUrl": "https://github.com/emscripten-core/emsdk.git" }, "comments": "git submodule at cmake/external/emsdk" diff --git a/cmake/external/emsdk b/cmake/external/emsdk index d52c465201248..0fde04880048f 160000 --- a/cmake/external/emsdk +++ b/cmake/external/emsdk @@ -1 +1 @@ -Subproject commit d52c46520124845b1e0e0525f2759299d840143f +Subproject commit 0fde04880048f743056bed17cb0543a42e040fae diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 98d9ba22b7190..c777187a4a231 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -464,7 +464,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="3.1.59", help="Specify version of emsdk") + parser.add_argument("--emsdk_version", default="3.1.62", 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 a56eb37faef84..3d66c31cea4c8 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 @@ -93,15 +93,15 @@ jobs: - script: | set -ex cd '$(Build.SourcesDirectory)/cmake/external/emsdk' - ./emsdk install 3.1.59 ccache-git-emscripten-64bit - ./emsdk activate 3.1.59 ccache-git-emscripten-64bit + ./emsdk install 3.1.62 ccache-git-emscripten-64bit + ./emsdk activate 3.1.62 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 3.1.59 - ./emsdk activate 3.1.59 + ./emsdk install 3.1.62 + ./emsdk activate 3.1.62 displayName: 'emsdk install and activate ccache for emscripten' - template: build-linux-wasm-step.yml From 53595ec68af59ae6fbf030ad8866f67be4b34247 Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Tue, 23 Jul 2024 16:28:07 -0700 Subject: [PATCH 2/6] Changed the emsdk submodule to 3.1.62. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 29ca8821f8eb8..924f239b197e0 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 = 3.1.59 + branch = 3.1.62 From d66e7f56c19fa57320bb8fdc7e408b15d6d82131 Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Tue, 30 Jul 2024 11:04:59 -0700 Subject: [PATCH 3/6] Try disable accelerated video flag to avoid Chrome crashing. --- tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml index c1fde93d8e640..2a83677b24eea 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml @@ -29,7 +29,7 @@ jobs: pool: ${{ parameters.PoolName }} variables: - webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de' + webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chrom-flags=--disable-accelerated-video-decode' runCodesignValidationInjection: false CHROME_BIN: 'C:\Program Files\Google\Chrome\Application\chrome.exe' timeoutInMinutes: 60 From 831614b1bb834e715039fe465f400c8a4bbf9bb2 Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Tue, 30 Jul 2024 11:07:26 -0700 Subject: [PATCH 4/6] typo --- tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml index 2a83677b24eea..4b45f0f4bda6d 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml @@ -29,7 +29,7 @@ jobs: pool: ${{ parameters.PoolName }} variables: - webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chrom-flags=--disable-accelerated-video-decode' + webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chromium-flags=--disable-accelerated-video-decode' runCodesignValidationInjection: false CHROME_BIN: 'C:\Program Files\Google\Chrome\Application\chrome.exe' timeoutInMinutes: 60 From 86ca602ed6fb5673a49aa5a8aaeb07d845d4907a Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Thu, 1 Aug 2024 13:31:26 -0700 Subject: [PATCH 5/6] Revert "typo" This reverts commit 831614b1bb834e715039fe465f400c8a4bbf9bb2. --- tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml index 4b45f0f4bda6d..2a83677b24eea 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml @@ -29,7 +29,7 @@ jobs: pool: ${{ parameters.PoolName }} variables: - webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chromium-flags=--disable-accelerated-video-decode' + webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chrom-flags=--disable-accelerated-video-decode' runCodesignValidationInjection: false CHROME_BIN: 'C:\Program Files\Google\Chrome\Application\chrome.exe' timeoutInMinutes: 60 From fa53e38c7cd1a3c802be001ef1c7b7bc828d6963 Mon Sep 17 00:00:00 2001 From: Satya Jandhyala Date: Thu, 1 Aug 2024 13:31:35 -0700 Subject: [PATCH 6/6] Revert "Try disable accelerated video flag to avoid Chrome crashing." This reverts commit d66e7f56c19fa57320bb8fdc7e408b15d6d82131. --- tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml index 2a83677b24eea..c1fde93d8e640 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml @@ -29,7 +29,7 @@ jobs: pool: ${{ parameters.PoolName }} variables: - webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de --chrom-flags=--disable-accelerated-video-decode' + webgpuCommandlineExtraFlags: '--chromium-flags=--ignore-gpu-blocklist --chromium-flags=--gpu-vendor-id=0x10de' runCodesignValidationInjection: false CHROME_BIN: 'C:\Program Files\Google\Chrome\Application\chrome.exe' timeoutInMinutes: 60