Separate CCaches

Xilinx · Apr 30, 2024 · a9a404f · a9a404f
1 parent 82c42c7
commit a9a404f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/amd-aie-tests.yml b/.github/workflows/amd-aie-tests.yml
@@ -25,6 +25,7 @@ jobs:
     uses: ./.github/workflows/llvm-project-tests.yml
     with:
       build_target: check-llvm-aie check-clang-aie check-lld-aie
-      projects: clang;clang-tools-extra;lld
+      projects: clang;lld
+      cache-key: amd-aie
       extra_cmake_args: '-DLLVM_USE_LINKER=gold -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AIE" -DLLVM_TARGETS_TO_BUILD="host" -DLIBC_ENABLE_USE_BY_CLANG=ON   -DLLVM_ENABLE_RUNTIMES="compiler-rt;libc" -DLLVM_BUILTIN_TARGETS="aie2-none-unknown-elf;aie-none-unknown-elf" -DLLVM_RUNTIME_TARGETS="aie-none-unknown-elf;aie2-none-unknown-elf" -DBUILTINS_aie-none-unknown-elf_LLVM_USE_LINKER=lld -DBUILTINS_aie-none-unknown-elf_CMAKE_BUILD_TYPE=Release -DRUNTIMES_aie-none-unknown-elf_LLVM_USE_LINKER=lld -DRUNTIMES_aie-none-unknown-elf_CMAKE_BUILD_TYPE=Release -DBUILTINS_aie2-none-unknown-elf_LLVM_USE_LINKER=lld -DBUILTINS_aie2-none-unknown-elf_CMAKE_BUILD_TYPE=Release -DRUNTIMES_aie2-none-unknown-elf_LLVM_USE_LINKER=lld -DRUNTIMES_aie2-none-unknown-elf_CMAKE_BUILD_TYPE=Release -DLLVM_LIBC_FULL_BUILD=ON'
       os_list: '["ubuntu-latest"]'
diff --git a/.github/workflows/amd-upstream-tests.yml b/.github/workflows/amd-upstream-tests.yml
@@ -26,6 +26,7 @@ jobs:
     with:
       build_target: check-all
       projects: clang
+      cache-key: amd-upstream
       extra_cmake_args: '-DLLVM_USE_LINKER=gold -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;AMDGPU"'
       os_list: '["ubuntu-latest", "windows-2019"]'
 

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
@@ -6,6 +6,9 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
+      cache-key:
+        required: false
+        default: sccache
       build_target:
         required: false
       projects:
@@ -87,7 +90,7 @@ jobs:
           # enough cache space for all the tests to run at once and still
           # fit under the 10 GB limit.
           max-size: 1.5G
-          key: sccache-${{ matrix.os }}
+          key: ${{ inputs.cache-key }}-${{ matrix.os }}
           variant: sccache
       - name: Build and Test
         uses: llvm/actions/build-test-llvm-project@main