Skip to content

Commit 99a69c0

Browse files
authored
[CI] Move shared library testing to nightly (#14996)
The only value for shared library build is making sure the build isn't broken for developers. Using sharedlib build in postcommit complicates HIP testing. Move precommit to use static lib build and move shared library build+lit to nightly only. --------- Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent 8c21271 commit 99a69c0

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

.github/workflows/sycl-nightly.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,19 @@ jobs:
2323
# prefer widespread gzip compression.
2424
artifact_archive_name: sycl_linux.tar.gz
2525

26+
ubuntu2204_shared_build:
27+
if: github.repository == 'intel/llvm'
28+
uses: ./.github/workflows/sycl-linux-build.yml
29+
secrets: inherit
30+
with:
31+
build_cache_root: "/__w/"
32+
build_cache_suffix: sprod_shared
33+
build_artifact_suffix: sprod_shared
34+
build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
35+
merge_ref: ''
36+
37+
artifact_archive_name: sycl_linux_shared.tar.zst
38+
2639
ubuntu2204_test:
2740
needs: [ubuntu2204_build]
2841
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}

.github/workflows/sycl-post-commit.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,13 @@ permissions: read-all
2828

2929
jobs:
3030
build-lin:
31-
name: Linux (Self build + shared libraries + no-assertions)
31+
name: Linux (Self build + no-assertions)
3232
if: github.repository == 'intel/llvm'
3333
uses: ./.github/workflows/sycl-linux-build.yml
3434
with:
3535
build_cache_root: "/__w/llvm"
36-
build_cache_suffix: sprod_shared
37-
build_artifact_suffix: sprod_shared
38-
build_configure_extra_args: --shared-libs --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
39-
# Docker image has last nightly pre-installed and added to the PATH
40-
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
41-
cc: clang
42-
cxx: clang++
43-
merge_ref: ''
44-
45-
build-lin-static:
46-
name: Linux (Self build + static libraries + no-assertions)
47-
if: github.repository == 'intel/llvm'
48-
uses: ./.github/workflows/sycl-linux-build.yml
49-
with:
50-
build_cache_root: "/__w/llvm"
51-
build_cache_suffix: sprod_static
52-
build_artifact_suffix: sprod_static
36+
build_cache_suffix: default
37+
build_artifact_suffix: default
5338
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
5439
# Docker image has last nightly pre-installed and added to the PATH
5540
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
@@ -58,7 +43,7 @@ jobs:
5843
merge_ref: ''
5944

6045
e2e-lin:
61-
needs: [build-lin, build-lin-static]
46+
needs: [build-lin]
6247
if: ${{ always() && !cancelled() && needs.build-lin.outputs.build_conclusion == 'success' }}
6348
strategy:
6449
fail-fast: false
@@ -79,10 +64,6 @@ jobs:
7964
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
8065
target_devices: ext_oneapi_hip:gpu
8166
reset_intel_gpu: false
82-
# Use static build because of shared lld packaging issue
83-
sycl_toolchain_artifact: sycl_linux_sprod_static
84-
sycl_toolchain_archive: ${{ needs.build-lin-static.outputs.artifact_archive_name }}
85-
sycl_toolchain_decompress_command: ${{ needs.build-lin-static.outputs.artifact_decompress_command }}
8667
# Performance tests below. Specifics:
8768
# - only run performance tests (use LIT_FILTER env)
8869
# - ask llvm-lit to show all the output, even for PASS (-a)
@@ -116,9 +97,9 @@ jobs:
11697
ref: ${{ github.sha }}
11798
merge_ref: ''
11899

119-
sycl_toolchain_artifact: ${{ matrix.sycl_toolchain_artifact || 'sycl_linux_sprod_shared' }}
120-
sycl_toolchain_archive: ${{ matrix.sycl_toolchain_archive || needs.build-lin.outputs.artifact_archive_name }}
121-
sycl_toolchain_decompress_command: ${{ matrix.sycl_toolchain_decompress_command || needs.build-lin.outputs.artifact_decompress_command }}
100+
sycl_toolchain_artifact: sycl_linux_default
101+
sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
102+
sycl_toolchain_decompress_command: ${{ needs.build-lin.outputs.artifact_decompress_command }}
122103

123104
build-win:
124105
if: |

0 commit comments

Comments
 (0)