Add arm64 build

Author: SingleAccretion

eng/liveBuilds.targets

@@ -32,7 +32,8 @@
          does not scale for local development because it requires you to build the same host tools for each target configuration.
          E. g. you need to build the same Debug compiler 3 times if you want to compile code in Debug, Checked and Release. -->
     <IlcConfig Condition="'$(IlcConfig)' == ''">$(CoreCLRConfiguration)</IlcConfig>
-    <CoreCLRCrossILCompilerDir Condition="'$(CoreCLRCrossILCompilerDir)' != '' and '$(TargetsWasm)' == 'true'">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(HostOS).$(BuildArchitecture).$(IlcConfig)', 'ilc'))</CoreCLRCrossILCompilerDir>
+    <IlcHostArch Condition="'$(IlcHostArch)' == ''">$(BuildArchitecture)</IlcHostArch>
+    <CoreCLRCrossILCompilerDir Condition="'$(CoreCLRCrossILCompilerDir)' != '' and '$(TargetsWasm)' == 'true'">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(HostOS).$(IlcHostArch).$(IlcConfig)', 'ilc'))</CoreCLRCrossILCompilerDir>
 
     <Crossgen2Dir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'crossgen2-published'))</Crossgen2Dir>
     <Crossgen2InBuildDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'crossgen2'))</Crossgen2InBuildDir>

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

@@ -207,14 +207,14 @@ jobs:
       - ${{ if ne(parameters.hostedOs, 'windows') }}:
         - script: /tmp/docker exec -t -u 0 naot-llvm-ci-container sh -c "tdnf install -y sudo"
           displayName: Install sudo
-        - script: $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-build-and-test-tools.sh $(Build.SourcesDirectory)/wasm-tools
+        - script: $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-build-and-test-tools.sh
           displayName: Install NativeAOT-LLVM build and test tools
       - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-emscripten.ps1 $(Build.SourcesDirectory)/wasm-tools -CI
         displayName: Install/activate emscripten
       - ${{ if eq(parameters.hostedOs, 'windows') }}:
         - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/set-cmake-path.cmd
           displayName: Set CMake path
-      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-llvm.ps1 -CloneDir $(Build.SourcesDirectory)/wasm-tools -Configs ${{ parameters.buildConfig }} -CI
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-llvm.ps1 -CloneDir $(Build.SourcesDirectory)/wasm-tools -Configs $(_BuildConfig) -Arch $(hostedTargetArch) -CI
         displayName: Install/build LLVM
       - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.ps1 $(Build.SourcesDirectory)/wasm-tools
         displayName: Install NodeJS

eng/pipelines/common/platform-matrix.yml

@@ -514,7 +514,7 @@ jobs:
       targetRid: browser-wasm
       platform: browser_wasm_linux_x64_naot_llvm
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
-      container: linux_x64_sanitizer_naot_llvm
+      container: linux_x64_naot_llvm
       jobParameters:
         hostedOs: linux
         runtimeFlavor: ${{ parameters.runtimeFlavor }}
