[wasm] Integrate naot-llvm into workload manifest #101801
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -1,6 +1 @@ | ||
| Wasi.Build.Tests.NativeAOTTests |
This file contains 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 |
|---|---|---|
| @@ -1,49 +1 @@ | ||
| Wasm.Build.Tests.NativeAOTTests |
This file contains 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 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 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,83 @@ | ||
| // 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.IO; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Wasm.Build.Tests; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
| using Xunit.Sdk; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace Wasi.Build.Tests; | ||
|
|
||
| public class NativeAOTTests : BuildTestBase | ||
| { | ||
| public NativeAOTTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) | ||
| : base(output, buildContext) | ||
| { | ||
| } | ||
|
|
||
| [Fact] | ||
| public void PublishAndRun() | ||
| { | ||
| const string config = "Release"; | ||
| string id = $"nativeaot_{GetRandomId()}"; | ||
| string projectFile = CreateWasmTemplateProject(id, "wasiconsole"); | ||
| string projectName = Path.GetFileNameWithoutExtension(projectFile); | ||
|
|
||
| string programCsContent = File.ReadAllText(Path.Combine(BuildEnvironment.TestAssetsPath, "SimpleMainWithArgs.cs")); | ||
| programCsContent = programCsContent.Replace("return 42;", "return 0;"); | ||
| File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), programCsContent); | ||
| File.Delete(Path.Combine(_projectDir!, "runtimeconfig.template.json")); | ||
|
|
||
| var buildArgs = ExpandBuildArgs(new BuildArgs(projectName, config, AOT: false, id, null)); | ||
|
|
||
| AddItemsPropertiesToProject(projectFile, extraProperties: "<PublishAot>true</PublishAot>"); | ||
|
|
||
| try | ||
| { | ||
| bool isWindowsPlatform = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); | ||
| (_, string buildOutput) = BuildProject( | ||
| buildArgs, | ||
| id: id, | ||
| new BuildProjectOptions( | ||
| AssertAppBundle: false, | ||
| CreateProject: false, | ||
| Publish: true, | ||
| TargetFramework: DefaultTargetFramework, | ||
| ExpectSuccess: isWindowsPlatform | ||
| ) | ||
| ); | ||
|
|
||
| if (isWindowsPlatform) | ||
| { | ||
| string outputDir = Path.Combine(_projectDir!, "bin", config, DefaultTargetFramework, BuildEnvironment.DefaultRuntimeIdentifier, "native"); | ||
| string outputFileName = $"{id}.wasm"; | ||
|
|
||
| Assert.True(File.Exists(Path.Combine(outputDir, outputFileName)), $"Expected {outputFileName} to exist in {outputDir}"); | ||
| Assert.Contains("Generating native code", buildOutput); | ||
|
|
||
| using var runCommand = new ToolCommand(BuildEnvironment.GetExecutableName(@"wasmtime"), _testOutput) | ||
| .WithWorkingDirectory(outputDir); | ||
|
|
||
| var result = runCommand.Execute(outputFileName).EnsureSuccessful(); | ||
| Assert.Contains("Hello, Wasi Console!", result.Output); | ||
| } | ||
| else | ||
| { | ||
| Assert.Contains("NETSDK1204", buildOutput); // Ahead-of-time compilation is not supported on the current platform 'linux-x64' | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| _testOutput.WriteLine($"Content of {_nugetPackagesDir}"); | ||
| foreach (string file in Directory.EnumerateFiles(_nugetPackagesDir, "*", SearchOption.AllDirectories)) | ||
| _testOutput.WriteLine(file); | ||
| } | ||
| } | ||
| } |
This file contains 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 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,80 @@ | ||
| // 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.IO; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Wasm.Build.Tests.Blazor; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
| using Xunit.Sdk; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace Wasm.Build.Tests; | ||
|
|
||
| public class NativeAOTTests : BlazorWasmTestBase | ||
| { | ||
| public NativeAOTTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) | ||
| : base(output, buildContext) | ||
| { | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData("NativeAOT")] | ||
| [InlineData("NativeAOT2")] | ||
| public async Task PublishAndRun(string assetName) | ||
| { | ||
| string config = "Release"; | ||
| string id = $"browser_{config}_{GetRandomId()}"; | ||
|
|
||
| InitBlazorWasmProjectDir(id); | ||
| Utils.DirectoryCopy(Path.Combine(BuildEnvironment.TestAssetsPath, assetName), Path.Combine(_projectDir!)); | ||
| string projectName = Path.GetFileNameWithoutExtension(_projectDir!); | ||
|
|
||
| try | ||
| { | ||
| bool isWindowsPlatform = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); | ||
| (_, string buildOutput) = BuildTemplateProject( | ||
| ExpandBuildArgs(new BuildArgs(projectName, config, AOT: false, id, null)), | ||
| id: id, | ||
| new BuildProjectOptions( | ||
| AssertAppBundle: false, | ||
| CreateProject: false, | ||
| Publish: true, | ||
| TargetFramework: DefaultTargetFramework, | ||
| ExpectSuccess: isWindowsPlatform | ||
| ) | ||
| ); | ||
|
|
||
| if (isWindowsPlatform) | ||
| { | ||
| string outputDir = Path.Combine(_projectDir!, "bin", config, DefaultTargetFramework, BuildEnvironment.DefaultRuntimeIdentifier, "native"); | ||
|
|
||
| List<string> consoleOutput = new(); | ||
| BlazorRunOptions blazorRunOptions = new( | ||
| CheckCounter: false, | ||
| Config: config, | ||
| OnConsoleMessage: (_, message) => consoleOutput.Add(message.Text), | ||
| Host: BlazorRunHost.WebServer | ||
| ); | ||
| await BlazorRunTest($"{s_xharnessRunnerCommand} wasm webserver --app=. --web-server-use-default-files", outputDir, blazorRunOptions); | ||
|
|
||
| Assert.True(consoleOutput.Contains("Hello, NativeAOT!"), $"Expected 'Hello, NativeAOT!' wasn't emitted by the test app. Output was: {String.Join(", ", consoleOutput)}"); | ||
| } | ||
| else | ||
| { | ||
| Assert.Contains("NETSDK1204", buildOutput); // Ahead-of-time compilation is not supported on the current platform 'linux-x64' | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| _testOutput.WriteLine($"Content of {_nugetPackagesDir}"); | ||
| foreach (string file in Directory.EnumerateFiles(_nugetPackagesDir, "*", SearchOption.AllDirectories)) | ||
| _testOutput.WriteLine(file); | ||
| } | ||
| } | ||
| } |
This file contains 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,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <RuntimeIdentifier>browser-wasm</RuntimeIdentifier> | ||
| <OutputType>Exe</OutputType> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <DotNetJsApi>true</DotNetJsApi> | ||
| <PublishAot>true</PublishAot> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <WasmExtraFilesToDeploy Include="wwwroot\*" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains 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,10 @@ | ||
| using System; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Runtime.InteropServices; | ||
| using System.Runtime.InteropServices.JavaScript; | ||
| using System.Net.Http; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| Console.WriteLine("Hello, NativeAOT!"); | ||
| Console.WriteLine($"Args {String.Join(", ", args)}"); |
This file contains 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,8 @@ | ||
| <!doctype html> | ||
| <html lang="en-us"> | ||
| <head> | ||
| <script type='module' src="./main.js"></script> | ||
| </head> | ||
| <body> | ||
| </body> | ||
| </html> |
This file contains 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,11 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| import { dotnet } from './dotnet.js' | ||
|
|
||
| await dotnet | ||
| .withApplicationArguments("A", "B", "C") | ||
| .withMainAssembly("NativeAOT") | ||
| .create(); | ||
|
|
||
| await dotnet.run(); |
This file contains 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,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <RuntimeIdentifier>browser-wasm</RuntimeIdentifier> | ||
| <OutputType>Exe</OutputType> | ||
| <PublishTrimmed>true</PublishTrimmed> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <DotNetJsApi>true</DotNetJsApi> | ||
| <UsingBrowserRuntimeWorkload>false</UsingBrowserRuntimeWorkload> | ||
| <UsingWasiRuntimeWorkload>false</UsingWasiRuntimeWorkload> | ||
| <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json</RestoreAdditionalProjectSources> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <WasmExtraFilesToDeploy Include="wwwroot\*" /> | ||
| <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-preview.4.24257.3" /> | ||
| <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-preview.4.24257.3" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains 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,10 @@ | ||
| using System; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Runtime.InteropServices; | ||
| using System.Runtime.InteropServices.JavaScript; | ||
| using System.Net.Http; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| Console.WriteLine("Hello, NativeAOT!"); | ||
| Console.WriteLine($"Args {String.Join(", ", args)}"); |
This file contains 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,8 @@ | ||
| <!doctype html> | ||
| <html lang="en-us"> | ||
| <head> | ||
| <script type='module' src="./main.js"></script> | ||
| </head> | ||
| <body> | ||
| </body> | ||
| </html> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we not use PublishAot == true condition directly? MSBuild evaluates it the same way (since there is no use in any target), so it seems redundant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can. I wanted to extract it, because we weren't sure if using
PublishAotfor this highly experimental thing is the right choice.