[NativeAOT-LLVM] Build on Linux

eng/common/build.sh

@@ -87,6 +87,8 @@ prepare_machine=false
 verbosity='minimal'
 runtime_source_feed=''
 runtime_source_feed_key=''
+host_arch=''
+target_os=''
 
 properties=''
 while [[ $# > 0 ]]; do
@@ -185,7 +187,15 @@ while [[ $# > 0 ]]; do
       runtime_source_feed=$2
       shift
       ;;
-     -runtimesourcefeedkey)
+     -arch)
+      host_arch=$2
+      shift
+      ;;
+     -os)
+      target_os=$2
+      shift
+      ;;
+     -runtimesourceyeedkey)
       runtime_source_feed_key=$2
       shift
       ;;
@@ -207,6 +217,14 @@ if [[ "$ci" == true ]]; then
   if [[ "$exclude_ci_binary_log" == false ]]; then
     binary_log=true
   fi
+
+  # This is a bit of a workaround for the fact that the pipelines do not have a great
+  # way of preserving the environment between scripts. Set by install-emscripten.sh.
+  if [[ "$host_arch" == "wasm" && "$target_os" == "browser" ]]; then
+    if [[ -n "$NATIVEAOT_CI_WASM_BUILD_EMSDK_PATH" ]]; then
+       source $NATIVEAOT_CI_WASM_BUILD_EMSDK_PATH/emsdk_env.sh
+    fi
+  fi
 fi
 
 . "$scriptroot/tools.sh"
@@ -226,6 +244,12 @@ function Build {
   if [[ ! -z "$projects" ]]; then
     properties="$properties /p:Projects=$projects"
   fi
+  if [[ ! -z "$host_arch" ]]; then
+    properties="$properties -arch $host_arch"
+  fi
+  if [[ ! -z "$target_os" ]]; then
+    properties="$properties -os $target_os"
+  fi
 
   local bl=""
   if [[ "$binary_log" == true ]]; then

eng/pipelines/common/global-build-job.yml

@@ -206,13 +206,23 @@ jobs:
           df -h
         displayName: Disk Usage before Build
 
-      # Install Wasm dependencies: emscripten, LLVM, NodeJS
-    - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.archType, 'wasm')) }}:
-      - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-emscripten.cmd $(Build.SourcesDirectory)\wasm-tools
+      # Install Wasm dependencies on Windows: emscripten, LLVM, NodeJS
+    - ${{ if and(eq(parameters.hostedOs, 'windows'), and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.archType, 'wasm'))) }}:
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-emscripten.ps1 $(Build.SourcesDirectory)/wasm-tools
         displayName: Install/activate emscripten
       - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-llvm.cmd $(Build.SourcesDirectory)\wasm-tools $(Build.SourcesDirectory) ${{ parameters.buildConfig }}
         displayName: Install/build LLVM
-      - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.cmd $(Build.SourcesDirectory)\wasm-tools
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.ps1 $(Build.SourcesDirectory)\wasm-tools
+        displayName: Install NodeJS
+
+      # Install Wasm dependencies on Linux: emscripten, LLVM, NodeJS.
+    - ${{ if and(eq(parameters.hostedOs, 'linux'), and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.archType, 'wasm'))) }}:
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-emscripten.ps1 $(Build.SourcesDirectory)/wasm-tools
+        displayName: Install/activate emscripten
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-llvm.ps1 -Configs ${{ parameters.buildConfig }} -CI
+        workingDirectory: $(Build.SourcesDirectory)/wasm-tools
+        displayName: Install/build LLVM
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.ps1 $(Build.SourcesDirectory)/wasm-tools
         displayName: Install NodeJS
 
     - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'wasi_wasm_win')) }}:

eng/pipelines/runtimelab.yml

@@ -59,7 +59,6 @@ extends:
             helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
             buildConfig: debug
             platforms:
-#            - linux_x64
             - osx_x64
             - windows_x64
             - Browser_wasm_win
@@ -81,7 +80,6 @@ extends:
             helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
             buildConfig: checked
             platforms:
-#            - linux_x64
             - windows_x64
             jobParameters:
               timeoutInMinutes: 300
@@ -101,7 +99,7 @@ extends:
             helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
             buildConfig: release
             platforms:
-#            - linux_x64
+            - linux_x64
             - osx_x64
             - windows_x64
             - Browser_wasm_win

eng/pipelines/runtimelab/install-emscripten.ps1