@@ -533,14 +533,35 @@ jobs:
       targetRid: wasi-wasm
       platform: wasi_wasm_linux_x64_naot_llvm
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
-      container: linux_x64_sanitizer_naot_llvm
+      container: linux_x64_naot_llvm
       jobParameters:
         hostedOs: linux
         runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+- ${{ if containsValue(parameters.platforms, 'browser_wasm_linux_arm64_naot_llvm') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: browser
+      archType: wasm
+      targetRid: browser-wasm
+      platform: browser_wasm_linux_arm64_naot_llvm
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      container: linux_arm64_naot_llvm
+      jobParameters:
+        hostedOs: linux
+        hostedTargetArch: arm64
+        nameSuffix: arm64
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
 # Browser WebAssembly
 
 - ${{ if containsValue(parameters.platforms, 'browser_wasm') }}:

eng/pipelines/common/templates/pipeline-with-resources.yml

@@ -82,12 +82,19 @@ extends:
       # We need to be able to use 'tdnf install'. We can't because of https://github.com/dotnet/dotnet-docker/issues/788.
       # This is the hackaround: https://github.com/microsoft/azure-pipelines-agent/issues/2043#issuecomment-489692810.
       # TODO-LLVM-Upstream: replace with an image that has our prerequisites (LLDB) already installed.
-      linux_x64_sanitizer_naot_llvm:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-sanitizer
+      linux_x64_naot_llvm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-sanitizer
         options: '--name naot-llvm-ci-container -v /usr/bin/docker:/tmp/docker:ro'
         env:
           ROOTFS_DIR: /crossrootfs/x64
 
+      # For arm64, we need to install QEMU.
+      linux_arm64_naot_llvm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64
+        options: '--name naot-llvm-ci-container -v /usr/bin/docker:/tmp/docker:ro'
+        env:
+          ROOTFS_DIR: /crossrootfs/arm64
+
       # We use a CentOS Stream 8 image here to test building from source on CentOS Stream 9.
       SourceBuild_centos_x64:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9

eng/pipelines/common/xplat-setup.yml

@@ -52,6 +52,12 @@ jobs:
       - name: osSubgroup
         value: ${{ parameters.osSubgroup }}
 
+      - name: hostedTargetArch
+        ${{ if ne(parameters.jobParameters.hostedTargetArch, '') }}:
+          value: ${{ parameters.jobParameters.hostedTargetArch }}
+        ${{ else }}:
+          value: x64
+
       - name: _runSmokeTestsOnlyArg
         value: '/p:RunSmokeTestsOnly=$(isRunSmokeTestsOnly)'
 

eng/pipelines/runtimelab.yml

@@ -105,6 +105,7 @@ extends:
             - wasi_wasm_win
             - browser_wasm_linux_x64_naot_llvm
             - wasi_wasm_linux_x64_naot_llvm
+            - browser_wasm_linux_arm64_naot_llvm
             jobParameters:
               timeoutInMinutes: 300
               buildArgs: -s clr.aot+libs -c $(_BuildConfig)

eng/pipelines/runtimelab/install-build-and-test-tools.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 set -e
-dir=$(dirname "$0")
-echo; $dir/install-python.sh
-echo; $dir/install-lldb.sh
+
+echo Setting EMSDK_PYTHON to /usr/bin/python3
+echo '##vso[task.setvariable variable=EMSDK_PYTHON]'/usr/bin/python3
+echo
+
+echo Installing LLDB, QEMU
+sudo tdnf install -y lldb python3-lldb qemu-user
+echo

eng/pipelines/runtimelab/install-lldb.sh

@@ -3,11 +3,11 @@ param(
     [string]$CloneDir = $null,
     [ValidateSet("Debug","Release","Checked")][string[]]$Configs = @("Debug","Release"),
     [string]$Path = "llvm-project",
+    [string]$Arch = $null,
     [switch]$CI,
     [switch]$NoClone,
     [switch]$NoBuild
 )
-
 $ErrorActionPreference="Stop"
 
 if (!(gcm git -ErrorAction SilentlyContinue))
@@ -25,6 +25,11 @@ if ($CloneDir)
     Set-Location -Path $CloneDir
 }
 
+if (!$Arch)
+{
+    $Arch = [Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()
+}
+
 $LlvmProjectTag = "llvmorg-18.1.3"
 if ($NoClone)
 {
@@ -77,20 +82,20 @@ foreach ($Config in $Configs | % { if ($_ -eq "Checked") { "Debug" } else { $_ }
         # This logic was copied from gen-buildsys.sh. Maybe we should just call it here directly?
         $RepoRoot = Split-Path $PSScriptRoot | Split-Path | Split-Path
         # We're assuming here that the sysroot is coming from our CI docker images.
-        $TargetArch = ($env:ROOTFS_DIR -Split '/')[-1]
         $TargetTriple = (Get-ChildItem $env:ROOTFS_DIR/usr/lib/gcc).Name
 
-        bash -c "build_arch=$TargetArch compiler=clang source $RepoRoot/eng/common/native/init-compiler.sh && set | grep -e CC -e CXX -e LDFLAGS" |
+        bash -c "build_arch=$Arch compiler=clang source $RepoRoot/eng/common/native/init-compiler.sh && set | grep -e CC -e CXX -e LDFLAGS" |
             ForEach-Object {
                 # Split the "<name>=<value>" line into the variable's name and value.
                 $name, $value = $_ -Split '=', 2
                 # Define it as a process-level environment variable in PowerShell.
                 Set-Content ENV:$name $value
             }
-        $env:TARGET_BUILD_ARCH = $TargetArch # Used by toolchain.cmake
+        $env:TARGET_BUILD_ARCH = $Arch # Used by toolchain.cmake
         $CmakeConfigureCommandLine +=
             "-DCMAKE_TOOLCHAIN_FILE=$RepoRoot/eng/common/cross/toolchain.cmake",
-            "-DLLVM_HOST_TRIPLE=$TargetTriple"
+            "-DLLVM_HOST_TRIPLE=$TargetTriple",
+            "-DCMAKE_ASM_COMPILER_VERSION=18.1.2" # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/22995.
     }
 
     Write-Host "Invoking CMake configure: 'cmake $CmakeConfigureCommandLine'"

eng/pipelines/runtimelab/install-llvm.ps1

@@ -3,6 +3,7 @@ parameters:
   archType: ''
   osGroup: ''
   osSubgroup: ''
+  nameSuffix: ''
   platform: ''
   runtimeVariant: ''
   isOfficialBuild: false
@@ -12,29 +13,33 @@ steps:
   # For NativeAOT-LLVM, we have just built the Wasm-targeting native artifacts (the runtime and libraries).
   # 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
+    - script: $(Build.SourcesDirectory)/build$(scriptExt) clr.wasmjit+clr.aot -a $(hostedTargetArch) -c $(buildConfigUpper) -cross $(_officialBuildParameter) -ci
       displayName: Build the ILC and RyuJit cross-compilers
 
     # Build target packages (note: target libs already built).
-    - script: $(Build.SourcesDirectory)/build$(scriptExt) nativeaot.packages -a wasm -os ${{ parameters.osGroup }} -c $(buildConfigUpper) $(_officialBuildParameter) -ci
+    - script: $(Build.SourcesDirectory)/build$(scriptExt) nativeaot.packages -os ${{ parameters.osGroup }} -a wasm -c $(buildConfigUpper) $(_officialBuildParameter) -ci
       displayName: Build target packages
 
     # Build host packages.
-    - script: $(Build.SourcesDirectory)/build$(scriptExt) libs+nativeaot.packages -c $(buildConfigUpper) $(_officialBuildParameter) -ci -cross
+    - script: $(Build.SourcesDirectory)/build$(scriptExt) libs+nativeaot.packages -a $(hostedTargetArch) -c $(buildConfigUpper) -cross $(_officialBuildParameter) -ci
       displayName: Build host packages
 
   # Build coreclr native test output outside of official build
   - ${{ if ne(parameters.isOfficialBuild, true) }}:
+    - ${{ if and(eq(parameters.archType, 'wasm'), ne(parameters.nameSuffix, '')) }}:
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/set-ilc-emulation-environment.ps1 -Arch $(hostedTargetArch)
+        displayName: Set up ILC emulation environment
+
     - ${{ if eq(parameters.archType, 'wasm') }}:
       - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.osGroup }} $(crossArg) $(_officialBuildParameter) ci tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}
-        displayName: Build WebAssembly tests
+        displayName: Build runtime tests
     - ${{ else }}:
       - ${{ if eq(parameters.osGroup, 'windows') }}:
         - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}
