update llvm release URLs

lum1n0us · lum1n0us · commit 9838eebbaa74 · 2025-06-03T08:29:09.000Z
diff --git a/.github/actions/install-llvm-binaries/action.yml b/.github/actions/install-llvm-binaries/action.yml
@@ -10,55 +10,153 @@
 # outputs includes: llvm_dir, which is the directory where the libraries are installed
 
 name: "Install LLVM Binaries"
-description: "Installs pre-compiled LLVM libraries for a specific OS and architecture."
+description: "Installs pre-compiled LLVM libraries."
 author: "Intel Corporation"
 
 inputs:
   os:
-    description: "Operating system to install on (e.g., ubuntu-22.04, macos-14)"
+    description: "Operating system to install LLVM on (e.g., ubuntu-22.04, windows-latest)"
     required: true
-    #TODO: options
-  arch:
-    description: "Architecture to install for (e.g., x86_64, aarch64)"
+  triple:
+    description: "LLVM triple to install (e.g., x86_64-linux-gnu-ubuntu-18.04, x86_64-pc-windows-msvc, arm64-apple-macos11)"
     required: true
-    #TODO: options
+    default: ""
   container_image:
     description: "Container image to use (optional)"
     required: false
     default: ""
   ver:
     description: "LLVM version to install (e.g., 18.1.2) (optional)"
     required: false
-    default: "18.1.2"
+    default: "18.1.8"
     #TODO: options
 outputs:
-  llvm_dir:
+  llvm_dir_on_windows:
+    description: "The directory where LLVM libraries are installed"
+    value: ${{ steps.set_llvm_dir_windows.outputs.llvm_dir }}
+  llvm_dir_on_ubuntu:
     description: "The directory where LLVM libraries are installed"
-    value: ${{ steps.set_llvm_dir.outputs.llvm_dir }}
+    value: ${{ steps.set_llvm_dir_ubuntu.outputs.llvm_dir }}
 
 runs:
   using: "composite"
   steps:
-    - name: Check Runner OS
+    #TODO: tell the user there is no pre-compiled LLVM binaries for macos with x86_64 architecture
+
+    - name: LOG Runner OS
       shell: bash
       run: |
-        if [[ "${{ inputs.os }}" != "ubuntu-22.04" && "${{ inputs.os }}" != "macos-14" ]]; then
-          echo "::error title=⛔ error hint::Only support ubuntu-22.04 and macos-14 for now"
-          exit 1
-        fi
+        echo "::debug::installing LLVM binaries on ${{ inputs.os }}"
+
+    - name: Install dependencies(Windows)
+      if: ${{ startsWith(inputs.os, 'windows') }}
+      shell: powershell
+      run: |
+        vcpkg install libxml2:x64-windows
+        vcpkg install libxslt:x64-windows
+        vcpkg integrate install
 
-    - name: Create installation directory
+    - name: Create installation directory(Ubuntu)
+      if: ${{ startsWith(inputs.os, 'ubuntu') }}
       shell: bash
-      run: sudo mkdir -p /opt/llvm-${{ inputs.ver }}
+      run: mkdir -p /opt/llvm-${{ inputs.ver }}
+
+    - name: Create installation directory(Windows)
+      if: ${{ startsWith(inputs.os, 'windows') }}
+      shell: powershell
+      run: New-Item -ItemType Directory -Path .\core\deps\llvm\build -Force
 
-    - name: Download and install LLVM binaries
+    - name: Download and install LLVM binaries(Ubuntu)
+      if: ${{ startsWith(inputs.os, 'ubuntu') }}
       shell: bash
       run: |
