[wasm] Incremental build improvements#90194

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
radical merged 10 commits into from
Aug 14, 2023
Merged

[wasm] Incremental build improvements #90194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b3566f5
[wasm] Makefile: update helper targets
radical Aug 11, 2023
3468aa2
[wasm] Run `emcc --version` when necessary
radical Aug 11, 2023
5374ff4
[wasm] ConvertDllsToWebCil: Avoid unncessary conversion
radical Aug 11, 2023
bc986f2
[wasm] ManagedToNativeGenerator: avoid unncessary work
radical Aug 11, 2023
c044c20
[wasm] Remove misleading message
radical Aug 11, 2023
dda5b20
minor - add paths for wasm vscode workspace
radical Aug 11, 2023
ccacbaa
Merge remote-tracking branch 'origin/main' into wasm-incremental-build
radical Aug 13, 2023
ab1abd8
Fix debug messages to be emitted with Low importance
radical Aug 13, 2023
23cb49b
address feedback from @kg
radical Aug 13, 2023
88d15f4
Merge remote-tracking branch 'origin/main' into wasm-incremental-build
radical Aug 13, 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
2 changes: 1 addition & 1 deletion src/mono/wasm/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down
34 changes: 19 additions & 15 deletions src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
$(_BeforeWasmBuildAppDependsOn);
_SetupEmscripten;
_SetWasmBuildNativeDefaults;
_SetWasmNativeStripDefault
_SetWasmNativeStripDefault;
_ReadEmccProps
</_BeforeWasmBuildAppDependsOn>

<_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
<_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
<WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
<!-- compare versions only when emsdk is not from the workload -->
<_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
</PropertyGroup>

<ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
<_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
<_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
<_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
<_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
<_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
<_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
<DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
IcallOutputPath="$(_WasmICallTablePath)"
PInvokeModules="@(_WasmPInvokeModules)"
PInvokeOutputPath="$(_WasmPInvokeTablePath)"
InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
CacheFilePath="$(_WasmM2NCachePath)">
<Output TaskParameter="FileWrites" ItemName="FileWrites" />
</ManagedToNativeGenerator>
</Target>
Expand All@@ -349,7 +354,6 @@
<FileWrites Include="$(_EmccCompileRsp)" />
</ItemGroup>

<Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
<ItemGroup>
<_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
<_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
EnvironmentVariables="@(EmscriptenEnvVars)"
DisableParallelCompile="$(DisableParallelEmccCompile)"
MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.
OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
<Output TaskParameter="OutputFiles" ItemName="FileWrites" />
</EmccCompile>
Expand All@@ -375,12 +380,12 @@
<_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
</ItemGroup>

<Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
<EmccCompile
SourceFiles="@(_BitCodeFile)"
Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
EnvironmentVariables="@(EmscriptenEnvVars)"
DisableParallelCompile="$(DisableParallelEmccCompile)"
MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
<Output TaskParameter="OutputFiles" ItemName="FileWrites" />
</EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
<Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
</Target>

<Target Name="_CheckEmccIsExpectedVersion">
<Error Condition="'$(_IsEMSDKMissing)' == 'true'"
Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

<Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
<ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
<Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
<Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
<Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
<Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
<Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
<Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
<Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
</ReadEmccProps>

<CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
<CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
<Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
</CreateProperty>
</Target>

<Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
<Error Condition="'$(_IsEMSDKMissing)' == 'true'"
Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
<Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
<_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
</PropertyGroup>

<Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
Text="$(_VersionMismatchMessage)" />
<Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
Text="$(_VersionMismatchMessage)" />
<Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
<Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
</Target>