-          displayName: Build tests
+          displayName: Build runtime tests
       - ${{ else }}:
         - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci 'tree nativeaot' /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}
-          displayName: Build tests
+          displayName: Build runtime tests
 
     - ${{ if contains(parameters.platform, 'win') }}:
       - script: $(Build.SourcesDirectory)/src/tests/run$(scriptExt) runnativeaottests $(buildConfigUpper) ${{ parameters.archType }} ${{ parameters.osGroup }}
@@ -44,8 +49,7 @@ steps:
         displayName: Run runtime tests
 
     - ${{ 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
+      - 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
 
   - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/remove-duplicate-packages.ps1 -Config $(_BuildConfig) -TargetOS ${{ parameters.osGroup }} -TargetArch ${{ parameters.archType }}

eng/pipelines/runtimelab/install-python.sh

@@ -0,0 +1,19 @@
+[CmdletBinding(PositionalBinding=$false)]
+param(
+    [string]$Arch
+)
+$ErrorActionPreference="Stop"
+
+if ($IsWindows)
+{
+    Write-Error "Windows ILC emulation not implemented"
+}
+else
+{
+    $QemuArch = $Arch -eq "arm64" ? "aarch64" : $Arch
+    $IlcLauncher = "qemu-$QemuArch -L $env:ROOTFS_DIR"
+    Write-Host "Setting `$(IlcLauncher) to '$IlcLauncher'"
+    Write-Host "Setting `$(IlcHostArch) to '$Arch'"
+    Write-Host "##vso[task.setvariable variable=IlcLauncher]$IlcLauncher"
+    Write-Host "##vso[task.setvariable variable=IlcHostArch]$Arch"
+}

eng/pipelines/runtimelab/runtimelab-post-build-steps.yml

@@ -43,6 +43,7 @@
         Test_TargetFramework=$(Test_TargetFramework);
         Test_RuntimeIdentifier=$(Test_RuntimeIdentifier);
         Test_PackageVersion=$(NetCoreAppCurrentVersion).0-*;
+        Test_HostPackageRuntimeIdentifier=$(_portableHostOS)-$(IlcHostArch);
         Test_RestoreSource=$(Test_RestoreSource);
         Test_RestorePackagesPath=$(Test_RestorePackagesPath);
       </PackagingTestProjectProperties>

eng/pipelines/runtimelab/set-ilc-emulation-environment.ps1

@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="$(Test_PackageVersion)" />
-    <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="$(Test_PackageVersion)" />
+    <PackageReference Include="runtime.$(Test_HostPackageRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="$(Test_PackageVersion)" />
   </ItemGroup>
 
 </Project>