From a88e9fb311cbdf4bf010cbaea79871a507931426 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Fri, 15 Aug 2025 21:11:43 +0000 Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?= =?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.6 [skip ci] --- .github/workflows/mlir-spirv-tests.yml | 31 +++++++++++++++++++++----- .github/workflows/spirv-tests.yml | 31 ++++++++++++++++++++------ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/.github/workflows/mlir-spirv-tests.yml b/.github/workflows/mlir-spirv-tests.yml index 48b6c69a61f50..78952ccad2642 100644 --- a/.github/workflows/mlir-spirv-tests.yml +++ b/.github/workflows/mlir-spirv-tests.yml @@ -24,9 +24,28 @@ jobs: check_spirv: if: github.repository_owner == 'llvm' name: Test MLIR SPIR-V - uses: ./.github/workflows/llvm-project-tests.yml - with: - build_target: check-mlir - projects: mlir - extra_cmake_args: '-DLLVM_TARGETS_TO_BUILD="host" -DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON' - os_list: '["ubuntu-24.04"]' + runs-on: ubuntu-24.04 + container: + image: ghcr.io/llvm/ci-ubuntu-24.04:latest + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - name: Setup ccache + uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17 + with: + max-size: 2G + key: spirv-mlir-ubuntu-24.04 + variant: sccache + - name: Build and Test + run: | + mkdir build + cmake -GNinja \ + -S llvm \ + -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_ASSERTIONS=ON \ + -DCMAKE_C_COMPILER_LAUNCHER=sccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \ + -DLLVM_TARGETS_TO_BUILD="host" \ + -DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON \ + -DLLVM_ENABLE_PROJECTS=mlir + ninja -C build check-mlir diff --git a/.github/workflows/spirv-tests.yml b/.github/workflows/spirv-tests.yml index f15ca1cb64ba5..8708fb06d9eb8 100644 --- a/.github/workflows/spirv-tests.yml +++ b/.github/workflows/spirv-tests.yml @@ -4,7 +4,6 @@ permissions: contents: read on: - workflow_dispatch: pull_request: paths: - 'llvm/lib/Target/SPIRV/**' @@ -21,9 +20,27 @@ jobs: check_spirv: if: github.repository_owner == 'llvm' name: Test SPIR-V - uses: ./.github/workflows/llvm-project-tests.yml - with: - build_target: check-llvm-codegen-spirv - projects: - extra_cmake_args: '-DLLVM_TARGETS_TO_BUILD="SPIRV" -DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON' - os_list: '["ubuntu-24.04"]' + runs-on: ubuntu-24.04 + container: + image: ghcr.io/llvm/ci-ubuntu-24.04:latest + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - name: Setup ccache + uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17 + with: + max-size: 2G + key: spirv-ubuntu-24.04 + variant: sccache + - name: Build and Test + run: | + mkdir build + cmake -GNinja \ + -S llvm \ + -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_ASSERTIONS=ON \ + -DCMAKE_C_COMPILER_LAUNCHER=sccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \ + -DLLVM_TARGETS_TO_BUILD="SPIRV" \ + -DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON + ninja -C build check-llvm-codegen-spirv From a57523531b8961cad74209f1bd772032e5338b8e Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Sat, 16 Aug 2025 22:58:06 +0000 Subject: [PATCH 2/2] fix Created using spr 1.3.6 --- .github/workflows/libclang-python-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/libclang-python-tests.yml b/.github/workflows/libclang-python-tests.yml index d9e9806f4c46b..e168928325561 100644 --- a/.github/workflows/libclang-python-tests.yml +++ b/.github/workflows/libclang-python-tests.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Python uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0 with: - python-version: ${{ matrix.python_version }} + python-version: ${{ matrix.python-version }} - name: Setup ccache uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17 with: