Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/eng
diff options
context:
space:
mode:
authorRadek Doulik <radek.doulik@gmail.com>2021-06-24 18:20:26 +0300
committerGitHub <noreply@github.com>2021-06-24 18:20:26 +0300
commit055a38a9062c4c9ec3a811eec02f7e37fb1fbbd5 (patch)
tree0f3a13e7ddbaf76625e28a4ae049ad572e86d6f0 /eng
parent458bb9efd1de6544aa2a1645ba699ef7e59889df (diff)
[wasm] Bump emscripten to 2.0.23 (#53603)
Bumps emscripten to 2.0.23 The Browser AOT tests now use `-Wl,-lto-O0` option to reduce memory usage of `wasm-ld` tool, which was in some cases going over avaiable 8GB on helix machines. * Revert "Add ActiveIssue to the MemoryMappedFiles tests" This reverts commit ec1ae530606ef1061680600fc046226cc1c4cbc3. * Revert "Add ActiveIssue attr to the FileSystem tests" This reverts commit 356b3ff2a703980ac01b9df697a594e8c341c436. * Bump emscripten version to 2.0.23 * Use newer docker images with 2.0.23 * Update docs * Use 2.0.23 emscripten nuget packages * Revert "Revert "Add ActiveIssue attr to the FileSystem tests"" This reverts commit eb2f9548b08c114b359fab8d867ba50de098fe48. The fix is not present in 2.0.23 * Revert "Revert "Add ActiveIssue to the MemoryMappedFiles tests"" This reverts commit 8be39f583499a8d8451034c65260a785330b0795. The fix is not present in 2.0.23 * Increase timeout for AOT tests * Add description of emscripten bump to README * Try to get information about resources * Get all limits * Escape & chars * Reduce platform matrix * Lets try one more build with doubled timeout * Revert "Lets try one more build with doubled timeout" This reverts commit 67dd7754bb79218b2c6b687034162d041715093e. * Try -Wl,-O0 on CI To be sure it behaves the same as in local build * Use -Wl,-lto-O0 do lower link time optimization It looks like it reduces the memory load a lot * Set EmccLinkOptimizationFlag for AOT tests And reset the default value * Escape commas * Revert "Reduce platform matrix" This reverts commit fec0e557208eb165824e75cd57b895a74d164de4. * Remove resource info retrieval * Bump emsdk versions Co-authored-by: Larry Ewing <lewing@microsoft.com>
Diffstat (limited to 'eng')
-rw-r--r--eng/Version.Details.xml4
-rw-r--r--eng/Versions.props4
-rw-r--r--eng/pipelines/common/platform-matrix.yml2
-rw-r--r--eng/pipelines/libraries/helix-queues-setup.yml2
-rw-r--r--eng/testing/tests.wasm.targets2
5 files changed, 7 insertions, 7 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5c1f457ae40..9c44cabfca8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -207,9 +207,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.21.Node.win-x64" Version="6.0.0-preview.6.21275.1">
+ <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21323.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>defa37b05c734e025292c5747664e970cd2ac444</Sha>
+ <Sha>617928847d1e11458527b8bbafb5577982291847</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21311.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a194baa33de..3b887fae24a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -176,7 +176,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21308.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21308.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
- <MicrosoftNETRuntimeEmscripten2021Nodewinx64Version>6.0.0-preview.6.21275.1</MicrosoftNETRuntimeEmscripten2021Nodewinx64Version>
- <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETRuntimeEmscripten2021Nodewinx64Version)</MicrosoftNETRuntimeEmscriptenVersion>
+ <MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>6.0.0-preview.7.21323.1</MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>
+ <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETRuntimeEmscripten2023Nodewinx64Version)</MicrosoftNETRuntimeEmscriptenVersion>
</PropertyGroup>
</Project>
diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index daedd73b0e4..defd34be84a 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -219,7 +219,7 @@ jobs:
targetRid: browser-wasm
platform: Browser_wasm
container:
- image: ubuntu-18.04-webassembly-20210519131124-ba00c14
+ image: ubuntu-18.04-webassembly-20210531091624-f5c7a43
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index b766f1af96a..7d33d26edb0 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -189,6 +189,6 @@ jobs:
# WebAssembly windows
- ${{ if eq(parameters.platform, 'Browser_wasm_win') }}:
- - (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h1.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210519130955-ba00c14
+ - (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h1.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210531091615-f5c7a43
${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets
index de4432bee9f..aa4fb305dbd 100644
--- a/eng/testing/tests.wasm.targets
+++ b/eng/testing/tests.wasm.targets
@@ -40,7 +40,7 @@
<!-- running aot-helix tests locally, so we can test with the same project file as CI -->
<_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand>
- <_AOTBuildCommand>$(_AOTBuildCommand) /p:RunAOTCompilation=$(RunAOTCompilation)</_AOTBuildCommand>
+ <_AOTBuildCommand>$(_AOTBuildCommand) /p:RunAOTCompilation=$(RunAOTCompilation) /p:EmccLinkOptimizationFlag='-Oz -Wl%252C-O0 -Wl%252C-lto-O0'</_AOTBuildCommand>
<_AOTBuildCommand>$(_AOTBuildCommand) &amp;&amp; cd wasm_build/AppBundle</_AOTBuildCommand>
<RunScriptCommand Condition="'$(RunScriptCommand)' == ''">$(_AOTBuildCommand)</RunScriptCommand>