[wasm] Re-enable source generator tests failing due to OOM #60701
Conversation
This file contains 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
d1b85d7 to
9cbdbf3
Compare
.. path. This shows up at runtime as a cryptic `FS Error`, because it fails to create the parent directory.
…options for avoiding OOM .. and use a separate script template for AOT builds.
- `Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests` - `Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests` - `System.Text.Json.SourceGeneration.Roslyn3.11.Unit.Tests` - `System.Text.Json.SourceGeneration.Roslyn4.0.Unit.Tests` - `System.Text.RegularExpressions.Generators.Tests` Some individual ones are disabled due to dotnet#58226, and dotnet#60899 . Fixes dotnet#51961 .
4da9a31 to
197dbc1
Compare
197dbc1 to
485d481
Compare
kg
reviewed
Oct 29, 2021
kg
reviewed
Oct 29, 2021
eng/testing/tests.wasm.targets
Outdated
| @@ -38,12 +38,12 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup Condition="'$(BuildAOTTestsOnHelix)' == 'true'"> | |||
| <_AOTBuildCommand>dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /bl:$XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand> | |||
| <_AOTBuildCommand>BuildAOT publish/ProxyProjectForAOTOnHelix.proj $XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand> | |||
There was a problem hiding this comment.
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.
hm how about naming it _buildAOTFunc? or just _buildAOT even.
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.
kg
approved these changes
Oct 29, 2021
| <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> |
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
There was a problem hiding this comment.
I'll leave this one for @radekdoulik to add, since he set these originally.
| @@ -371,7 +375,7 @@ | |||
| DependsOnTargets="_WasmSelectRuntimeComponentsForLinking;_WasmCompileAssemblyBitCodeFilesForAOT;_WasmWriteRspFilesForLinking" | |||
| Returns="@(FileWrites)" > | |||
|
|
|||
| <Message Text="Linking with emcc. This may take a while ..." Importance="High" /> | |||
| <Message Text="Linking with emcc with $(EmccLinkOptimizationFlag). This may take a while ..." Importance="High" /> | |||
There was a problem hiding this comment.
(Optional suggestion) Maybe put a prefix on these 3 stages like '2/3' to indicate how many more emcc steps are left in the build since each step is so slow
There was a problem hiding this comment.
Right now, a AOT build looks like:
AOT'ing 31 assemblies
[1/30] System.ComponentModel.dll -> System.ComponentModel.dll.bc
[2/30] System.Net.Primitives.dll -> System.Net.Primitives.dll.bc
...
Compiling native assets with emcc with -Oz. This may take a while ...
[1/3] pinvoke.c -> pinvoke.o [took 0.331s]
[2/3] corebindings.c -> corebindings.o [took 0.353s]
...
Compiling assembly bitcode files with -Oz ...
[1/30] System.ComponentModel.dll.bc -> System.ComponentModel.dll.o [took 0.498s]
[2/30] System.Net.Primitives.dll.bc -> System.Net.Primitives.dll.o [took 0.517s]
...
<linking>
Adding another level of numbering might be confusing. Maybe some other way of communicating the same idea?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This adds support for setting per-project optimization flags, and sets them for these projects so they don't OOM.
Microsoft.Extensions.Logging.Generators.Roslyn3.11.TestsMicrosoft.Extensions.Logging.Generators.Roslyn4.0.TestsSystem.Text.Json.SourceGeneration.Roslyn3.11.Unit.TestsSystem.Text.Json.SourceGeneration.Roslyn4.0.Unit.TestsSystem.Text.RegularExpressions.Generators.TestsSome individual ones are disabled due to
#58226, and #60899 .
Additionally, if a AOT build fails, then on linux it dumps the last few lines from
dmesg, to help identify it was an oom-kill.Fixes #51961 .