[wasm] Re-enable source generator tests failing due to OOM #60701
[wasm] add $(IsHighAotMemoryUsageTest) to use different optimization …
…options for avoiding OOM .. and use a separate script template for AOT builds.
- Loading branch information
commit 8436395924bd9e1341197e04e4394f3974a4e6da
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| EXECUTION_DIR=$(dirname $0) | ||
| SCENARIO=$3 | ||
|
|
||
| cd $EXECUTION_DIR | ||
|
|
||
| if [ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]; then | ||
| XHARNESS_OUT="$EXECUTION_DIR/xharness-output" | ||
| else | ||
| XHARNESS_OUT="$HELIX_WORKITEM_UPLOAD_ROOT/xharness-output" | ||
| fi | ||
|
|
||
| if [ ! -z "$XHARNESS_CLI_PATH" ]; then | ||
| # When running in CI, we only have the .NET runtime available | ||
| # We need to call the XHarness CLI DLL directly via dotnet exec | ||
| HARNESS_RUNNER="dotnet exec $XHARNESS_CLI_PATH" | ||
| else | ||
| HARNESS_RUNNER="dotnet xharness" | ||
| fi | ||
|
|
||
| if [ "$SCENARIO" == "WasmTestOnBrowser" ]; then | ||
| XHARNESS_COMMAND="test-browser" | ||
| elif [ -z "$XHARNESS_COMMAND" ]; then | ||
| XHARNESS_COMMAND="test" | ||
| fi | ||
|
|
||
| function BuildAOT() | ||
| { | ||
| local projectFile=$1 | ||
| local binLog=$2 | ||
| shift 2 | ||
|
|
||
| time dotnet msbuild $projectFile /bl:$binLog $* | ||
| local buildExitCode=$? | ||
|
|
||
| echo "\n** Performance summary for the build **\n" | ||
| dotnet msbuild $binLog -clp:PerformanceSummary -v:q -nologo | ||
| if [[ "$(uname -s)" == "Linux" && $buildExitCode -ne 0 ]]; then | ||
| echo "\nLast few messages from dmesg:\n" | ||
| dmesg | tail -n 20 | ||
| fi | ||
|
|
||
| echo | ||
| echo | ||
|
|
||
| return $buildExitCode | ||
| } | ||
|
|
||
| # RunCommands defined in tests.mobile.targets | ||
| [[RunCommands]] | ||
|
|
||
| _exitCode=$? | ||
|
|
||
| echo "XHarness artifacts: $XHARNESS_OUT" | ||
|
|
||
| exit $_exitCode |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,12 +38,12 @@ | |
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(BuildAOTTestsOnHelix)' == 'true'"> | ||
| <_AOTBuildCommand>BuildAOT publish/ProxyProjectForAOTOnHelix.proj $XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand> | ||
|
|
||
| <!-- 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) && cd wasm_build/AppBundle</_AOTBuildCommand> | ||
|
|
||
| <RunScriptCommand Condition="'$(RunScriptCommand)' == ''">$(_AOTBuildCommand)</RunScriptCommand> | ||
|
|
@@ -87,9 +87,15 @@ | |
| AssemblyFile="$(WasmBuildTasksAssemblyPath)" /> | ||
|
|
||
| <Target Name="_BundleAOTTestWasmAppForHelix" DependsOnTargets="PrepareForWasmBuildApp"> | ||
| <PropertyGroup Condition="'$(IsHighAotMemoryUsageTest)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true'"> | ||
| <DisableParallelEmccCompile Condition="'$(DisableParallelEmccCompile)' == ''">true</DisableParallelEmccCompile> | ||
| <EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-O2</EmccLinkOptimizationFlag> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <_MainAssemblyPath Condition="'%(WasmAssembliesToBundle.FileName)' == $(AssemblyName) and '%(WasmAssembliesToBundle.Extension)' == '.dll'">%(WasmAssembliesToBundle.Identity)</_MainAssemblyPath> | ||
| <RuntimeConfigFilePath>$([System.IO.Path]::ChangeExtension($(_MainAssemblyPath), '.runtimeconfig.json'))</RuntimeConfigFilePath> | ||
| <EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-Oz -Wl%252C-O0 -Wl%252C-lto-O0</EmccLinkOptimizationFlag> | ||
|
Member
There was a problem hiding this comment. An xml comment (doesn't need to be long) explaining why these specific flags were selected would be great here
Member
Author
There was a problem hiding this comment. I'll leave this one for @radekdoulik to add, since he set these originally. |
||
| </PropertyGroup> | ||
|
|
||
| <Error Text="Item WasmAssembliesToBundle is empty. This is likely an authoring error." Condition="@(WasmAssembliesToBundle->Count()) == 0" /> | ||
|
|
@@ -111,15 +117,20 @@ | |
| <!-- To recreate the original project on helix, we need to set the wasm properties also, same as the | ||
| library test project. Eg. $(InvariantGlobalization) --> | ||
| <ItemGroup> | ||
| <_WasmPropertyNames Include="AOTMode" /> | ||
| <_WasmPropertyNames Include="AssemblyName" /> | ||
| <_WasmPropertyNames Include="DisableParallelAot" /> | ||
| <_WasmPropertyNames Include="DisableParallelEmccCompile" /> | ||
| <_WasmPropertyNames Include="EmccCompileOptimizationFlag" /> | ||
| <_WasmPropertyNames Include="EmccLinkOptimizationFlag" /> | ||
| <_WasmPropertyNames Include="IncludeSatelliteAssembliesInVFS" /> | ||
| <_WasmPropertyNames Include="InvariantGlobalization" /> | ||
| <_WasmPropertyNames Include="WasmBuildNative" /> | ||
| <_WasmPropertyNames Include="WasmDebugLevel" /> | ||
| <_WasmPropertyNames Include="WasmDedup" /> | ||
| <_WasmPropertyNames Include="WasmLinkIcalls" /> | ||
| <_WasmPropertyNames Include="WasmNativeStrip" /> | ||
| <_WasmPropertyNames Include="_WasmDevel" /> | ||
|
|
||
| <_WasmPropertiesToPass | ||
| Include="$(%(_WasmPropertyNames.Identity))" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way to clearly communicate that this is a function defined in a script, and not a command? (Will it work on Windows?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hm how about naming it
_buildAOTFunc? or just_buildAOTeven.re:windows, we are not running these on windows yet. And I have a separate PR for that, where I can add the cmd/ps1 equivalent of the new template script.