From 37206e5301a28486aa836c77041f67263d5cb012 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 11 Jun 2021 21:05:23 -0400 Subject: [PATCH] Use vcpkg LLVM for Windows build --- .github/workflows/build.yml | 113 +++++++++++++++++++++++++++--------- .gitignore | 3 +- atdna/CMakeLists.txt | 8 ++- 3 files changed, 94 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9aa9dd..b435762 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,10 +4,19 @@ on: push: pull_request: +env: + BUILDCACHE_VERSION: v0.27.0 + BUILDCACHE_ACCURACY: STRICT + BUILDCACHE_MAX_CACHE_SIZE: 1073741824 # 1GiB + jobs: build-linux-x86_64: name: Build Linux (GCC x86_64) runs-on: ubuntu-20.04 + + env: + BUILDCACHE_DIR: ${{github.workspace}}/.buildcache + steps: - uses: actions/checkout@v2 with: @@ -17,22 +26,33 @@ jobs: - name: Install dependencies run: | sudo apt-get -y update - sudo apt-get -y install cmake ninja-build ccache llvm-11-dev libclang-11-dev clang-11 + sudo apt-get -y install cmake ninja-build llvm-11-dev libclang-11-dev clang-11 - - name: Configure ccache - uses: hendrikmuhs/ccache-action@v1 + # setup buildcache + curl -LSfs https://github.com/mbitsnbites/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-linux.tar.gz | tar xz -C "$RUNNER_WORKSPACE" + echo "$RUNNER_WORKSPACE"/buildcache/bin >> $GITHUB_PATH + + - name: Restore buildcache + uses: actions/cache@v2 with: - key: ubuntu-20.04-gcc - max-size: 1G + path: ${{env.BUILDCACHE_DIR}} + key: buildcache-ubuntu-20.04-x86_64 - name: Configure CMake run: | - cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DClang_DIR=/usr/lib/cmake/clang-11 \ - -DATDNA_DYNAMIC_LLVM=OFF -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -B build . -GNinja \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DATDNA_DYNAMIC_LLVM=OFF \ + -DClang_DIR:PATH=/usr/lib/cmake/clang-11 \ + -DCMAKE_C_COMPILER_LAUNCHER:STRING=buildcache \ + -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=buildcache - name: Build run: cmake --build build --target package --verbose + - name: Print buildcache stats + run: buildcache -s + - name: Test working-directory: build run: ./atdna-test @@ -47,6 +67,7 @@ jobs: build-linux-aarch64: name: Build Linux (GCC aarch64) runs-on: ubuntu-20.04 + steps: - uses: actions/checkout@v2 with: @@ -65,8 +86,10 @@ jobs: apt-get -y update apt-get -y install build-essential cmake ninja-build llvm-11-dev libclang-11-dev clang-11 run: | - cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DClang_DIR=/usr/lib/cmake/clang-11 -DATDNA_DYNAMIC_LLVM=OFF + cmake -B build . -GNinja \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DATDNA_DYNAMIC_LLVM:BOOL=OFF \ + -DClang_DIR:PATH=/usr/lib/cmake/clang-11 cmake --build build --target package --verbose build/atdna-test @@ -80,6 +103,10 @@ jobs: build-macos-universal: name: Build macOS (AppleClang universal) runs-on: macos-10.15 + + env: + BUILDCACHE_DIR: ${{github.workspace}}/.buildcache + steps: - uses: actions/checkout@v2 with: @@ -89,26 +116,38 @@ jobs: - name: Install dependencies run: | brew update - brew install ninja ccache + brew install ninja + # universal clang+llvm from macports curl -LSfs https://axiodl.com/files/clang-11-11.1.0_1.mpkg -o /tmp/clang-11-11.1.0_1.mpkg sudo installer -pkg /tmp/clang-11-11.1.0_1.mpkg -target / - - name: Configure ccache - uses: hendrikmuhs/ccache-action@v1 + # setup buildcache + curl -LSfs https://github.com/mbitsnbites/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-macos.zip -o /tmp/buildcache-macos.zip + unzip /tmp/buildcache-macos.zip -d "$RUNNER_WORKSPACE" + echo "$RUNNER_WORKSPACE"/buildcache/bin >> $GITHUB_PATH + + - name: Restore buildcache + uses: actions/cache@v2 with: - key: macos-10.15-appleclang - max-size: 1G + path: ${{env.BUILDCACHE_DIR}} + key: buildcache-macos-10.15 - name: Configure CMake run: | - cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ - -DLLVM_ROOT_DIR=/opt/local/libexec/llvm-11 \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -B build . -GNinja \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DCMAKE_OSX_ARCHITECTURES:STRING="x86_64;arm64" \ + -DLLVM_ROOT_DIR:PATH=/opt/local/libexec/llvm-11 \ + -DCMAKE_C_COMPILER_LAUNCHER:STRING=buildcache \ + -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=buildcache - name: Build run: cmake --build build --target package --verbose + - name: Print buildcache stats + run: buildcache -s + - name: Test working-directory: build run: ./atdna-test @@ -123,8 +162,11 @@ jobs: build-win32-amd64: name: Build Windows (MSVC AMD64) runs-on: windows-2019 + env: - LLVM_VERSION: 10.0.1 + LLVM_VERSION: 11.1.0 + BUILDCACHE_DIR: C:\buildcache + steps: - uses: actions/checkout@v2 with: @@ -133,28 +175,46 @@ jobs: - name: Install LLVM run: | - $TempDir = "$env:RUNNER_WORKSPACE\temp" - $Filename = "LLVM-$env:LLVM_VERSION-win64.exe" + $TempDir = "C:\temp" # C: has more space + $Filename = "vcpkg-llvm-$env:LLVM_VERSION-full.7z" New-Item -Path "$TempDir" -ItemType Directory -ea 0 (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename") - Start-Process "$TempDir\$Filename" -ArgumentList "/S /D=$env:RUNNER_WORKSPACE\LLVM" -Wait + 7z x "-o$TempDir" -aos "$TempDir\$Filename" - name: Install dependencies - run: choco install ninja + run: | + choco install ninja + + # set up buildcache + $TempDir = "$env:RUNNER_WORKSPACE\temp" + New-Item -Path "$TempDir" -ItemType Directory -ea 0 + (New-Object Net.WebClient).DownloadFile("https://github.com/mbitsnbites/buildcache/releases/download/$env:BUILDCACHE_VERSION/buildcache-windows.zip", "$TempDir\buildcache.zip") + Expand-Archive -LiteralPath "$TempDir\buildcache.zip" -DestinationPath "$TempDir" + echo "$TempDir\buildcache\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + - name: Restore buildcache + uses: actions/cache@v2 + with: + path: ${{env.BUILDCACHE_DIR}} + key: buildcache-windows-2019-msvc-amd64 - name: Enable Visual Studio environment uses: ilammy/msvc-dev-cmd@v1 - name: Configure CMake run: | - $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/' - cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ` - -DLLVM_ROOT_DIR="$workspace/LLVM" + cmake -B build . -GNinja ` + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo ` + -DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded ` + -DCMAKE_TOOLCHAIN_FILE:PATH="C:\temp\vcpkg-llvm-$env:LLVM_VERSION\scripts\buildsystems\vcpkg.cmake" ` + -DVCPKG_TARGET_TRIPLET:STRING=x64-windows-static - name: Build run: cmake --build build --target package --verbose + - name: Print buildcache stats + run: buildcache -s + - name: Test working-directory: build run: ./atdna-test.exe @@ -169,6 +229,7 @@ jobs: release: name: Release runs-on: ubuntu-20.04 + if: contains(' refs/heads/master diff --git a/.gitignore b/.gitignore index 3a97bc9..a670503 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ PKGBUILD /build /out /cmake-build-* -/.idea \ No newline at end of file +/.idea +/.buildcache diff --git a/atdna/CMakeLists.txt b/atdna/CMakeLists.txt index d0cf596..0f4c9a5 100644 --- a/atdna/CMakeLists.txt +++ b/atdna/CMakeLists.txt @@ -101,9 +101,11 @@ target_include_directories(atdna PRIVATE ${CLANG_INCLUDE_DIRS}) # Clang 10.0.x headers currently broken with C++20 set_property(TARGET atdna PROPERTY CXX_STANDARD 17) if(MSVC) - # Allow linking against release-built LLVM libraries - target_compile_options(atdna PRIVATE /GR- /D_ITERATOR_DEBUG_LEVEL=0) - set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") + if (NOT VCPKG_TOOLCHAIN) + # Allow linking against release-built LLVM libraries + target_compile_options(atdna PRIVATE /GR- /D_ITERATOR_DEBUG_LEVEL=0) + set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") + endif () else() target_compile_options(atdna PRIVATE -fno-rtti -fvisibility=hidden -Wno-error) endif()