@@ -0,0 +1,23 @@
+param(
+    [string]$InstallDir
+)
+
+New-Item -ItemType Directory -Force -ErrorAction SilentlyContinue -Path (Split-Path -Path $InstallDir -Parent) -Name (Split-Path -Path $InstallDir -Leaf)
+
+$ErrorActionPreference="Stop"
+
+Set-Location -Path $InstallDir
+
+git clone https://github.com/emscripten-core/emsdk.git
+
+Set-Location -Path emsdk
+
+# Checkout a specific commit to avoid unexpected issues
+git checkout 37b85e9
+
+python ./emsdk.py install 3.1.47
+
+./emsdk activate 3.1.47
+
+# Set a variable for later use (used in common/build.ps1)
+Write-Host "##vso[task.setvariable variable=NATIVEAOT_CI_WASM_BUILD_EMSDK_PATH]$PWD"

eng/pipelines/runtimelab/install-llvm.cmd

@@ -10,9 +10,6 @@ call "%RepoRoot%eng\native\init-vs-env.cmd" wasm || exit /b 1
 echo Using CMake at "%CMakePath%"
 set PATH=%PATH%;%CMakePath%
 
-:: There is no [C/c]hecked LLVM config, so change to Debug
-if /I %LlvmBuildConfig% EQU checked set LlvmBuildConfig=Debug
-
 powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -File "%~dp0install-llvm.ps1" -Configs %LlvmBuildConfig% -CI
 if %errorlevel% NEQ 0 goto fail
 exit /b 0

eng/pipelines/runtimelab/install-llvm.ps1

@@ -1,11 +1,17 @@
 [CmdletBinding(PositionalBinding=$false)]
 param(
-    [ValidateSet("Debug","Release")][string[]]$Configs = @("Debug","Release"),
+    [ValidateSet("Debug","Release","Checked")][string[]]$Configs = @("Debug","Release"),
     [switch]$CI,
     [switch]$NoClone,
     [switch]$NoBuild
 )
 
+# Set IsWindows if the version of Powershell does not already have it.
+if (!(Test-Path variable:global:IsWindows)) 
+{
+    $IsWindows = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
+}
+
 $ErrorActionPreference="Stop"
 
 if (!(gcm git -ErrorAction SilentlyContinue))
@@ -31,27 +37,43 @@ elseif (!(Test-Path llvm-project))
     exit 1
 }
 