<!--
Expand Down
6 changes: 6 additions & 0 deletions src/mono/wasm/wasm.code-workspace
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
},
{
"path": "../wasi"
},
{
"path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
},
{
"path": "../../tasks/WasmAppBuilder"
}
],
"settings": {
Expand Down
79 changes: 38 additions & 41 deletions src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
[Output]
public string[]? FileWrites => _fileWrites.ToArray();


public override bool Execute()
{
var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
return true;
}

if (!Directory.Exists(OutputPath))
Directory.CreateDirectory(OutputPath);

string tmpDir = IntermediateOutputPath;
if (!Directory.Exists(tmpDir))
Directory.CreateDirectory(tmpDir);

for (int i = 0; i < Candidates.Length; i++)
{
var candidate = Candidates[i];

var extension = candidate.GetMetadata("Extension");
var filePath = candidate.ItemSpec;
var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

if (!Directory.Exists(OutputPath))
Directory.CreateDirectory(OutputPath);
if (extension != ".dll")
{
webCilCandidates.Add(candidate);
continue;
}

var dllFilePath = candidate.ItemSpec;
var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
: OutputPath;

if (extension == ".dll")
string finalWebcil = Path.Combine(candidatePath, webcilFileName);

if (Utils.IsNewerThan(dllFilePath, finalWebcil))
{
var tmpDir = IntermediateOutputPath;
if (!Directory.Exists(tmpDir))
Directory.CreateDirectory(tmpDir);
var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
webcilWriter.ConvertToWebcil();

string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
: OutputPath;

if (!Directory.Exists(candidatePath))
Directory.CreateDirectory(candidatePath);

var finalWebcil = Path.Combine(candidatePath, webcilFileName);
if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
else
Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
}
else
{
Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
}

_fileWrites.Add(finalWebcil);

var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
_fileWrites.Add(finalWebcil);

if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
{
string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
webcilItem.SetMetadata("RelatedAsset", relatedAsset);
Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
}
var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

webCilCandidates.Add(webcilItem);
}
else
if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
{
webCilCandidates.Add(candidate);
string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
webcilItem.SetMetadata("RelatedAsset", relatedAsset);
Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
}

webCilCandidates.Add(webcilItem);
}

WebCilCandidates = webCilCandidates.ToArray();
Expand Down
6 changes: 4 additions & 2 deletions src/tasks/WasmAppBuilder/EmccCompile.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
/// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
public string Arguments { get; set; } = string.Empty;
public string? WorkingDirectory { get; set; }
public string OutputMessageImportance{ get; set; } = "Low";
public string? MessageToIndicateCompiling { get; set; }

[Output]
public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
if (_numCompiled > 0)
Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

Log.LogMessage(MessageImportance.Low, "Using environment variables:");
foreach (var kvp in envVarsDict)
Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down
39 changes: 14 additions & 25 deletions src/tasks/WasmAppBuilder/IcallTableGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
public string[]? Cookies { get; private set; }

private List<Icall> _icalls = new List<Icall>();
private List<string> _signatures = new List<string>();
private readonly HashSet<string> _signatures = new();
private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

private TaskLoggingHelper Log { get; set; }
private readonly Func<string, string> _fixupSymbolName;

public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
{
Log = log;
_fixupSymbolName = fixupSymbolName;
}

//
// Given the runtime generated icall table, and a set of assemblies, generate
// a smaller linked icall table mapping tokens to C function names
// The runtime icall table should be generated using
// mono --print-icall-table
//
public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
{
_icalls.Clear();
_signatures.Clear();

Log = log;
_fixupSymbolName = fixupSymbolName;
if (runtimeIcallTableFile != null)
ReadTable(runtimeIcallTableFile);
}

var resolver = new PathAssemblyResolver(assemblies);
using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
foreach (var asmPath in assemblies)
{
if (!File.Exists(asmPath))
throw new LogAsErrorException($"Cannot find assembly {asmPath}");

Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
var a = mlc.LoadFromAssemblyPath(asmPath);
foreach (var type in a.GetTypes())
ProcessType(type);
}
public void ScanAssembly(Assembly asm)
{
foreach (Type type in asm.GetTypes())
ProcessType(type);
}

