[NativeAOT LLVM] Integrate dotnet.js into ILCompiler.LLVM #2453
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <PropertyGroup> | ||
| <LinkNativeDependsOn Condition="'$(_targetOS)' == 'browser' and '$(DotNetJsApi)' == 'true'">$(LinkNativeDependsOn);PrepareDotNetJsApiForLinking</LinkNativeDependsOn> | ||
| <NativeBinary>$(NativeOutputPath)dotnet.native.js</NativeBinary> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <EmccExportedFunction Include="_free" /> | ||
| <EmccExportedFunction Include="_htons" /> | ||
| <EmccExportedFunction Include="_malloc" /> | ||
| <EmccExportedFunction Include="_memalign" /> | ||
| <EmccExportedFunction Include="_memset" /> | ||
| <EmccExportedFunction Include="_ntohs" /> | ||
| <EmccExportedFunction Include="stackAlloc" /> | ||
| <EmccExportedFunction Include="stackRestore" /> | ||
| <EmccExportedFunction Include="stackSave" /> | ||
| <EmccExportedRuntimeMethod Include="FS" /> | ||
| <EmccExportedRuntimeMethod Include="out" /> | ||
| <EmccExportedRuntimeMethod Include="err" /> | ||
| <EmccExportedRuntimeMethod Include="ccall" /> | ||
| <EmccExportedRuntimeMethod Include="cwrap" /> | ||
| <EmccExportedRuntimeMethod Include="setValue" /> | ||
| <EmccExportedRuntimeMethod Include="getValue" /> | ||
| <EmccExportedRuntimeMethod Include="addRunDependency" /> | ||
| <EmccExportedRuntimeMethod Include="addFunction" /> | ||
| <EmccExportedRuntimeMethod Include="UTF8ToString" /> | ||
| <EmccExportedRuntimeMethod Include="UTF8ArrayToString" /> | ||
| <EmccExportedRuntimeMethod Include="stringToUTF8Array" /> | ||
| <EmccExportedRuntimeMethod Include="FS_createPath" /> | ||
| <EmccExportedRuntimeMethod Include="FS_createDataFile" /> | ||
| <EmccExportedRuntimeMethod Include="removeRunDependency" /> | ||
| <EmccExportedRuntimeMethod Include="safeSetTimeout" /> | ||
| <EmccExportedRuntimeMethod Include="runtimeKeepalivePush" /> | ||
| <EmccExportedRuntimeMethod Include="runtimeKeepalivePop" /> | ||
| <EmccExportedRuntimeMethod Include="callMain" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="PrepareDotNetJsApiForLinking"> | ||
| <PropertyGroup> | ||
| <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]"</_EmccExportedLibraryFunction> | ||
| <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]"</_EmccExportedRuntimeMethods> | ||
| <_EmccExportedFunctions>@(EmccExportedFunction -> '%(Identity)',',')</_EmccExportedFunctions> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Default values for flags passed from emscripten to dotnet/runtime.js. Left here only to minimize changes to typescript --> | ||
| <EmscriptenEnvVars Include="DISABLE_LEGACY_JS_INTEROP=1" /> | ||
| <EmscriptenEnvVars Include="WASM_ENABLE_SIMD=0" /> | ||
| <EmscriptenEnvVars Include="WASM_ENABLE_EH=1" /> | ||
| <EmscriptenEnvVars Include="ENABLE_AOT_PROFILER=0" /> | ||
| <EmscriptenEnvVars Include="ENABLE_BROWSER_PROFILER=0" /> | ||
| <EmscriptenEnvVars Include="RUN_AOT_COMPILATION=0" /> | ||
|
|
||
| <_DotNetJsLinkerFlag Include="-Wl,--export,__main_argc_argv" /><!-- Export main, a temporal solution until we have a way to export async main --> | ||
| <_DotNetJsLinkerFlag Include="-s EXPORT_ES6=1" /><!-- Produce ES6 module as expented by hosting API --> | ||
| <_DotNetJsLinkerFlag Include="-s MODULARIZE=1" /><!-- Produce ES6 module as expented by hosting API --> | ||
| <_DotNetJsLinkerFlag Include="-s INVOKE_RUN=0" /><!-- Don't automatically run main, it is called explicitly by ser --> | ||
| <_DotNetJsLinkerFlag Include="-s EXPORT_NAME="'createDotnetRuntime'"" /><!-- Export emscripten factory as 'createDotnetRuntime', as expented by hosting API --> | ||
| <_DotNetJsLinkerFlag Include="-s ENVIRONMENT="'web,webview,worker,node,shell'"" /><!-- Add support for all enviroments (default list is smaller) --> | ||
| <_DotNetJsLinkerFlag Condition="'$(EmccEnvironment)' != ''" Include="-s ENVIRONMENT="$(EmccEnvironment)"" /> | ||
| <_DotNetJsLinkerFlag Include="-s FORCE_FILESYSTEM=1" /><!-- We are using JS API for accessing FS --> | ||
| <_DotNetJsLinkerFlag Include="--emit-symbol-map" Condition="'$(WasmEmitSymbolMap)' == 'true'" /> | ||
|
|
||
| <!-- JavaScript modifications to javascript produced by emscripten --> | ||
| <JSFileType Include="extpre.js" Kind="extern-pre-js" /> | ||
| <JSFileType Include="iffe.js" Kind="extern-pre-js" /> | ||
| <JSFileType Include="pre.js" Kind="pre-js" /> | ||
| <JSFileType Include="lib.js" Kind="js-library" /> | ||
| <JSFileType Include="post.js" Kind="post-js" /> | ||
| <JSFileType Include="extpost.js" Kind="extern-post-js" /> | ||
| <_WasmExtraJSFile Include="$(IlcFrameworkNativePath)src\es6\*.%(JSFileType.Identity)" Kind="%(JSFileType.Kind)" /> | ||
| <_DotNetJsLinkerFlag Include="--%(_WasmExtraJSFile.Kind) "%(_WasmExtraJSFile.Identity)"" Condition="'%(_WasmExtraJSFile.Kind)' != ''" /> | ||
|
|
||
| <!-- Exported functions required by user or runtime API --> | ||
| <_DotNetJsLinkerFlag Include="-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$(_EmccExportedLibraryFunction)" Condition="'$(_EmccExportedLibraryFunction)' != ''" /> | ||
| <_DotNetJsLinkerFlag Include="-s EXPORTED_RUNTIME_METHODS=$(_EmccExportedRuntimeMethods)" /> | ||
| <_DotNetJsLinkerFlag Include="-s EXPORTED_FUNCTIONS=$(_EmccExportedFunctions)" /> | ||
| <_DotNetJsLinkerFlag Include="$(EmccExtraLDFlags)" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <CustomLinkerArg Include="@(_DotNetJsLinkerFlag)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| <Target Name="CopyDotnetJsAfterLinking" AfterTargets="LinkNativeLlvm"> | ||
| <ItemGroup> | ||
| <_FilesToCopyToNative Include="$(IlcFrameworkNativePath)\dotnet*.js" /> | ||
| <_FilesToCopyToNative Include="$(IlcFrameworkNativePath)\dotnet*.map" Condition="'$(WasmEmitSourceMap)' == 'true'" /> | ||
| <_FilesToCopyToNative Include="@(WasmExtraFilesToDeploy)" /><!-- Use defined extra files to be included in the build output --> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </ItemGroup> | ||
| <Copy SourceFiles="@(_FilesToCopyToNative)" DestinationFolder="$(NativeOutputPath)" /> | ||
| </Target> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,5 +2,5 @@ if (_nativeModuleLoaded) throw new Error("Native module already loaded"); | |
| _nativeModuleLoaded = true; | ||
| // see https://github.com/emscripten-core/emscripten/issues/19832 | ||
| Module["getMemory"] = function () { return wasmMemory; } | ||
| moduleArg = Module = moduleArg(Module); | ||
|
There was a problem hiding this comment. Emscripten 3.1.47 generates var createDotnetRuntime = (() => {
var _scriptDir = import.meta.url;
return (
async function(moduleArg = {}) {I dunno yet if that can be configured somehow and I'm missing that flag or whether it's in empscripten (main has There was a problem hiding this comment. <_EmccLinkFlags Include="-s EXPORT_NAME="'createDotnetRuntime'"" /> There was a problem hiding this comment. maybe it's worth replacing the whole wasm.proj with latest from main ? There was a problem hiding this comment.
I already have this one It produces the createDotnetRuntime, but the argument passed in is called moduleArg
There was a problem hiding this comment. Here is a sample dotnet.native.js that is generated by emcripten 3.1.47 dotnet.native.zip There was a problem hiding this comment. hmmm, it seems we use |
||
| Module["getMemory"] = function () { return wasmMemory; } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.