Commit 085ddb7
[Mono] Fix all the issues related to enabling WasmStripILAfterAOT (dotnet#90436)
* Enable IL trim for WASM by default
* Make ILStrip available for local build
* Make all calling another method go through the logic to see if it could call an AOT'ed version of it before trying to interp compile it
* Add back accidentally removed line of code
* Update test to accommodate IL trim with WASM AOT
* Move jit_call_can_be_supported to mini-runtime, so it doesn't depends on the value of mono_use_interpreter
* Update var name
* Attempt to fix rebuild test failures
* Attempt to fix the file open issue with unicode on windows
* Attempt to fix unicode issue #2
* Enable g_fopen to have the capability of handling opening files with unicode name on all platforms
* Add comment
* Update comment
* Fix file indentation format
* Check if string contains non-ascii char
* Remove unused callback
* Remove redundant comment
* Update method name
* Fixed some method not found issues and remove the optimization for g_fopen
* Fix tailcall
* Disable tailcall optimization when calling a trimmed method
* Free method header
* Fix windows build error
* Free method header at the correct locatioin
* Fix the condition of skipping tailcall
* Fix test failure
* Move JIT/AOT call invoke away from MINT_CALL, as it is not needed there.
* Fix virtual tail call
* Address review feedback
* Put the trimmed assemblies in a new folder, output an updated list of assemblies and update _WasmAssembliesInternal with the new list
* Put trimmed assemblies in IntermediateOutputPath
* Remove TrimmedAssemblies
* Create trimmed assembly folder before the parallel run
* Try to fix the issue with missing item
* Fix parallelism issue
* Only start the trim when the assembly is newer than the output
* Add assembly item to the list, when
* Add some logging
* Fixed runtimeconfig.json file path issue and disabed failed tests
* Update parameter name
* Fix wasi build
* Use the correct parameter
* Fix runtime test failure
* WasmAppBuilder: runtimeconfig.json path can be null
* cleanup
* ILStrip: fix typo in id name
* Cleanup
* ILStrip: ensure output assemblies are in the same order as the input. This is required for incremental builds.
* more cleanup
* Re-enable disabled tests
* Change the default value for WasmStripILAfterAOT to false
* Fix the issue with changing the value of WasmStripILAfterAOT between incremental builds
* Move the location of file deleting
* Use WasmAssembliesFinal or ResolvedFileToPublish during publish in WasmSDK
* Copy metadata in AOT compiler and when creating WasmAssembliesToBundle from ResolvedFileToPublish
* Add _WasmSatelliteAssemblies to WasmAssembliesFinal
* Add a wasm template test
* Include all non-dll ResolvedFileToPublish for ComputeWasmPublishAssets
* Add a blazor template test
* Address review feedback
* Update src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs
Co-authored-by: Ankit Jain <radical@gmail.com>
* Update parameter name
* Update usage of parameter
* Revert EmccCompile change
* MonoAOTCompiler: revert rebuilding when WasmStripILAfterAOT value changes
* Compress -> GZipCompress, and cleanup
* rework the tests
- to support webcil case
- run blazor app
- add cases for the default setting, and the opposite
- cleanup
* ILStrip.cs: Emit a message about stripping to make it obvious to the user
* WasmApp.targets: update comment
* Change default value to false and update test
---------
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Marek Fišera <mara@neptuo.com>1 parent 0e6e35f commit 085ddb7
File tree
23 files changed
+475
-184
lines changed- src
- libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection
- mono
- mono
- eglib
- mini
- interp
- nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build
- wasi/build
- wasm
- Wasm.Build.Tests
- Blazor
- Common
- NativeRebuildTests
- Templates
- build
- tasks
- AotCompilerTask
- MonoTargetsTasks/ILStrip
- WasmAppBuilder
23 files changed
+475
-184
lines changedLines changed: 32 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| 58 | + | |
58 | 59 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | 60 | | |
63 | | - | |
| 61 | + | |
64 | 62 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
69 | 68 | | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
77 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
78 | 94 | | |
| 95 | + | |
79 | 96 | | |
80 | 97 | | |
81 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
962 | 962 | | |
963 | 963 | | |
964 | 964 | | |
| 965 | + | |
965 | 966 | | |
966 | 967 | | |
967 | 968 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9885 | 9885 | | |
9886 | 9886 | | |
9887 | 9887 | | |
9888 | | - | |
9889 | | - | |
| 9888 | + | |
| 9889 | + | |
9890 | 9890 | | |
9891 | | - | |
| 9891 | + | |
| 9892 | + | |
| 9893 | + | |
| 9894 | + | |
| 9895 | + | |
| 9896 | + | |
9892 | 9897 | | |
9893 | 9898 | | |
9894 | 9899 | | |
| |||
14917 | 14922 | | |
14918 | 14923 | | |
14919 | 14924 | | |
14920 | | - | |
| 14925 | + | |
14921 | 14926 | | |
14922 | 14927 | | |
14923 | 14928 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | 68 | | |
70 | 69 | | |
71 | 70 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
252 | 252 | | |
253 | 253 | | |
254 | 254 | | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | 255 | | |
262 | 256 | | |
263 | 257 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
320 | 320 | | |
321 | 321 | | |
322 | 322 | | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | 323 | | |
327 | 324 | | |
328 | 325 | | |
| |||
0 commit comments