Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[browser] Trigger relink on EmccMaximumHeapSize change #105027

Merged
merged 11 commits into from
Jul 25, 2024
Merged

[browser] Trigger relink on EmccMaximumHeapSize change #105027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0aa1375
Edit test + trigger relink.
ilonatommy Jul 17, 2024
78a960b
Remove logging to speed up the test + decrease loop runs to prevent "…
ilonatommy Jul 18, 2024
1b760cc
Feedback - properties are not bool-only anymore.
ilonatommy Jul 18, 2024
2a60610
Limit test runs.
ilonatommy Jul 18, 2024
cac80d3
Update MemoryTests.cs
ilonatommy Jul 18, 2024
6db16ab
Missing rename.
ilonatommy Jul 19, 2024
2fd8a0b
Reproduced out of memory without workload.
ilonatommy Jul 22, 2024
0111678
Merge branch 'main' into fix-104790-relink
lewing Jul 23, 2024
c6bad0e
Fix: workload needed when heap size set.
ilonatommy Jul 24, 2024
197e7b3
Merge branch 'main' into fix-104790-relink
ilonatommy Jul 24, 2024
4bddb87
Feedback: cleanup.
ilonatommy Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/mono/browser/browser.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<WasmSingleFileBundle Condition="'$(WasmSingleFileBundle)' == ''">false</WasmSingleFileBundle>
<WasmEnableSIMD Condition="'$(WasmEnableSIMD)' == ''">true</WasmEnableSIMD>
<WasmEnableExceptionHandling Condition="'$(WasmEnableExceptionHandling)' == ''">true</WasmEnableExceptionHandling>
<EmccMaximumHeapSize Condition="'$(EmccMaximumHeapSize)' == ''">2147483648</EmccMaximumHeapSize>
<WasmEnableJsInteropByValue Condition="'$(WasmEnableJsInteropByValue)' == '' and '$(WasmEnableThreads)' == 'true'">true</WasmEnableJsInteropByValue>
<WasmEnableJsInteropByValue Condition="'$(WasmEnableJsInteropByValue)' == ''">false</WasmEnableJsInteropByValue>
<FilterSystemTimeZones Condition="'$(FilterSystemTimeZones)' == ''">false</FilterSystemTimeZones>
Expand Down Expand Up @@ -340,7 +341,8 @@
{ "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "$(WasmNativeStrip)" },
{ "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "$(WasmSingleFileBundle)" },
{ "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "$(WasmEnableSIMD)" },
{ "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "$(WasmEnableExceptionHandling)" }
{ "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "$(WasmEnableExceptionHandling)" },
ilonatommy marked this conversation as resolved.
Show resolved Hide resolved
{ "identity": "EmccMaximumHeapSize", "defaultValueInRuntimePack": "$(EmccMaximumHeapSize)" }
]
}
}
Expand Down
15 changes: 9 additions & 6 deletions src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/MemoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@ public MemoryTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buil
[InlineData("Release", false)]
public async Task AllocateLargeHeapThenRepeatedlyInterop(string config, bool buildNative)
{
// native build triggers passing value form EmccMaximumHeapSize to MAXIMUM_MEMORY that is set in emscripten
// in non-native build EmccMaximumHeapSize does not have an effect, so the test will fail with "out of memory"
CopyTestAsset("WasmBasicTestApp", "MemoryTests", "App");
string extraArgs = $"-p:EmccMaximumHeapSize=4294901760 -p:WasmBuildNative={buildNative}";
string extraArgs = $"-p:EmccMaximumHeapSize=4294901760";
if (buildNative)
ilonatommy marked this conversation as resolved.
Show resolved Hide resolved
extraArgs += $" -p:WasmBuildNative=true";
BuildProject(config, assertAppBundle: false, extraArgs: extraArgs);

var result = await RunSdkStyleAppForBuild(new (Configuration: config, TestScenario: "AllocateLargeHeapThenInterop", ExpectedExitCode: buildNative ? 0 : 1));
if (!buildNative)
Assert.Contains(result.TestOutput, item => item.Contains("Exception System.OutOfMemoryException: Out of memory"));
int expectedCode = BuildTestBase.IsUsingWorkloads ? 0 : 1;
var result = await RunSdkStyleAppForBuild(new (Configuration: config, TestScenario: "AllocateLargeHeapThenInterop", ExpectedExitCode: expectedCode));
if(!BuildTestBase.IsUsingWorkloads)
{
Assert.Contains(result.TestOutput, item => item.Contains("To build this project, the following workloads must be installed: wasm-tools"));
}
}
}
Loading