Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Faster wasm runtime #51458

Closed
wants to merge 2 commits into from
Closed

Faster wasm runtime #51458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ea1fa3
Faster wasm runtime
benaadams Apr 18, 2021
111ea17
Feedback
benaadams Apr 19, 2021
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
9 changes: 5 additions & 4 deletions src/mono/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ ifeq ($(ENABLE_METADATA_UPDATE),true)
endif

EMCC_DEBUG_FLAGS =-g -Os -s ASSERTIONS=1 -DDEBUG=1
EMCC_RELEASE_FLAGS=-Oz --llvm-opts 2
EMCC_RELEASE_FLAGS=-O3 -flto --llvm-opts 3
EMCC_CLOSURE_ARGS=--externs runtime/externs.js

ifeq ($(NOSTRIP),)
STRIP_CMD=&& $(EMSDK_PATH)/upstream/bin/wasm-opt --strip-dwarf $(NATIVE_BIN_DIR)/dotnet.wasm -o $(NATIVE_BIN_DIR)/dotnet.wasm
Expand Down Expand Up @@ -108,13 +109,13 @@ $(BUILDS_OBJ_DIR)/pinvoke-table.h: $(PINVOKE_TABLE) | $(BUILDS_OBJ_DIR)
if cmp -s $(PINVOKE_TABLE) $$@ ; then : ; else cp $(PINVOKE_TABLE) $$@ ; fi

$(BUILDS_OBJ_DIR)/driver.o: runtime/driver.c | $(BUILDS_OBJ_DIR)
$(EMCC) $(EMCC_FLAGS) $(1) -Oz -DCORE_BINDINGS -I$(BUILDS_OBJ_DIR) -I$(MONO_INCLUDE_DIR) runtime/driver.c -c -o $$@
$(EMCC) $(EMCC_FLAGS) $(1) -O3 -flto -DCORE_BINDINGS -I$(BUILDS_OBJ_DIR) -I$(MONO_INCLUDE_DIR) runtime/driver.c -c -o $$@

$(BUILDS_OBJ_DIR)/pinvoke.o: runtime/pinvoke.c runtime/pinvoke.h $(BUILDS_OBJ_DIR)/pinvoke-table.h | $(BUILDS_OBJ_DIR)
$(EMCC) $(EMCC_FLAGS) $(1) -Oz -DGEN_PINVOKE=1 -I$(BUILDS_OBJ_DIR) runtime/pinvoke.c -c -o $$@
$(EMCC) $(EMCC_FLAGS) $(1) -O3 -flto -DGEN_PINVOKE=1 -I$(BUILDS_OBJ_DIR) runtime/pinvoke.c -c -o $$@

$(BUILDS_OBJ_DIR)/corebindings.o: runtime/corebindings.c | $(BUILDS_OBJ_DIR)
$(EMCC) $(EMCC_FLAGS) $(1) -Oz -I$(MONO_INCLUDE_DIR) runtime/corebindings.c -c -o $$@
$(EMCC) $(EMCC_FLAGS) $(1) -O3 -flto -I$(MONO_INCLUDE_DIR) runtime/corebindings.c -c -o $$@

$(NATIVE_BIN_DIR)/src/emcc-flags.txt: | $(NATIVE_BIN_DIR)/src Makefile
echo "$(call escape_quote,$(EMCC_FLAGS)) $(1)" > $$@
Expand Down
9 changes: 4 additions & 5 deletions src/mono/wasm/runtime/binding_support.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ var BindingSupportLib = {
((typeof js_obj === "object" || typeof js_obj === "function") && typeof js_obj.then === "function")
}

