more

Author: pavelsavara

eng/testing/tests.browser.targets

@@ -13,9 +13,10 @@
 
     <!--
       - For regular library tests, it will use the symbols file from the runtime pack.
-      - for AOT library tests, we use WasmNativeStrip=false, so we already have symbols
+      - for AOT library tests, we avoid WasmNativeDebugSymbols so that we don't run OOM on helix during wasm-opt
     -->
-    <WasmNativeStrip Condition="'$(WasmNativeStrip)' == '' and '$(RunAOTCompilation)' == 'true'">false</WasmNativeStrip>
+    <WasmNativeStrip Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(RunAOTCompilation)' == 'true'">true</WasmNativeStrip>
+    <WasmNativeDebugSymbols Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(RunAOTCompilation)' == 'true'">false</WasmNativeDebugSymbols>
     <WasmEmitSymbolMap Condition="'$(WasmEmitSymbolMap)' == ''">true</WasmEmitSymbolMap>
 
     <_WasmMainJSFileName Condition="'$(WasmMainJSPath)' != ''">$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>

eng/testing/tests.wasm.targets

@@ -133,6 +133,7 @@
       <_WasmPropertyNames Include="WasmDedup" />
       <_WasmPropertyNames Include="WasmLinkIcalls" />
       <_WasmPropertyNames Include="WasmNativeStrip" />
+      <_WasmPropertyNames Include="WasmNativeDebugSymbols" />
       <_WasmPropertyNames Include="_WasmDevel" />
       <_WasmPropertyNames Include="_WasmStrictVersionMatch" />
       <_WasmPropertyNames Include="WasmEmitSymbolMap" />

src/mono/browser/build/BrowserWasmApp.targets

@@ -530,7 +530,7 @@
 
     <Message Text="Linking for initial memory %24(WasmInitialHeapSize)=$(WasmInitialHeapSize) bytes. Set this msbuild property to change the value." Importance="High" />
     <Message Text="Linking with emcc with $(WasmLinkOptimizationFlag). This may take a while ..." Importance="High" />
-    <Message Text="Running emcc with @(_EmccLinkStepArgs->'%(Identity)', ' ')" Importance="Low" />
+    <Message Text="Running emcc with @(_EmccLinkStepArgs->'%(Identity)', ' ')" Importance="High" />
     <Exec Command='emcc "@$(_WasmDefaultFlagsRsp)" $(_WasmDefaultFlags) "@$(_WasmDefaultLinkFlagsRsp)" "@$(_WasmLinkRsp)"' EnvironmentVariables="@(EmscriptenEnvVars)" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="_EmccLinkStepConsoleOutput" />
       <Output TaskParameter="ExitCode" PropertyName="_EmccLinkStepExitCode" />

src/mono/wasm/build/WasmApp.Common.targets

@@ -889,6 +889,7 @@
   <Target Name="_CheckToolchainIsExpectedVersion" />
 
   <Target Name="_WasmWriteRspForLinking">
+    <Message Text="Writing to $(_WasmLinkRsp) @(_WasmLinkStepArgs->'%(Identity)', ' ')" Importance="High" />
     <WriteLinesToFile Lines="@(_WasmLinkStepArgs)" File="$(_WasmLinkRsp)" Overwrite="true" WriteOnlyWhenDifferent="true" />
     <ItemGroup>
       <FileWrites Include="$(_WasmLinkRsp)" />

src/mono/wasm/data/aot-tests/Directory.Build.props

@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <_TargetsBaseName Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">BrowserWasmApp</_TargetsBaseName>
     <_TargetsBaseName Condition="'$(RuntimeIdentifier)' == 'wasi-wasm'">WasiApp</_TargetsBaseName>
     <_TargetsBaseName Condition="'$(_TargetsBaseName)' == ''">Unknown RID=$(RuntimeIdentifier)</_TargetsBaseName>