[llvm] workflows/release-binaries: Enable PGO (PR #124442)
Tom Stellard via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 1 15:32:16 PST 2025
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/124442
>From 05a4779e73ea8599792e47c6869cc0837569a5da Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 25 Jan 2025 20:04:42 -0800
Subject: [PATCH 1/9] workflows/release-binaries: Enable PGO
---
.github/workflows/release-binaries.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 2ca4aea8a3b0ee8..7bd5f9c852da861 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -58,7 +58,6 @@ jobs:
target-cmake-flags: ${{ steps.vars.outputs.target-cmake-flags }}
ccache: ${{ steps.vars.outputs.ccache }}
build-flang: ${{ steps.vars.outputs.build-flang }}
- enable-pgo: ${{ steps.vars.outputs.enable-pgo }}
release-binary-basename: ${{ steps.vars.outputs.release-binary-basename }}
release-binary-filename: ${{ steps.vars.outputs.release-binary-filename }}
build-runs-on: ${{ steps.vars.outputs.build-runs-on }}
@@ -130,9 +129,6 @@ jobs:
echo ccache=sccache >> $GITHUB_OUTPUT
fi
- # Detect necessary CMake flags
- echo "enable-pgo=false" >> $GITHUB_OUTPUT
- target_cmake_flags="-DLLVM_RELEASE_ENABLE_PGO=OFF"
# The macOS builds try to cross compile some libraries so we need to
# add extra CMake args to disable them.
# See https://github.com/llvm/llvm-project/issues/99767
>From fa8e279930ed4da6bd728794ad9958616010ac46 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 29 Jan 2025 17:38:59 -0800
Subject: [PATCH 2/9] Fix release tarball path
---
.github/workflows/release-binaries.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 7bd5f9c852da861..8db0f0a3c1e5502 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -249,7 +249,8 @@ jobs:
shell: bash
run: |
ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
- mv ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/${{ needs.prepare.outputs.release-binary-filename }} .
+ release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
+ mv ${{ steps.setup-stage.outputs.build-prefix }}/$release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
- uses: actions/upload-artifact at 26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
with:
@@ -264,7 +265,7 @@ jobs:
shell: bash
run: |
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
- rm -Rf ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/_CPack_Packages
+ find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -delete
- name: Save Stage
uses: ./workflows-main/.github/workflows/release-binaries-save-stage
>From 78a3b953493c5a2a84508b68c5cbf51cf55bb7d5 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 29 Jan 2025 17:44:34 -0800
Subject: [PATCH 3/9] Re-run tests
>From 72448497017557f1aab121fcff804be4714c77b4 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 29 Jan 2025 17:48:40 -0800
Subject: [PATCH 4/9] Revert "Fix release tarball path"
This reverts commit fa8e279930ed4da6bd728794ad9958616010ac46.
---
.github/workflows/release-binaries.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 8db0f0a3c1e5502..7bd5f9c852da861 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -249,8 +249,7 @@ jobs:
shell: bash
run: |
ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
- release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
- mv ${{ steps.setup-stage.outputs.build-prefix }}/$release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
+ mv ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/${{ needs.prepare.outputs.release-binary-filename }} .
- uses: actions/upload-artifact at 26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
with:
@@ -265,7 +264,7 @@ jobs:
shell: bash
run: |
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
- find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -delete
+ rm -Rf ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/_CPack_Packages
- name: Save Stage
uses: ./workflows-main/.github/workflows/release-binaries-save-stage
>From 7c0d934aa0f3c19b36952a5245863cd287fd3aa1 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 29 Jan 2025 17:52:04 -0800
Subject: [PATCH 5/9] Reapply "Fix release tarball path"
This reverts commit 72448497017557f1aab121fcff804be4714c77b4.
---
.github/workflows/release-binaries.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 7bd5f9c852da861..8db0f0a3c1e5502 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -249,7 +249,8 @@ jobs:
shell: bash
run: |
ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
- mv ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/${{ needs.prepare.outputs.release-binary-filename }} .
+ release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
+ mv ${{ steps.setup-stage.outputs.build-prefix }}/$release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
- uses: actions/upload-artifact at 26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
with:
@@ -264,7 +265,7 @@ jobs:
shell: bash
run: |
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
- rm -Rf ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/_CPack_Packages
+ find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -delete
- name: Save Stage
uses: ./workflows-main/.github/workflows/release-binaries-save-stage
>From ceff3856c08ce68b3c13ba686a419a156dfdcb7e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 29 Jan 2025 20:31:16 -0800
Subject: [PATCH 6/9] Fix filename
---
.github/workflows/release-binaries.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 8db0f0a3c1e5502..88bcf2a52c6d47c 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -242,7 +242,7 @@ jobs:
${{ needs.prepare.outputs.target-cmake-flags }} \
-C clang/cmake/caches/Release.cmake \
-DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
- -DBOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}" \
+ -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}" \
-DCMAKE_C_COMPILER_LAUNCHER=$CCACHE_BIN \
-DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE_BIN
- name: Build
@@ -250,7 +250,7 @@ jobs:
run: |
ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
- mv ${{ steps.setup-stage.outputs.build-prefix }}/$release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
+ mv $release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
- uses: actions/upload-artifact at 26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
with:
>From 3d3edd35ca6768a33060e069d243eed9715b4587 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Thu, 30 Jan 2025 12:00:47 -0800
Subject: [PATCH 7/9] Fix CPack deletion
---
.github/workflows/release-binaries.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index c6256901a552c33..67ed9dec52de708 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -256,7 +256,7 @@ jobs:
shell: bash
run: |
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
- find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -delete
+ find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -prune -exec rm -r {} \;
- name: Save Stage
uses: ./workflows-main/.github/workflows/release-binaries-save-stage
>From 25a415f55f6a690f3e975dbbc78c31718398dd3b Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 1 Feb 2025 15:30:50 -0800
Subject: [PATCH 8/9] Fix stry slash
---
.github/workflows/release-binaries.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 67ed9dec52de708..7a871806c373685 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -234,7 +234,7 @@ jobs:
${{ needs.prepare.outputs.target-cmake-flags }} \
-C clang/cmake/caches/Release.cmake \
-DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
- -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}" \
+ -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
- name: Build
shell: bash
>From f4a6a75d076a428d8d6196699b6e3d893c62b5b9 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 1 Feb 2025 15:32:05 -0800
Subject: [PATCH 9/9] Update .github/workflows/release-binaries.yml
Co-authored-by: Carlo Cabrera <github at carlo.cab>
---
.github/workflows/release-binaries.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 7a871806c373685..204ee6405382fcf 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -256,7 +256,7 @@ jobs:
shell: bash
run: |
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
- find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -prune -exec rm -r {} \;
+ find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -prune -exec rm -r {} +
- name: Save Stage
uses: ./workflows-main/.github/workflows/release-binaries-save-stage
More information about the llvm-commits
mailing list