public IEnumerable<string> Generate(string? outputPath)
{
if (outputPath != null)
{
string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
}

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[wasm] Incremental build improvements#90194

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

radical
merged 10 commits into

from

Aug 14, 2023
 Merged


[wasm] Incremental build improvements
#90194
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
b3566f5

[wasm] Makefile: update helper targets


radical Aug 11, 2023
3468aa2

[wasm] Run `emcc --version` when necessary


radical Aug 11, 2023
5374ff4

[wasm] ConvertDllsToWebCil: Avoid unncessary conversion


radical Aug 11, 2023
bc986f2

[wasm] ManagedToNativeGenerator: avoid unncessary work


radical Aug 11, 2023
c044c20

[wasm] Remove misleading message


radical Aug 11, 2023
dda5b20

minor - add paths for wasm vscode workspace


radical Aug 11, 2023
ccacbaa

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 2023
ab1abd8

Fix debug messages to be emitted with Low importance


radical Aug 13, 2023
23cb49b

address feedback from @kg


radical Aug 13, 2023
88d15f4

Merge remote-tracking branch 'origin/main' into wasm-incremental-build


radical Aug 13, 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


2 changes: 1 addition & 1 deletion
src/mono/wasm/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ app-builder:
	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder

build-tasks:
	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
	$(DOTNET) build $(TOP)/src/tasks/tasks.proj /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)

