[NativeAOT-LLVM] add support for building WASI and browser debug & release on Linux #2605
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
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
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 |
|---|---|---|
|
|
@@ -15,5 +15,5 @@ tar zxf powershell.tar.gz -C powershell7 | |
| # Set execute permissions | ||
| chmod +x powershell7/pwsh | ||
|
|
||
| echo setting PATH $PATH:$1/powershell7 | ||
| echo '##vso[task.setvariable variable=PATH]'$PATH:$1/powershell7 | ||
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,3 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| echo '##vso[task.setvariable variable=EMSDK_PYTHON]'/usr/bin/python3 |
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,5 +1,10 @@ | ||
| param( | ||
| $InstallDir, | ||
| [switch]$CI | ||
| ) | ||
|
|
||
| $WasiSdkVersion = 24 | ||
| Set-Location -Path $InstallDir | ||
| $ErrorActionPreference = "Stop" | ||
| $ProgressPreference = "SilentlyContinue" | ||
|
|
||
|
|
@@ -11,13 +16,27 @@ if ($WasiSdkVersion -lt [int]$UpstreamWasiSdkVersion) | |
| exit | ||
| } | ||
|
|
||
| if ($IsWindows) | ||
| { | ||
| $WasiSdkHost = "x86_64-windows" | ||
| } | ||
| else | ||
| { | ||
| $WasiSdkHost = "x86_64-linux" | ||
| } | ||
| $WasiSdkDirName = "wasi-sdk-$WasiSdkVersion.0-$WasiSdkHost" | ||
| $WasiSdkGzFile = "$WasiSdkDirName.tar.gz" | ||
|
|
||
| Invoke-WebRequest -Uri https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WasiSdkVersion/$WasiSdkGzFile -OutFile $WasiSdkGzFile | ||
|
|
||
| tar -xzf $WasiSdkGzFile | ||
| mv $WasiSdkDirName wasi-sdk | ||
|
|
||
| # The upstream build expects this sentinel to exist, otherwise it tries to use a provisioned SDK. | ||
| $WasiSdkVersion > wasi-sdk/"VERSION$("$WasiSdkVersion".ToUpper())" | ||
|
|
||
| if ($CI) | ||
| { | ||
| Write-Host "Setting WASI_SDK_PATH to '$InstallDir/wasi-sdk'" | ||
| Write-Output "##vso[task.setvariable variable=WASI_SDK_PATH]$InstallDir/wasi-sdk" | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -10,11 +10,37 @@ $ProgressPreference = "SilentlyContinue" | |
| Set-Location $InstallDir | ||
|
|
||
| $WasmtimeVersion = "v21.0.1" | ||
|
|
||
| if (!(Test-Path variable:global:IsWindows)) | ||
| { | ||
| $IsWindows = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT | ||
| } | ||
|
|
||
| if ($IsWIndows) | ||
| { | ||
| $WasmtimeBaseName = "wasmtime-$WasmtimeVersion-x86_64-windows" | ||
| $WasmtimeArchive = "$WasmtimeBaseName.zip" | ||
| } | ||
| else | ||
| { | ||
| $WasmtimeBaseName = "wasmtime-$WasmtimeVersion-x86_64-linux" | ||
| $WasmtimeArchive = "$WasmtimeBaseName.tar.xz" | ||
| } | ||
|
|
||
| Invoke-WebRequest -Uri https://github.com/bytecodealliance/wasmtime/releases/download/$WasmtimeVersion/$WasmtimeArchive -OutFile $WasmtimeArchive | ||
| if ($IsWIndows) | ||
| { | ||
| Expand-Archive -LiteralPath $WasmtimeArchive -DestinationPath . | ||
| } | ||
| else | ||
| { | ||
| New-Item -ItemType Directory -Force -Path $WasmtimeBaseName | ||
| tar -xf $WasmtimeArchive -C $WasmtimeBaseName | ||
| } | ||
|
|
||
| if ($CI) | ||
| { | ||
| Write-Host "Setting WASMTIME_EXECUTABLE to '$pwd/$WasmtimeBaseName/$WasmtimeBaseName/wasmtime'" | ||
| Write-Output "##vso[task.setvariable variable=WASMTIME_EXECUTABLE]$pwd/$WasmtimeBaseName/$WasmtimeBaseName/wasmtime" | ||
| Write-Output "##vso[task.prependpath]$pwd/$WasmtimeBaseName" | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ steps: | |
| # Now we need to build the cross-targeting compilers, RyuJit and ILC. Likewise with packages. | ||
|
|
||
| - ${{ if eq(parameters.archType, 'wasm') }}: | ||
| - script: $(Build.SourcesDirectory)/build$(scriptExt) clr.wasmjit+clr.aot -c $(buildConfigUpper) $(_officialBuildParameter) -ci -cross | ||
| displayName: Build the ILC and RyuJit cross-compilers | ||
|
|
||
| - ${{ if and(eq(parameters.isOfficialBuild, true), eq(parameters.platform, 'browser_wasm_win')) }}: | ||
|
|
@@ -34,9 +34,17 @@ steps: | |
| displayName: Build WebAssembly tests | ||
| - ${{ elseif eq(parameters.platform, 'wasi_wasm_win') }}: | ||
| - script: | | ||
| $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
| displayName: Build WebAssembly tests | ||
| - ${{ elseif eq(parameters.platform, 'Browser_wasm_linux_x64_naot_llvm') }}: | ||
| - script: | | ||
| source $(Build.SourcesDirectory)/wasm-tools/emsdk/emsdk_env.sh | ||
| $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) -browser tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
| displayName: Build WebAssembly tests | ||
| - ${{ elseif eq(parameters.platform, 'wasi_wasm_linux_x64_naot_llvm') }}: | ||
| - script: | | ||
| $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) -wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
| displayName: Build WebAssembly tests | ||
|
|
||
| - ${{ elseif eq(parameters.osGroup, 'windows') }}: | ||
| - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} ${{ parameters.testFilter }} /p:NativeAotMultimodule=true /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
|
|
@@ -52,15 +60,14 @@ steps: | |
| $(Build.SourcesDirectory)/src/tests/run$(scriptExt) runnativeaottests $(buildConfigUpper) ${{ parameters.archType }} ${{ parameters.osGroup }} | ||
| displayName: Run WebAssembly tests in single file mode | ||
| - ${{ elseif eq(parameters.osGroup, 'windows') }}: | ||
| - script: $(Build.SourcesDirectory)/src/tests/run$(scriptExt) runnativeaottests $(buildConfigUpper) ${{ parameters.archType }} ${{ parameters.osGroup }} | ||
| displayName: Run tests in single file mode | ||
| - ${{ else }}: | ||
| - script: $(Build.SourcesDirectory)/src/tests/run$(scriptExt) --runnativeaottests $(buildConfigUpper) ${{ parameters.archType }} ${{ parameters.osGroup }} | ||
| displayName: Run tests in single file mode | ||
|
|
||
| - ${{ if eq(parameters.archType, 'wasm') }}: | ||
| - script: | | ||
| $(Build.SourcesDirectory)/build$(scriptExt) libs.tests -test -a ${{ parameters.archType }} -os ${{ parameters.osGroup }} -lc ${{ parameters.librariesConfiguration }} -rc $(buildConfigUpper) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true | ||
| displayName: Build and run WebAssembly libraries tests | ||
|
|
||
|
|
||
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,27 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| exename=$(basename "$1" .wasm) | ||
| exename=$(basename "$exename" .dll) | ||
| exename=$(basename "$exename" .js) | ||
| dirname=$(dirname "$1") | ||
|
|
||
| node="node --stack_trace_limit=100" | ||
| WASM_HOST_ARGS_SEPERATOR="" | ||
|
|
||
| if [ -e "${dirname}/${exename}.js" ]; then | ||
| WASM_HOST_EXECUTABLE=$node | ||
| WASM_BINARY_TO_EXECUTE="${dirname}/${exename}.js" | ||
| elif [ -e "${dirname}/main.js" ]; then | ||
| WASM_HOST_EXECUTABLE=$node | ||
| WASM_BINARY_TO_EXECUTE="${dirname}/main.js" | ||
| elif [ -e "${dirname}/${exename}.mjs" ]; then | ||
| WASM_HOST_EXECUTABLE=$node | ||
| WASM_BINARY_TO_EXECUTE="${dirname}/${exename}.mjs" | ||
| elif [ -e "${dirname}/main.mjs" ]; then | ||
| WASM_HOST_EXECUTABLE=$node | ||
| WASM_BINARY_TO_EXECUTE="${dirname}/main.mjs" | ||
| elif [ -e "${dirname}/${exename}.wasm" ]; then | ||
| WASM_HOST_EXECUTABLE=$WASMTIME_EXECUTABLE | ||
| WASM_HOST_ARGS_SEPERATOR="--" | ||
| WASM_BINARY_TO_EXECUTE="${dirname}/${exename}.wasm" | ||
| fi |
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,14 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd) | ||
|
|
||
| source $SCRIPT_DIR/FindWasmHostExecutable.sh "$1" | ||
|
|
||
| if [ -n "${WASM_HOST_EXECUTABLE}" ]; then | ||
| shift | ||
| echo $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" $WASM_HOST_ARGS_SEPERATOR "$@" | ||
| $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" $WASM_HOST_ARGS_SEPERATOR "$@" | ||
|
There was a problem hiding this comment.
|
||
| else | ||
| echo WASM_HOST_EXECUTABLE not set. | ||
| exit 1 | ||
| fi | ||
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.
Logging deleted intentionally?
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.
no, thanks