-        sudo wget -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ inputs.ver }}/clang+llvm-${{ inputs.ver }}-${{ inputs.arch }}-${{ inputs.os }}.tar.xz
-        sudo tar xf llvm.tar.xz --strip-components=1 -C /opt/llvm-${{ inputs.ver }}
-      working-directory: /opt/llvm-${{ inputs.ver }}
+        wget -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ inputs.ver }}/clang+llvm-${{ inputs.ver }}-${{ inputs.triple}}.tar.xz
+        tar xf llvm.tar.xz --strip-components=1 -C llvm-${{ inputs.ver }}
+      working-directory: /opt
+
+    - name: Download and install LLVM binaries(Windows)
+      if: ${{ startsWith(inputs.os, 'windows') }}
+      shell: powershell
+      run: |
+        try {
+          $ErrorActionPreference = "Stop"
+          # Significantly reduce the time consumption of downloading.
+          $ProgressPreference = 'SilentlyContinue'
+          $url="https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ inputs.ver }}/clang+llvm-${{ inputs.ver }}-${{ inputs.triple}}.tar.xz"
+          Write-Host "Downloading LLVM from: $url"
+          Invoke-WebRequest -Uri $url -OutFile llvm.tar.xz
+
+          if (-not (Test-Path llvm.tar.xz)) {
+            throw "Download failed: llvm.tar.xz not found"
+          }
+
+          Write-Host "Extracting LLVM package..."
+          # Use 7z for better performance on Windows
+          if (-not (Test-Path "C:\Program Files\7-Zip\7z.exe")) {
+            throw "7-Zip is not installed. Please install 7-Zip to extract the LLVM package."
+          }
+
+          # First extract the .tar file from .tar.xz
+          Write-Host "Extracting .tar from .tar.xz..."
+          & "C:\Program Files\7-Zip\7z.exe" e llvm.tar.xz
 
-    - name: Set output LLVM_DIR
-      id: set_llvm_dir
+          if ($LASTEXITCODE -ne 0) {
+            throw "Extraction of .tar.xz failed with exit code: $LASTEXITCODE"
+          }
+
+          # Then extract the contents from .tar
+          Write-Host "Extracting contents from .tar..."
+          & "C:\Program Files\7-Zip\7z.exe" x "llvm.tar"
+
+          if ($LASTEXITCODE -ne 0) {
+            throw "Extraction of .tar failed with exit code: $LASTEXITCODE"
+          }
+
+          # Verify the contents
+          dir "."
+
+          $extractedDir = Join-Path -Path "." -ChildPath "clang+llvm-${{ inputs.ver }}-${{ inputs.triple}}"
+          if (-not (Test-Path $extractedDir)) {
+            throw "Extraction failed: $extractedDir not found"
+          }
+
+          # Verify the contents
+          dir "$extractedDir"
+
+          Write-Host "Moving contents from $extractedDir to llvm\build..."
+
+          # Move all contents from the extracted directory to the target directory
+          Get-ChildItem -Path "$extractedDir" | Move-Item -Destination ".\llvm\build"
+
+          # Verify the contents
+          dir ".\llvm\build"
+
+          # Search LLVMConfig.cmake and llvm-config.cmake, ignore case
+          $llvmConfigFiles = Get-ChildItem -Path ".\llvm\build" -Recurse -Include "LLVMConfig.cmake", "llvm-config.cmake" -ErrorAction SilentlyContinue
+          Write-Host "Found LLVMConfig.cmake and llvm-config.cmake files: $($llvmConfigFiles)"
+          if ($llvmConfigFiles.Count -eq 0) {
+            throw "No LLVMConfig.cmake or llvm-config.cmake files found in the extracted directory."
+          }
+
+          Write-Host "LLVM installation completed successfully"
+        }
+        catch {
+          Write-Error "Failed to install LLVM: $_"
+          exit 1
+        }
+      working-directory: .\core\deps
+    
+
+    - name: Set output LLVM_DIR(Ubuntu)
+      if: ${{ startsWith(inputs.os, 'ubuntu') }}
+      id: set_llvm_dir_ubuntu
       shell: bash
       run: echo "llvm_dir=/opt/llvm-${{ inputs.ver }}" >> $GITHUB_OUTPUT
+
+    - name: Set output LLVM_DIR(Windows)
+      if: ${{ startsWith(inputs.os, 'windows') }}
+      id: set_llvm_dir_windows
+      shell: powershell
+      run: |
+        $absolutePath = (Resolve-Path ".\core\deps\llvm\build").Path
+        Write-Output "llvm_dir=$absolutePath" >> $env:GITHUB_OUTPUT
diff --git a/.github/workflows/compilation_on_windows.yml b/.github/workflows/compilation_on_windows.yml
@@ -100,15 +100,16 @@ jobs:
         id: install_llvm_libraries
         uses: ./.github/actions/install-llvm-binaries
         with:
-          os: ${{ matrix.os }}
-          arch: ${{ matrix.arch }}
+          os: windows-latest
+          triple: x86_64-pc-windows-msvc
 
       - name: build wamrc from source code
+        shell: bash
         run: |
           cmake -S . -B build \
-            -DWAMR_BUILD_WITH_CUSTOM_LLVM=1 \
-            -DLLVM_DIR=${{ steps.install_llvm_libraries.outputs.llvm_dir }}/lib/cmake/llvm \
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=Release \
+            -G "Visual Studio 17 2022" \
+            -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_INSTALLATION_ROOT}}/scripts/buildsystems/vcpkg.cmake
           cmake --build build --config Release --parallel 4
         working-directory: wamr-compiler
 
diff --git a/wamr-compiler/CMakeLists.txt b/wamr-compiler/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required (VERSION 3.14)
 
 include(CheckPIESupported)
 
+include(CMakePrintHelpers)
+
 if (NOT DEFINED WAMR_BUILD_PLATFORM)
   if (CMAKE_SYSTEM_NAME)
     string(TOLOWER ${CMAKE_SYSTEM_NAME} WAMR_BUILD_PLATFORM)
@@ -165,6 +167,8 @@ if (NOT WAMR_BUILD_WITH_CUSTOM_LLVM)
   set (CMAKE_PREFIX_PATH "${LLVM_SRC_ROOT}/build;${CMAKE_PREFIX_PATH}")
 endif ()
 
+cmake_print_variables(WAMR_BUILD_WITH_CUSTOM_LLVM LLVM_DIR)
+
 find_package(LLVM REQUIRED CONFIG)
 include_directories(${LLVM_INCLUDE_DIRS})
 add_definitions(${LLVM_DEFINITIONS})