var result;
switch (true) {
case js_obj === null:
case typeof js_obj === "undefined":
Expand Down Expand Up @@ -962,7 +963,7 @@ var BindingSupportLib = {

var conv = primitiveConverters.get (key);
if (!conv)
throw new Error ("Unknown parameter type " + type);
throw new Error ("Unknown parameter type " + key);

var localStep = Object.create (conv.steps[0]);
localStep.size = conv.size;
Expand Down Expand Up @@ -1300,7 +1301,7 @@ var BindingSupportLib = {
converter, buffer, resultRoot, exceptionRoot, argsRootBuffer, is_result_marshaled
) {
this._handle_exception_for_call (converter, buffer, resultRoot, exceptionRoot, argsRootBuffer);

var result;
if (is_result_marshaled)
result = this._unbox_mono_obj_root (resultRoot);
else
Expand Down Expand Up @@ -1443,7 +1444,7 @@ var BindingSupportLib = {
"return result;"
);

bodyJs = body.join ("\r\n");
var bodyJs = body.join ("\r\n");

if (friendly_name) {
var escapeRE = /[^A-Za-z0-9_]/g;
Expand Down Expand Up @@ -1699,7 +1700,6 @@ var BindingSupportLib = {

var js_args = BINDING.mono_wasm_parse_args(args);

var res;
try {
var m = obj [js_name];
if (typeof m === "undefined")
Expand Down Expand Up @@ -1731,7 +1731,6 @@ var BindingSupportLib = {
return BINDING.js_string_to_mono_string ("Invalid property name object '" + js_name + "'");
}

var res;
try {
var m = obj [js_name];
if (m === Object(m) && obj.__is_mono_proxied__)
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/corebindings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ EM_JS(MonoObject*, compile_function, (int snippet_ptr, int len, int *is_exceptio
}
catch (e)
{
res = e.toString ();
var res = e.toString ();
setValue (is_exception, 1, "i32");
if (res === null || res === undefined)
res = "unknown exception";
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/dotnet_support.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var DotNetSupportLib = {
var funcNameJsString = DOTNET.conv_string(functionName);
var argsJsonJsString = argsJson && DOTNET.conv_string (argsJson);

var dotNetExports = globaThis.DotNet;
var dotNetExports = globalThis.DotNet;
if (!dotNetExports) {
throw new Error('The Microsoft.JSInterop.js library is not loaded.');
}
Expand Down
4 changes: 4 additions & 0 deletions src/mono/wasm/runtime/externs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @externs

var ___cxa_is_pointer_type = function(type) {};
var ___cxa_can_catch = function(caughtType, thrownType, exceptionThrowBuf) {};
4 changes: 2 additions & 2 deletions src/mono/wasm/runtime/library_mono.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,7 +2268,7 @@ var MonoSupportLib = {

var manifest;
try {
manifestContent = Module.UTF8ArrayToString(data, 8, manifestSize);
var manifestContent = Module.UTF8ArrayToString(data, 8, manifestSize);
manifest = JSON.parse(manifestContent);
if (!(manifest instanceof Array))
return false;
Expand All @@ -2295,7 +2295,7 @@ var MonoSupportLib = {
Module['FS_createPath'](prefix, folder, true, true);
});

for (row of manifest) {
for (var row of manifest) {
var name = row[0];
var length = row[1];
var bytes = data.slice(0, length);
Expand Down
16 changes: 11 additions & 5 deletions src/mono/wasm/wasm.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,13 @@
<EmccFlags>--profiling-funcs -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s BINARYEN=1 -s ALIASING_FUNCTION_POINTERS=0 -s NO_EXIT_RUNTIME=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall', 'FS_createPath', 'FS_createDataFile', 'cwrap', 'setValue', 'getValue', 'UTF8ToString', 'UTF8ArrayToString', 'addFunction']" -s "EXPORTED_FUNCTIONS=['_putchar']" --source-map-base http://example.com -emit-llvm -s FORCE_FILESYSTEM=1 -s USE_ZLIB=1</EmccFlags>
<EmccFlags Condition="'$(WasmEnableES6)' == 'true'">$(EmccFlags) -s MODULARIZE=1 -s EXPORT_ES6=1</EmccFlags>
<EmccConfigurationFlags Condition="'$(Configuration)' == 'Debug'">-g -Os -s ASSERTIONS=1 -DENABLE_NETCORE=1 -DDEBUG=1</EmccConfigurationFlags>
<EmccConfigurationFlags Condition="'$(Configuration)' == 'Release'">-Oz --llvm-opts 2 -DENABLE_NETCORE=1</EmccConfigurationFlags>
<EmccConfigurationFlags Condition="'$(Configuration)' == 'Release'">-O3 -flto --llvm-opts 3 -DENABLE_NETCORE=1</EmccConfigurationFlags>
<StripCmd>&quot;$(EMSDK_PATH)/upstream/bin/wasm-opt&quot; --strip-dwarf &quot;$(NativeBinDir)/dotnet.wasm&quot; -o &quot;$(NativeBinDir)/dotnet.wasm&quot;</StripCmd>
<WasmObjDir>$(ArtifactsObjDir)wasm</WasmObjDir>
<WasmVersionFile>$(WasmObjDir)\emcc-version.txt</WasmVersionFile>
<MonoIncludeDir>$(MonoArtifactsPath)include/mono-2.0</MonoIncludeDir>
<SystemNativeDir>$(RepoRoot)src\libraries\Native\Unix\System.Native</SystemNativeDir>
<EmccClosureArgs>--externs runtime/externs.js</EmccClosureArgs>
</PropertyGroup>
<ItemGroup>
<ICULibNativeFiles Include="$(ICULibDir)/libicuuc.a;
Expand All @@ -140,24 +141,29 @@
<ICULibFiles Include="$(ICULibDir)/*.dat" />
</ItemGroup>

<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -Oz -I&quot;$(MonoIncludeDir)&quot; runtime/corebindings.c -c -o &quot;$(MonoObjDir)corebindings.o&quot;"
<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -O3 -flto -I&quot;$(MonoIncludeDir)&quot; runtime/corebindings.c -c -o &quot;$(MonoObjDir)corebindings.o&quot;"
EmSdkPath="$(EMSDK_PATH)"
IgnoreStandardErrorWarningFormat="true" />

<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -Oz -DCORE_BINDINGS -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/driver.c -c -o &quot;$(MonoObjDir)driver.o&quot;"
<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -O3 -flto -DCORE_BINDINGS -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/driver.c -c -o &quot;$(MonoObjDir)driver.o&quot;"
EmSdkPath="$(EMSDK_PATH)"
IgnoreStandardErrorWarningFormat="true" />

<Copy SourceFiles="@(PInvokeTableFile)"
DestinationFolder="$(MonoObjDir)"
SkipUnchangedFiles="true" />

<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -Oz -DGEN_PINVOKE=1 -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/pinvoke.c -c -o &quot;$(MonoObjDir)pinvoke.o&quot;"
<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -O3 -flto -DGEN_PINVOKE=1 -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/pinvoke.c -c -o &quot;$(MonoObjDir)pinvoke.o&quot;"
EmSdkPath="$(EMSDK_PATH)"
IgnoreStandardErrorWarningFormat="true" />

<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library &quot;$(SystemNativeDir)\pal_random.js&quot; &quot;$(MonoObjDir)/driver.o&quot; &quot;$(MonoObjDir)/pinvoke.o&quot; &quot;$(MonoObjDir)/corebindings.o&quot; &quot;@(MonoLibFiles->'%(FullPath)', '&quot; &quot;')&quot; -o &quot;$(NativeBinDir)/dotnet.js&quot; &amp;&amp; $(StripCmd)"
<!--
Add &#45;&#45;closure 1 to enable ADVANCED_OPTIMIZATIONS for the closure complier which reduces the output JavaScript file significantly;
however the correct extern values need to be added to externs.js so names used outside aren't mangled.
-->
<RunWithEmSdkEnv Command="$(EmccCmd) $(EmccFlags) $(EmccConfigurationFlags) -O3 -flto --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library &quot;$(SystemNativeDir)\pal_random.js&quot; &quot;$(MonoObjDir)/driver.o&quot; &quot;$(MonoObjDir)/pinvoke.o&quot; &quot;$(MonoObjDir)/corebindings.o&quot; &quot;@(MonoLibFiles->'%(FullPath)', '&quot; &quot;')&quot; -v -o &quot;$(NativeBinDir)/dotnet.js&quot; &amp;&amp; $(StripCmd)"
EmSdkPath="$(EMSDK_PATH)"
ClosureArgs="$(EmccClosureArgs)"
IgnoreStandardErrorWarningFormat="true" />

<RunWithEmSdkEnv Command="$(EmccCmd) --version"
Expand Down
8 changes: 8 additions & 0 deletions src/tasks/WasmAppBuilder/RunWithEmSdkEnv.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Tasks;
using System.Diagnostics.CodeAnalysis;
using System;
using System.IO;
using System.Runtime.InteropServices;

Expand All @@ -15,6 +16,8 @@ public class RunWithEmSdkEnv : Exec
[Required]
public string? EmSdkPath { get; set; }

public string? ClosureArgs { get; set; }

public override bool Execute()
{
IgnoreStandardErrorWarningFormat = true;
Expand All @@ -37,6 +40,11 @@ public override bool Execute()
Command = $"bash -c 'source {envScriptPath} > /dev/null 2>&1 && {Command}'";
}

if (ClosureArgs != null)
{
Environment.SetEnvironmentVariable("EMCC_CLOSURE_ARGS", ClosureArgs);
}

var workingDir = string.IsNullOrEmpty(WorkingDirectory) ? Directory.GetCurrentDirectory() : WorkingDirectory;
Log.LogMessage(MessageImportance.Low, $"Working directory: {workingDir}");
Log.LogMessage(MessageImportance.Low, $"Using Command: {Command}");
Expand Down