Skip to content

Commit c1a3fc9

Browse files
authored
[CI] Fix HIP postcommit (#14980)
We need `reset_gpu` to be false, to use the correct image, and to use a static library build becuase `lld` is not packaged correctly into the binary for shared library build. I'll investigate the `lld` issue separately (#14986), but let's unbreak CI. Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent 31b6ba1 commit c1a3fc9

File tree

1 file changed

+31
-7
lines changed

1 file changed

+31
-7
lines changed

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

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,23 @@ jobs:
4242
cxx: clang++
4343
merge_ref: ''
4444

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
53+
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"
54+
# Docker image has last nightly pre-installed and added to the PATH
55+
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
56+
cc: clang
57+
cxx: clang++
58+
merge_ref: ''
59+
4560
e2e-lin:
46-
needs: [build-lin]
61+
needs: [build-lin, build-lin-static]
4762
if: ${{ always() && !cancelled() && needs.build-lin.outputs.build_conclusion == 'success' }}
4863
strategy:
4964
fail-fast: false
@@ -53,14 +68,21 @@ jobs:
5368
runner: '["Linux", "gen12"]'
5469
extra_lit_opts: --param gpu-intel-gen12=True
5570
target_devices: level_zero:gpu;opencl:fpga
71+
reset_gpu: true
5672
- name: Intel Arc A-Series Graphics with Level Zero
5773
runner: '["Linux", "arc"]'
5874
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
75+
reset_gpu: true
5976
- name: AMD/HIP
6077
runner: '["Linux", "amdgpu"]'
6178
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
6279
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6380
target_devices: ext_oneapi_hip:gpu
81+
reset_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 }}
6486
# Performance tests below. Specifics:
6587
# - only run performance tests (use LIT_FILTER env)
6688
# - ask llvm-lit to show all the output, even for PASS (-a)
@@ -72,29 +94,31 @@ jobs:
7294
env: '{"LIT_FILTER":"PerformanceTests/"}'
7395
extra_lit_opts: -a -j 1 --param enable-perf-tests=True --param gpu-intel-gen12=True
7496
target_devices: all
97+
reset_gpu: true
7598
- name: Perf tests on Intel Arc A-Series Graphics system
7699
runner: '["Linux", "arc"]'
77100
env: '{"LIT_FILTER":"PerformanceTests/"}'
78101
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
79102
target_devices: all
103+
reset_gpu: true
80104
uses: ./.github/workflows/sycl-linux-run-tests.yml
81105
with:
82106
name: ${{ matrix.name }}
83107
runner: ${{ matrix. runner }}
84-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
85-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
108+
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
109+
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }}
86110
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
87-
reset_gpu: true
111+
reset_gpu: ${{ matrix.reset_gpu }}
88112

89113
extra_lit_opts: ${{ matrix.extra_lit_opts }}
90114
env: ${{ matrix.env || '{}' }}
91115

92116
ref: ${{ github.sha }}
93117
merge_ref: ''
94118

95-
sycl_toolchain_artifact: sycl_linux_sprod_shared
96-
sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
97-
sycl_toolchain_decompress_command: ${{ needs.build-lin.outputs.artifact_decompress_command }}
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 }}
98122

99123
build-win:
100124
if: |

0 commit comments

Comments
 (0)