-foreach ($Config in $Configs)
+# There is no [C/c]hecked LLVM config, so change to Debug
+foreach ($Config in $Configs | % { if ($_ -eq "Checked") { "Debug" } else { $_ } } | Select-Object -Unique)
 {
     pushd llvm-project
     $BuildDirName = "build-$($Config.ToLower())"
-    mkdir $BuildDirName -Force
+    New-Item -ItemType Directory $BuildDirName -Force
 
     $BuildDirPath = "$pwd/$BuildDirName"
     $SourceDirName = "$pwd/llvm"
     popd
 
-    $CmakeConfigureCommandLine = "-G", "Visual Studio 17 2022", "-DLLVM_INCLUDE_BENCHMARKS=OFF", "-Thost=x64"
+    if ($IsWindows)
+    {
+        $CmakeGenerator = "Visual Studio 17 2022"
+    }
+    else
+    {
+        $CmakeGenerator = "Unix Makefiles"
+    }
+
+    $CmakeConfigureCommandLine = "-G", "$CmakeGenerator", "-DLLVM_INCLUDE_BENCHMARKS=OFF"
     $CmakeConfigureCommandLine += "-S", $SourceDirName, "-B", $BuildDirPath
     if ($Config -eq "Release")
     {
         $LlvmConfig = "Release"
-        $CmakeConfigureCommandLine += "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded"
+        if ($IsWindows)
+        {
+            $CmakeConfigureCommandLine += "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded", "-Thost=x64"
+        }
     }
     else
     {
         $LlvmConfig = "Debug"
-        $CmakeConfigureCommandLine += "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug"
+        if ($IsWindows)
+        {
+            $CmakeConfigureCommandLine += "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug", "-Thost=x64"
+        }
     }
     $CmakeConfigureCommandLine += "-DCMAKE_BUILD_TYPE=$LlvmConfig"
 

eng/pipelines/runtimelab/install-nodejs.ps1

@@ -1,7 +1,21 @@
 $InstallPath = $Args[0]
 $NodeJSVersion = "v20.2.0"
-$NodeJSInstallName = "node-$NodeJSVersion-win-x64"
-$NodeJSZipName = "$NodeJSInstallName.zip"
+
+if (!(Test-Path variable:global:IsWindows))
+{
+    $IsWindows=[environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
+}
+
+if ($IsWIndows)
+{
+    $NodeJSInstallName = "node-$NodeJSVersion-win-x64"
+    $NodeJSZipName = "$NodeJSInstallName.zip"
+}
+else
+{
+    $NodeJSInstallName = "node-$NodeJSVersion-linux-x64"
+    $NodeJSZipName = "$NodeJSInstallName.tar.xz"
+}
 
 if (!(Test-Path $InstallPath))
 {
@@ -33,9 +47,17 @@ if ($RetryCount -le 0)
     exit 1
 }
 
-Expand-Archive -LiteralPath "$InstallPath\$NodeJSInstallName.zip" -DestinationPath $InstallPath -Force
+if ($IsWindows)
+{
+    Expand-Archive -LiteralPath "$InstallPath\$NodeJSZipName" -DestinationPath $InstallPath -Force
+    $NodeJSExePath = "$InstallPath\$NodeJSInstallName\node.exe"
+}
+else
+{
+    tar xJf $InstallPath/$NodeJSZipName -C $InstallPath
+    $NodeJSExePath = "$InstallPath/$NodeJSInstallName/bin/node"
+}
 
-$NodeJSExePath = "$InstallPath\$NodeJSInstallName\node.exe"
 if (!(Test-Path $NodeJSExePath))
 {
     Write-Error "Did not find NodeJS at: '$NodeJSExePath'"

src/coreclr/build-runtime.sh

@@ -171,6 +171,26 @@ if [[ -n "$__RequestedBuildComponents" ]]; then
     __CMakeTarget=" $__RequestedBuildComponents "
     __CMakeTarget="${__CMakeTarget// paltests / paltests_install }"
 fi
+
+if [[ "$__CMakeTarget" == *"wasmjit"* ]]; then
+  __CMakeArgs="$__CMakeArgs -DCLR_CMAKE_BUILD_LLVM_JIT=1"
+
+  if [[ "$__BuildType" == "Release" ]]; then
+    if [[ -n $LLVM_CMAKE_CONFIG_RELEASE ]]; then
+      LLVM_CMAKE_CONFIG="$LLVM_CMAKE_CONFIG_RELEASE"
+    fi
+  else
+    if [[ -n $LLVM_CMAKE_CONFIG_DEBUG ]]; then
+      LLVM_CMAKE_CONFIG="$LLVM_CMAKE_CONFIG_DEBUG"
+    fi
+  fi
+
+  if [[ -z "$LLVM_CMAKE_CONFIG" ]]; then
+    echo The LLVM_CMAKE_CONFIG environment variable pointing to llvm-build-dir/lib/cmake/llvm must be set. 1>&2
+    exit 1
+  fi
+fi
+
 if [[ -z "$__CMakeTarget" ]]; then
     __CMakeTarget="install"
 fi
@@ -185,7 +205,7 @@ fi
 
 eval "$__RepoRootDir/eng/native/version/copy_version_files.sh"
 
-build_native "$__HostOS" "$__HostArch" "$__ProjectRoot" "$__IntermediatesDir" "$__CMakeTarget" "$__CMakeArgs" "CoreCLR component"
+build_native "$__HostOS" "$__HostArch" "$__ProjectRoot" "$__IntermediatesDir" "$__CMakeTarget" "$__CMakeArgs $__ExtraCmakeArgs" "CoreCLR component"
 
 # Build complete
 

src/coreclr/jit/CMakeLists.txt

@@ -91,7 +91,8 @@ function(create_standalone_jit)
     # We'll be linking against LLVM built without /guard:ehcont, so disable it.
     set_target_properties(${TARGETDETAILS_TARGET} PROPERTIES CLR_EH_CONTINUATION OFF)
 
-    find_package(LLVM REQUIRED CONFIG PATHS $ENV{LLVM_CMAKE_CONFIG})
+    # Prefer the version specified in LLVM_CMAKE_CONFIG over the "system" installed version
+    find_package(LLVM REQUIRED CONFIG PATHS $ENV{LLVM_CMAKE_CONFIG} NO_DEFAULT_PATH)
     target_include_directories(${TARGETDETAILS_TARGET} PRIVATE ${LLVM_INCLUDE_DIRS})
     separate_arguments(LLVM_DEFINITIONS)
     target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE ${LLVM_DEFINITIONS})

src/coreclr/nativeaot/Runtime/unix/UnixContext.h

@@ -7,6 +7,8 @@
 // WASM has no thread state contexts.
 #ifndef HOST_WASM
 
+#include <ucontext.h>
+
 // Convert Unix native context to PAL_LIMITED_CONTEXT
 void NativeContextToPalContext(const void* context, PAL_LIMITED_CONTEXT* palContext);
 // Redirect Unix native context to the PAL_LIMITED_CONTEXT and also set the first two argument registers

src/native/libs/build-native.sh

@@ -59,6 +59,7 @@ __usePThreads=0
 source "$__RepoRootDir"/eng/native/build-commons.sh
 
 # Set cross build
+EMSDK_PATH=$EMSDK
 if [[ "$__TargetOS" == browser ]]; then
     if [[ -z "$EMSDK_PATH" ]]; then
         if [[ -d "$__RepoRootDir"/src/mono/browser/emsdk/ ]]; then