https://github.com/tstellar updated
https://github.com/llvm/llvm-project/pull/80772
>From e54eaf5a5136628ae8f2bc00c6d769b33dd2c0f0 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstel...@redhat.com>
Date: Sat, 3 Feb 2024 21:37:46 -0800
Subject: [PATCH 1/4] [workflows] Stop using the build-test-llvm-project action
(#80580)
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.
(cherry picked from commit d25022bb689b9bf48a24c0ae6c29c1d3c2f32823)
---
.github/workflows/llvm-project-tests.yml | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/llvm-project-tests.yml
b/.github/workflows/llvm-project-tests.yml
index 91d0b258394ef..79a382bfa4f9a 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -98,14 +98,23 @@ jobs:
key: ${{ matrix.os }}
variant: sccache
- name: Build and Test
- uses: llvm/actions/build-test-llvm-project@main
env:
# Workaround for
https://github.com/actions/virtual-environments/issues/5900.
# This should be a no-op for non-mac OSes
PKG_CONFIG_PATH:
/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
- with:
- cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}"
-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLDB_INCLUDE_TESTS=OFF
-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ${{
inputs.extra_cmake_args }}'
- build_target: '${{ inputs.build_target }}'
+ shell: bash
+ run: |
+ cmake -G Ninja \
+ -B build \
+ -S llvm \
+ -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLLVM_ENABLE_ASSERTIONS=ON \
+ -DLLDB_INCLUDE_TESTS=OFF \
+ -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
+ ${{ inputs.extra_cmake_args }}
+ ninja -C build '${{ inputs.build_target }}'
- name: Build and Test libclc
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects,
'libclc')"
>From ff2405a632eeb0d9356108c5fd0d86afdbe4d163 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstel...@redhat.com>
Date: Mon, 5 Feb 2024 16:44:11 -0800
Subject: [PATCH 2/4] [workflows] Fix lldb-tests and libclc-tests (#80751)
This was broken by d25022bb689b9bf48a24c0ae6c29c1d3c2f32823, which
caused the workflow to pass an empty string to ninja as the target. The
'all' target is probably not the right target for these tests, but this
is what the behavior was before
d25022bb689b9bf48a24c0ae6c29c1d3c2f32823.
(cherry picked from commit 792d928e15aa30c8b686eff465598ceea0b03891)
---
.github/workflows/libclc-tests.yml | 1 -
.github/workflows/lldb-tests.yml | 1 -
.github/workflows/llvm-project-tests.yml | 3 ++-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/libclc-tests.yml
b/.github/workflows/libclc-tests.yml
index 29d050db2f12c..23192f776a985 100644
--- a/.github/workflows/libclc-tests.yml
+++ b/.github/workflows/libclc-tests.yml
@@ -36,5 +36,4 @@ jobs:
name: Test libclc
uses: ./.github/workflows/llvm-project-tests.yml
with:
- build_target: ''
projects: clang;libclc
diff --git a/.github/workflows/lldb-tests.yml b/.github/workflows/lldb-tests.yml
index ef5d7c7d581b7..6bb9721956258 100644
--- a/.github/workflows/lldb-tests.yml
+++ b/.github/workflows/lldb-tests.yml
@@ -36,5 +36,4 @@ jobs:
name: Build lldb
uses: ./.github/workflows/llvm-project-tests.yml
with:
- build_target: ''
projects: clang;lldb
diff --git a/.github/workflows/llvm-project-tests.yml
b/.github/workflows/llvm-project-tests.yml
index 79a382bfa4f9a..0e361bfb77fe4 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -22,8 +22,9 @@ on:
workflow_call:
inputs:
build_target:
- required: true
+ required: false
type: string
+ default: "all"
projects:
required: true
>From 4929f87c3f9e320cb89af2ce2f5dbe27f69851ac Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstel...@redhat.com>
Date: Mon, 5 Feb 2024 09:46:19 -0800
Subject: [PATCH 3/4] [workflows] Use /mnt as the build directory on Linux
(#80583)
There is more space available on /mnt (~56G) than on / (~30G), and we
are starting to see some of the CI jobs run out of disk space on Linux.
(cherry picked from commit 1a6426067fb33a8a789978f6e229108787a041be)
---
.github/workflows/llvm-project-tests.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/llvm-project-tests.yml
b/.github/workflows/llvm-project-tests.yml
index 0e361bfb77fe4..3bc7bd4957fa6 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -105,8 +105,15 @@ jobs:
PKG_CONFIG_PATH:
/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
shell: bash
run: |
+ if [ "${{ runner.os }}" == "Linux" ]; then
+ builddir="/mnt/build/"
+ sudo mkdir -p $builddir
+ sudo chown `whoami`:`whoami` $builddir
+ else
+ builddir=build
+ fi
cmake -G Ninja \
- -B build \
+ -B "$builddir" \
-S llvm \
-DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
-DCMAKE_BUILD_TYPE=Release \
@@ -115,7 +122,7 @@ jobs:
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
${{ inputs.extra_cmake_args }}
- ninja -C build '${{ inputs.build_target }}'
+ ninja -C "$builddir" '${{ inputs.build_target }}'
- name: Build and Test libclc
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects,
'libclc')"
>From 399dd1b1af3389bbe8077be538988ad17c519b0a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstel...@redhat.com>
Date: Wed, 7 Feb 2024 08:44:52 -0800
Subject: [PATCH 4/4] [workflows] Fix libclc CI tests (#80942)
This was broken by 1a6426067fb33a8a789978f6e229108787a041be.
(cherry picked from commit ab92f6274b7c3a4b4445d47017bc481aa919545f)
---
.github/workflows/llvm-project-tests.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/llvm-project-tests.yml
b/.github/workflows/llvm-project-tests.yml
index 3bc7bd4957fa6..68b4a68d1af98 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -104,14 +104,16 @@ jobs:
# This should be a no-op for non-mac OSes
PKG_CONFIG_PATH:
/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
shell: bash
+ id: build-llvm
run: |
if [ "${{ runner.os }}" == "Linux" ]; then
builddir="/mnt/build/"
sudo mkdir -p $builddir
sudo chown `whoami`:`whoami` $builddir
else
- builddir=build
+ builddir="$(pwd)"/build
fi
+ echo "llvm-builddir=$builddir" >> "$GITHUB_OUTPUT"
cmake -G Ninja \
-B "$builddir" \
-S llvm \
@@ -126,9 +128,11 @@ jobs:
- name: Build and Test libclc
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects,
'libclc')"
+ env:
+ LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
run: |
# Make sure all of LLVM libraries that llvm-config needs are built.
- ninja -C build
- cmake -G Ninja -S libclc -B libclc-build
-DLLVM_DIR="$(pwd)"/build/lib/cmake/llvm
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
+ ninja -C "$LLVM_BUILDDIR"
+ cmake -G Ninja -S libclc -B libclc-build
-DLLVM_DIR="$LLVM_BUILDDIR"/lib/cmake/llvm
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
ninja -C libclc-build
ninja -C libclc-build test
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
