Skip to content

Commit b1ec4d2

Browse files
committed
remove unecessary steps
1 parent 3241455 commit b1ec4d2

File tree

2 files changed

+29
-85
lines changed

2 files changed

+29
-85
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -223,47 +223,6 @@ jobs:
223223
fi
224224
225225
cmake --build $GITHUB_WORKSPACE/build --target check-llvm
226-
- name: check-clang
227-
if: ${{ !cancelled() && contains(inputs.changes, 'clang') }}
228-
env:
229-
# Can't inline to support possible quotes inside:
230-
BUILD_CONFIGURE_EXTRA_ARGS: ${{ inputs.build_configure_extra_args }}
231-
run: |
232-
# Can we move this to Dockerfile? Hopefully, noop on Windows.
233-
export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
234-
if [[ "${BUILD_CONFIGURE_EXTRA_ARGS}" == *"--use-libcxx"* ]]; then
235-
# https://github.com/llvm/llvm-project/issues/59428
236-
export LIT_FILTER_OUT="(E|e)xception"
237-
fi
238-
cmake --build $GITHUB_WORKSPACE/build --target check-clang
239-
- name: check-sycl
240-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
241-
run: |
242-
# TODO consider moving this to Dockerfile.
243-
export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
244-
cmake --build $GITHUB_WORKSPACE/build --target check-sycl
245-
- name: check-sycl-unittests
246-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
247-
run: |
248-
# TODO consider moving this to Dockerfile.
249-
export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
250-
cmake --build $GITHUB_WORKSPACE/build --target check-sycl-unittests
251-
- name: check-llvm-spirv
252-
if: ${{ !cancelled() && contains(inputs.changes, 'llvm_spirv') }}
253-
run: |
254-
cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
255-
- name: check-xptifw
256-
if: ${{ !cancelled() && contains(inputs.changes, 'xptifw') }}
257-
run: |
258-
cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
259-
- name: check-libclc
260-
if: ${{ !cancelled() && contains(inputs.changes, 'libclc') }}
261-
run: |
262-
cmake --build $GITHUB_WORKSPACE/build --target check-libclc
263-
- name: check-libdevice
264-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
265-
run: |
266-
cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
267226
- name: Check E2E test requirements
268227
if: ${{ !cancelled() && !contains(inputs.changes, 'sycl') }}
269228
run: |
@@ -368,3 +327,18 @@ jobs:
368327
binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }}
369328
sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
370329
extra_lit_opts: --param test-preview-mode=True
330+
331+
- name: Build E2E tests with NewOffloadModel
332+
if: |
333+
inputs.e2e_binaries_preview_artifact &&
334+
!cancelled()
335+
&& steps.build.conclusion == 'success' &&
336+
contains(github.event.pull_request.labels.*.name, "new-offload-model")
337+
uses: ./devops/actions/run-tests/e2e
338+
with:
339+
ref: ${{ inputs.ref || github.sha }}
340+
testing_mode: build-only
341+
target_devices: all
342+
binaries_artifact: ${{ inputs.e2e_binaries_with_new_offload_model }}
343+
sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
344+
extra_lit_opts: --param enable_new_offload_model=True

.github/workflows/sycl-windows-build.yml

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -160,36 +160,6 @@ jobs:
160160
run: |
161161
cmake --build build --target ${{ inputs.build_target }}
162162
- run: build/bin/clang++ --version
163-
- name: check-llvm
164-
if: ${{ !cancelled() && contains(inputs.changes, 'llvm') }}
165-
shell: bash
166-
run: |
167-
cmake --build build --target check-llvm
168-
- name: check-clang
169-
if: ${{ !cancelled() && contains(inputs.changes, 'clang') }}
170-
run: |
171-
cmake --build build --target check-clang
172-
- name: check-sycl
173-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
174-
shell: bash
175-
run: |
176-
cmake --build build --target check-sycl
177-
- name: check-sycl-unittests
178-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
179-
run: |
180-
cmake --build build --target check-sycl-unittests
181-
- name: check-llvm-spirv
182-
if: ${{ !cancelled() && contains(inputs.changes, 'llvm_spirv') }}
183-
run: |
184-
cmake --build build --target check-llvm-spirv
185-
- name: check-xptifw
186-
if: ${{ !cancelled() && contains(inputs.changes, 'xptifw') }}
187-
run: |
188-
cmake --build build --target check-xptifw
189-
- name: check-libdevice
190-
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
191-
run: |
192-
cmake --build build --target check-libdevice
193163
- name: Generate/diff new ABI symbols
194164
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
195165
shell: bash
@@ -255,20 +225,20 @@ jobs:
255225
extra_lit_opts: --param sycl_build_targets="spir"
256226
cxx: ${{ inputs.cxx }}
257227

258-
#- name: Build E2E tests with New Offload Model
259-
# if: |
260-
# inputs.e2e_binaries_artifact &&
261-
# !cancelled() &&
262-
# steps.build.conclusion == 'success' &&
263-
# contains(github.event.pull_request.labels.*.name, "new-offload-model")
264-
# uses: ./devops/actions/run-tests/windows/e2e
265-
# with:
266-
# ref: ${{ inputs.ref || github.sha }}
267-
# testing_mode: build-only
268-
# target_devices: all
269-
# binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
270-
# extra_lit_opts: --param sycl_build_targets="spir" --param enable_new_offload_model=True
271-
# cxx: ${{ inputs.cxx }}
228+
- name: Build E2E tests with New Offload Model
229+
if: |
230+
inputs.e2e_binaries_artifact &&
231+
!cancelled() &&
232+
steps.build.conclusion == 'success' &&
233+
contains(github.event.pull_request.labels.*.name, "new-offload-model")
234+
uses: ./devops/actions/run-tests/windows/e2e
235+
with:
236+
ref: ${{ inputs.ref || github.sha }}
237+
testing_mode: build-only
238+
target_devices: all
239+
binaries_artifact: ${{ inputs.e2e_binaries_artifact_with_new_offload_model }}
240+
extra_lit_opts: --param sycl_build_targets="spir" --param enable_new_offload_model=True
241+
cxx: ${{ inputs.cxx }}
272242

273243
- name: Detect hung tests
274244
if: always()

0 commit comments

Comments
 (0)