build-packages:
	rm $(TOP)/artifacts/packages/$(CONFIG)/Shipping/*.nupkg
Expand Down

34 changes: 19 additions & 15 deletions
src/mono/wasm/build/WasmApp.Native.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,15 @@
 $(_BeforeWasmBuildAppDependsOn);
 _SetupEmscripten;
 _SetWasmBuildNativeDefaults;
 _SetWasmNativeStripDefault
 _SetWasmNativeStripDefault;
 _ReadEmccProps
 </_BeforeWasmBuildAppDependsOn>

 <_EmccDefaultFlags Condition="'$(WasmEnableSIMD)' == 'true'">-msimd128</_EmccDefaultFlags>
 <_ExeExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</_ExeExt>
 <WasmUseEMSDK_PATH Condition="'$(WasmUseEMSDK_PATH)' == '' and '$(EMSDK_PATH)' != '' and Exists('$(MSBuildThisFileDirectory)WasmApp.InTree.targets')">true</WasmUseEMSDK_PATH>
 <!-- compare versions only when emsdk is not from the workload -->
 <_WasmStrictVersionMatch Condition="'$(WasmUseEMSDK_PATH)' == 'true'">true</_WasmStrictVersionMatch>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -182,6 +185,7 @@
 <_WasmRuntimeICallTablePath>$(_WasmIntermediateOutputPath)runtime-icall-table.h</_WasmRuntimeICallTablePath>
 <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)pinvoke-table.h</_WasmPInvokeTablePath>
 <_WasmInterpToNativeTablePath>$(_WasmIntermediateOutputPath)wasm_m2n_invoke.g.h</_WasmInterpToNativeTablePath>
 <_WasmM2NCachePath>$(_WasmIntermediateOutputPath)m2n_cache.txt</_WasmM2NCachePath>
 <_WasmPInvokeHPath>$(_WasmRuntimePackIncludeDir)wasm\pinvoke.h</_WasmPInvokeHPath>
 <_DriverGenCPath>$(_WasmIntermediateOutputPath)driver-gen.c</_DriverGenCPath>
 <DisableParallelAot Condition="'$(DisableParallelAot)' == ''">false</DisableParallelAot>
Expand DownExpand Up@@ -332,7 +336,8 @@
 IcallOutputPath="$(_WasmICallTablePath)"
 PInvokeModules="@(_WasmPInvokeModules)"
 PInvokeOutputPath="$(_WasmPInvokeTablePath)"
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)">
 InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
 CacheFilePath="$(_WasmM2NCachePath)">
 <Output TaskParameter="FileWrites" ItemName="FileWrites" />
 </ManagedToNativeGenerator>
 </Target>
Expand All@@ -349,7 +354,6 @@
 <FileWrites Include="$(_EmccCompileRsp)" />
 </ItemGroup>

 <Message Text="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..." Importance="High" />
 <ItemGroup>
 <_WasmSourceFileToCompile Remove="@(_WasmSourceFileToCompile)" />
 <_WasmSourceFileToCompile Include="@(_WasmRuntimePackSrcFile)" Dependencies="%(_WasmRuntimePackSrcFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileRsp)" />
Expand All@@ -359,6 +363,7 @@
 Arguments='"@$(_EmccDefaultFlagsRsp)" $(_EmccDefaultFlags) "@$(_EmccCompileRsp)"'
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling native assets with emcc with $(EmccCompileOptimizationFlag). This may take a while ..."
Comment thread
radical marked this conversation as resolved.

 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand All@@ -375,12 +380,12 @@
 <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
 </ItemGroup>

 <Message Text="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..." Importance="High" Condition="@(_BitCodeFile->Count()) > 0" />
 <EmccCompile
 SourceFiles="@(_BitCodeFile)"
 Arguments="&quot;@$(_EmccDefaultFlagsRsp)&quot; $(_EmccDefaultFlags) &quot;@$(_EmccCompileBitcodeRsp)&quot;"
 EnvironmentVariables="@(EmscriptenEnvVars)"
 DisableParallelCompile="$(DisableParallelEmccCompile)"
 MessageToIndicateCompiling="Compiling assembly bitcode files with $(EmccLinkOptimizationFlag) ..."
 OutputMessageImportance="$(_EmccCompileOutputMessageImportance)">
 <Output TaskParameter="OutputFiles" ItemName="FileWrites" />
 </EmccCompile>
Expand DownExpand Up@@ -535,15 +540,12 @@
 <Target Name="_GenerateDriverGenC" Condition="'$(_WasmShouldAOT)' != 'true'">
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />

 <Target Name="_ReadEmccProps" Condition="'$(_IsEMSDKMissing)' != 'true'">
 <ReadEmccProps JsonFilePath="$(_WasmRuntimePackSrcDir)emcc-props.json">
 <Output TaskParameter="EmccProperties" ItemName="_EmccPropItems" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 <Output TaskParameter="WasmOptConfigurationFlags" ItemName="_WasmOptConfigurationFlagsItems" />
 <Output TaskParameter="EmccDefaultExportedFunctions" ItemName="EmccExportedFunction" />
 <Output TaskParameter="EmccDefaultExportedRuntimeMethods" ItemName="EmccExportedRuntimeMethod" />
 </ReadEmccProps>

 <CreateProperty Value="%(_EmccPropItems.Value)">
Expand All@@ -553,7 +555,11 @@
 <CreateProperty Value="%(_WasmOptConfigurationFlagsItems.Value)">
 <Output TaskParameter="Value" PropertyName="%(_WasmOptConfigurationFlagsItems.Identity)" />
 </CreateProperty>
 </Target>

 <Target Name="_CheckEmccIsExpectedVersion" Condition="'$(_WasmStrictVersionMatch)' == 'true'">
 <Error Condition="'$(_IsEMSDKMissing)' == 'true'"
 Text="$(_EMSDKMissingErrorMessage) Emscripten SDK is required for building native files." />
 <Error Condition="'$(RuntimeEmccVersionRaw)' == ''"
 Text="%24(RuntimeEmccVersionRaw) is not set. '$(_EmccPropsPath)' should have set that."/>

Expand DownExpand Up@@ -585,10 +591,8 @@
 <_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
 </PropertyGroup>

 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
 Text="$(_VersionMismatchMessage)" />
 <Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 <Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'" Text="$(_VersionMismatchMessage)" />
 </Target>

 <!--
Expand Down

6 changes: 6 additions & 0 deletions
src/mono/wasm/wasm.code-workspace

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,12 @@
 },
 {
 "path": "../wasi"
 },
 {
 "path": "../../tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks"
 },
 {
 "path": "../../tasks/WasmAppBuilder"
 }
	],
	"settings": {
Expand Down

79 changes: 38 additions & 41 deletions
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;

namespace Microsoft.NET.Sdk.WebAssembly;

Expand All@@ -39,7 +30,6 @@ public class ConvertDllsToWebCil : Task
 [Output]
 public string[]? FileWrites => _fileWrites.ToArray();


 public override bool Execute()
 {
 var webCilCandidates = new List<ITaskItem>();
Expand All@@ -50,59 +40,66 @@ public override bool Execute()
 return true;
 }

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);

 string tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);

 for (int i = 0; i < Candidates.Length; i++)
 {
 var candidate = Candidates[i];

 var extension = candidate.GetMetadata("Extension");
 var filePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(filePath) + Utils.WebcilInWasmExtension;

 if (!Directory.Exists(OutputPath))
 Directory.CreateDirectory(OutputPath);
 if (extension != ".dll")
 {
 webCilCandidates.Add(candidate);
 continue;
 }

 var dllFilePath = candidate.ItemSpec;
 var webcilFileName = Path.GetFileNameWithoutExtension(dllFilePath) + Utils.WebcilInWasmExtension;
 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (extension == ".dll")
 string finalWebcil = Path.Combine(candidatePath, webcilFileName);

 if (Utils.IsNewerThan(dllFilePath, finalWebcil))
 {
 var tmpDir = IntermediateOutputPath;
 if (!Directory.Exists(tmpDir))
 Directory.CreateDirectory(tmpDir);
 var tmpWebcil = Path.Combine(tmpDir, webcilFileName);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: filePath, outputPath: tmpWebcil, logger: Log);
 var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: Log);
 webcilWriter.ConvertToWebcil();

 string candidatePath = candidate.GetMetadata("AssetTraitName") == "Culture"
 ? Path.Combine(OutputPath, candidate.GetMetadata("AssetTraitValue"))
 : OutputPath;

 if (!Directory.Exists(candidatePath))
 Directory.CreateDirectory(candidatePath);

 var finalWebcil = Path.Combine(candidatePath, webcilFileName);
 if (Utils.CopyIfDifferent(tmpWebcil, finalWebcil, useHash: true))
 Log.LogMessage(MessageImportance.Low, $"Generated {finalWebcil} .");
 else
 Log.LogMessage(MessageImportance.Low, $"Skipped generating {finalWebcil} as the contents are unchanged.");
 }
 else
 {
 Log.LogMessage(MessageImportance.Low, $"Skipping {dllFilePath} as it is older than the output file {finalWebcil}");
 }

 _fileWrites.Add(finalWebcil);

 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);
 _fileWrites.Add(finalWebcil);

 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }
 var webcilItem = new TaskItem(finalWebcil, candidate.CloneCustomMetadata());
 webcilItem.SetMetadata("RelativePath", Path.ChangeExtension(candidate.GetMetadata("RelativePath"), Utils.WebcilInWasmExtension));
 webcilItem.SetMetadata("OriginalItemSpec", finalWebcil);

 webCilCandidates.Add(webcilItem);
 }
 else
 if (webcilItem.GetMetadata("AssetTraitName") == "Culture")
 {
 webCilCandidates.Add(candidate);
 string relatedAsset = webcilItem.GetMetadata("RelatedAsset");
 relatedAsset = Path.ChangeExtension(relatedAsset, Utils.WebcilInWasmExtension);
 webcilItem.SetMetadata("RelatedAsset", relatedAsset);
 Log.LogMessage(MessageImportance.Low, $"Changing related asset of {webcilItem} to {relatedAsset}.");
 }

 webCilCandidates.Add(webcilItem);
 }

 WebCilCandidates = webCilCandidates.ToArray();
Expand Down

6 changes: 4 additions & 2 deletions
src/tasks/WasmAppBuilder/EmccCompile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

#nullable enable

namespace Microsoft.WebAssembly.Build.Tasks
{
 /// <summary>
Expand All@@ -35,6 +33,7 @@ public class EmccCompile : Microsoft.Build.Utilities.Task
 public string Arguments { get; set; } = string.Empty;
 public string? WorkingDirectory { get; set; }
 public string OutputMessageImportance{ get; set; } = "Low";
 public string? MessageToIndicateCompiling { get; set; }

 [Output]
 public ITaskItem[]? OutputFiles { get; private set; }
Expand DownExpand Up@@ -117,6 +116,9 @@ private bool ExecuteActual()
 if (_numCompiled > 0)
 Log.LogMessage(MessageImportance.High, $"[{_numCompiled}/{SourceFiles.Length}] skipped unchanged files");

 if (!string.IsNullOrEmpty(MessageToIndicateCompiling))
 Log.LogMessage(MessageImportance.High, MessageToIndicateCompiling);

 Log.LogMessage(MessageImportance.Low, "Using environment variables:");
 foreach (var kvp in envVarsDict)
 Log.LogMessage(MessageImportance.Low, $"\t{kvp.Key} = {kvp.Value}");
Expand Down

39 changes: 14 additions & 25 deletions
src/tasks/WasmAppBuilder/IcallTableGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,45 +16,34 @@ internal sealed class IcallTableGenerator
 public string[]? Cookies { get; private set; }

 private List<Icall> _icalls = new List<Icall>();
 private List<string> _signatures = new List<string>();
 private readonly HashSet<string> _signatures = new();
 private Dictionary<string, IcallClass> _runtimeIcalls = new Dictionary<string, IcallClass>();

 private TaskLoggingHelper Log { get; set; }
 private readonly Func<string, string> _fixupSymbolName;

 public IcallTableGenerator(Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 Log = log;
 _fixupSymbolName = fixupSymbolName;
 }

 //
 // Given the runtime generated icall table, and a set of assemblies, generate
 // a smaller linked icall table mapping tokens to C function names
 // The runtime icall table should be generated using
 // mono --print-icall-table
 //
 public IEnumerable<string> Generate(string? runtimeIcallTableFile, IEnumerable<string> assemblies, string? outputPath)
 public IcallTableGenerator(string? runtimeIcallTableFile, Func<string, string> fixupSymbolName, TaskLoggingHelper log)
 {
 _icalls.Clear();
 _signatures.Clear();

 Log = log;
 _fixupSymbolName = fixupSymbolName;
 if (runtimeIcallTableFile != null)
 ReadTable(runtimeIcallTableFile);
 }

 var resolver = new PathAssemblyResolver(assemblies);
 using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib");
 foreach (var asmPath in assemblies)
 {
 if (!File.Exists(asmPath))
 throw new LogAsErrorException($"Cannot find assembly {asmPath}");

 Log.LogMessage(MessageImportance.Low, $"Loading {asmPath} to scan for icalls");
 var a = mlc.LoadFromAssemblyPath(asmPath);
 foreach (var type in a.GetTypes())
 ProcessType(type);
 }
 public void ScanAssembly(Assembly asm)
 {
 foreach (Type type in asm.GetTypes())
 ProcessType(type);
 }

 public IEnumerable<string> Generate(string? outputPath)
 {
 if (outputPath != null)
 {
 string tmpFileName = Path.GetTempFileName();
Expand DownExpand Up@@ -230,8 +219,8 @@ void AddSignature(Type type, MethodInfo method)
 throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'");
 }

Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
_signatures.Add(signature);
if (_signatures.Add(signature))
 Log.LogMessage(MessageImportance.Low, $"Adding icall signature {signature} for method '{type.FullName}.{method.Name}'");
 }
 }

Expand Down
Loading