Skip to content

[browser] improve default initial memory size #80507

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

Merged
pavelsavara merged 20 commits into from
Jan 24, 2023
Merged

[browser] improve default initial memory size #80507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a5fb483
make initial size small again
pavelsavara Jan 11, 2023
87c28ce
bench
pavelsavara Jan 11, 2023
0851542
Merge branch 'main' into browser_initial_heap_size
pavelsavara Jan 12, 2023
52c0f1d
Merge branch 'main' into browser_initial_heap_size
pavelsavara Jan 13, 2023
bf478e4
Merge branch 'main' into browser_initial_heap_size
pavelsavara Jan 16, 2023
4da3be8
make EmccInitialHeapSize dynamic based on size of the assemblies
pavelsavara Jan 16, 2023
1e5cdcd
2x
pavelsavara Jan 16, 2023
df98dcc
naming feedback
pavelsavara Jan 17, 2023
b536b38
feedback
pavelsavara Jan 17, 2023
0eb9f8e
feedback
pavelsavara Jan 17, 2023
d362ab8
add AOT data segment size using llvm-size tool
pavelsavara Jan 17, 2023
292feef
whitespace
pavelsavara Jan 18, 2023
6a169ac
Merge branch 'main' into browser_initial_heap_size
pavelsavara Jan 19, 2023
c688a1a
feedback
pavelsavara Jan 19, 2023
f92e9ff
Update src/mono/wasm/build/WasmApp.targets
pavelsavara Jan 24, 2023
f47fac1
Update src/tasks/WasmAppBuilder/WasmCalculateInitialHeapSize.cs
pavelsavara Jan 24, 2023
28fd57c
Update src/tasks/WasmAppBuilder/WasmCalculateInitialHeapSize.cs
pavelsavara Jan 24, 2023
358f8d5
Update src/tasks/WasmAppBuilder/WasmCalculateInitialHeapSize.cs
pavelsavara Jan 24, 2023
c7caa73
feedback
pavelsavara Jan 24, 2023
2c2a88e
Merge branch 'main' into browser_initial_heap_size
pavelsavara Jan 24, 2023
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
Prev Previous commit
Next Next commit
feedback
  • Loading branch information
@pavelsavara
pavelsavara committed Jan 17, 2023
commit 0eb9f8e4a1e1c21809bca37474f0609f5dfa9c8d
4 changes: 2 additions & 2 deletions src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

<WasmCalculateInitialHeapSize Assemblies="@(WasmAssembliesToBundle)">
<Output TaskParameter="TotalSize" PropertyName="_WasmCalculateInitialHeapSize" />
<Output TaskParameter="TotalSize" PropertyName="_WasmCalculatedInitialHeapSize" />
</WasmCalculateInitialHeapSize>

<PropertyGroup>
Expand Down Expand Up @@ -192,7 +192,7 @@
<_EmccLinkRsp>$(_WasmIntermediateOutputPath)emcc-link.rsp</_EmccLinkRsp>

<EmccInitialHeapSize Condition="'$(EmccInitialHeapSize)' == ''">$(EmccTotalMemory)</EmccInitialHeapSize>
<EmccInitialHeapSize Condition="'$(EmccInitialHeapSize)' == '' and '$(_WasmCalculateInitialHeapSize)' != '' and $(_WasmCalculateInitialHeapSize) > 16777216">$(_WasmCalculateInitialHeapSize)</EmccInitialHeapSize>
<EmccInitialHeapSize Condition="'$(EmccInitialHeapSize)' == '' and '$(_WasmCalculatedInitialHeapSize)' != '' and $(_WasmCalculatedInitialHeapSize) > 16777216">$(_WasmCalculatedInitialHeapSize)</EmccInitialHeapSize>
<EmccInitialHeapSize Condition="'$(EmccInitialHeapSize)' == ''">16777216</EmccInitialHeapSize>
</PropertyGroup>

Expand Down
4 changes: 0 additions & 4 deletions src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,6 @@
<WasmAssembliesToBundle Include="$(PublishDir)\**\*.dll" />
</ItemGroup>

<WasmCalculateInitialHeapSize Assemblies="@(WasmAssembliesToBundle)">
<Output TaskParameter="TotalSize" PropertyName="_WasmCalculateInitialHeapSize" />
</WasmCalculateInitialHeapSize>

<PropertyGroup Condition="'$(_WasmRuntimeConfigFilePath)' == ''">
<_WasmRuntimeConfigFilePath Condition="$([System.String]::new(%(PublishItemsOutputGroupOutputs.Identity)).EndsWith('$(AssemblyName).runtimeconfig.json'))">@(PublishItemsOutputGroupOutputs)</_WasmRuntimeConfigFilePath>
</PropertyGroup>
Expand Down