Skip to content

Commit 1e0c1f4

Browse files
authored
[SYCL][CI] Create a single target for test utilities (#20417)
1 parent 4f7b179 commit 1e0c1f4

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -286,20 +286,9 @@ jobs:
286286

287287
- name: Install utilities
288288
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
289-
# TODO replace utility installation with a single CMake target
290289
run: |
291-
cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install
292-
cmake --build $GITHUB_WORKSPACE/build --target utils/count/install
293-
cmake --build $GITHUB_WORKSPACE/build --target utils/not/install
294-
cmake --build $GITHUB_WORKSPACE/build --target utils/lit/install
295-
cmake --build $GITHUB_WORKSPACE/build --target utils/llvm-lit/install
296-
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-size
297-
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
298-
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
299-
cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
300-
# This is required to perform the DeviceConfigFile consistency test, see
301-
# sycl/test-e2e/Basic/device_config_file_consistency.cpp.
302-
cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
290+
cmake --build $GITHUB_WORKSPACE/build --target install-sycl-test-utilities
291+
303292
- name: Additional Install for "--shared-libs" build
304293
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
305294
run: |

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,9 @@ jobs:
221221
- name: Install utilities
222222
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
223223
shell: bash
224-
# TODO replace utility installation with a single CMake target
225224
run: |
226-
cmake --build build --target utils/FileCheck/install
227-
cmake --build build --target utils/count/install
228-
cmake --build build --target utils/not/install
229-
cmake --build build --target utils/lit/install
230-
cmake --build build --target utils/llvm-lit/install
231-
cmake --build build --target install-llvm-size
232-
cmake --build build --target install-llvm-cov
233-
cmake --build build --target install-llvm-profdata
234-
cmake --build build --target install-compiler-rt
225+
cmake --build $GITHUB_WORKSPACE/build --target install-sycl-test-utilities
226+
235227
- name: Pack toolchain
236228
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
237229
shell: bash

sycl/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,3 +599,19 @@ add_custom_target(deploy-sycl-toolchain
599599
add_subdirectory(doc)
600600
# SYCL End-to-End tests
601601
add_subdirectory(test-e2e)
602+
603+
add_custom_target(install-sycl-test-utilities
604+
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
605+
utils/FileCheck/install
606+
utils/count/install
607+
utils/not/install
608+
utils/lit/install
609+
utils/llvm-lit/install
610+
install-llvm-size
611+
install-llvm-cov
612+
install-llvm-profdata
613+
install-compiler-rt
614+
# This is required to perform the DeviceConfigFile consistency test, see
615+
# sycl/test-e2e/Basic/device_config_file_consistency.cpp.
616+
COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component DeviceConfigFile
617+
)

0 commit comments

Comments
 (0)