Skip to content

[SYCL] Stop building and installing spirv format device library files #20921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jinge90 wants to merge 14 commits into
base: sycl
Choose a base branch
from
Open

[SYCL] Stop building and installing spirv format device library files #20921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2d50750
remove dummy bin
jinge90 Nov 24, 2025
9c76946
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Nov 26, 2025
fe628a9
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Nov 27, 2025
7a7e62b
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Nov 28, 2025
4de8fa5
merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Dec 1, 2025
e52bb98
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Dec 4, 2025
4b63322
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Dec 10, 2025
544d912
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Dec 12, 2025
2ad6143
Merge remote-tracking branch 'upstream/sycl' into sycl
jinge90 Dec 17, 2025
e9eb142
[SYCL] Stop building and installing spv device libraries
jinge90 Dec 17, 2025
4b88ae8
We will remove spv device library files and need to clean up the test…
jinge90 Dec 17, 2025
429cd67
remove test folder in libdevice CMake
jinge90 Dec 17, 2025
b241b81
remove check-libdevice in workflow
jinge90 Dec 17, 2025
ef0143b
Merge remote-tracking branch 'upstream/sycl' into remove_spv_devicelib
jinge90 Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/sycl-linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ jobs:
if: ${{ !cancelled() && contains(inputs.changes, 'libclc') }}
run: |
cmake --build $GITHUB_WORKSPACE/build --target check-libclc
- name: check-libdevice
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
run: |
cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
Comment on lines -263 to -266
Copy link
Contributor

@uditagarwal97 uditagarwal97 Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jinge90 ,
Sorry, I didn't get why we no longer want to run libdevice tests in CI? Are all tests executed as part of check-libdevice target useless now?

Copy link
Contributor Author

@jinge90 jinge90 Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @uditagarwal97
Yes, these tests are useless now. There are 2 parts of libdevice tests: SYCL/test-e2e/DeviceLib and libdevice/test.
The SYCL/test-e2e/DeviceLib includes all functionality e2e tests and libdevice/test(check-libdevice) is lit test to check spirv format device library files only. For example, we will use 'llvm-spirv -r' to translate spirv device library files to LLVM IR file and check whether 'double' type exits only in math/complex device libraries targets for fp64.
For now, we have removed the spirv device library jit link path in SYCL compiler, those spirv device libraries are useless now and should be removed from compiler package. So, the lit tests checking spirv device libraries should be removed together.
There is no change for SYCL/test-e2e/DeviceLib, all device library e2e tests are still ran in CI.

Thanks very much.

Copy link
Contributor

@uditagarwal97 uditagarwal97 Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh.. I see. Makes sense now.

Copy link
Contributor

@uditagarwal97 uditagarwal97 Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jinge90 In that case, should we also remove check-libdevice CMake target?

- name: Check E2E test requirements
if: ${{ !cancelled() && !contains(inputs.changes, 'sycl') }}
run: |
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/sycl-windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,6 @@ jobs:
if: ${{ !cancelled() && contains(inputs.changes, 'xptifw') }}
run: |
cmake --build build --target check-xptifw
- name: check-libdevice
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
run: |
cmake --build build --target check-libdevice
- name: Generate/diff new ABI symbols
if: ${{ !cancelled() && contains(inputs.changes, 'sycl') }}
shell: bash
Expand Down
2 changes: 0 additions & 2 deletions libdevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,3 @@ set(LIBDEVICE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBDEVICE_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
set(LIBDEVICE_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(LIBDEVICE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

add_subdirectory(test)
18 changes: 4 additions & 14 deletions libdevice/cmake/modules/SYCLLibdevice.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@ set(obj-new-offload_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
if (MSVC)
set(obj-suffix obj)
set(obj-new-offload-suffix new.obj)
set(spv_binary_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
set(install_dest_spv bin)
set(devicelib_host_static_obj sycl-devicelib-host.lib)
set(devicelib_host_static_obj-new-offload sycl-devicelib-host.new.lib)
else()
set(obj-suffix o)
set(obj-new-offload-suffix new.o)
set(spv_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(install_dest_spv lib${LLVM_LIBDIR_SUFFIX})
set(devicelib_host_static_obj libsycl-devicelib-host.a)
set(devicelib_host_static_obj-new-offload libsycl-devicelib-host.new.a)
endif()
set(spv-suffix spv)
set(bc-suffix bc)
set(bc_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(install_dest_obj lib${LLVM_LIBDIR_SUFFIX})
Expand Down Expand Up @@ -80,8 +75,7 @@ endif()

add_custom_target(libsycldevice)

set(filetypes obj obj-new-offload spv bc)
set(filetypes_no_spv obj obj-new-offload bc)
set(filetypes obj obj-new-offload bc)

foreach(filetype IN LISTS filetypes)
add_custom_target(libsycldevice-${filetype})
Expand All @@ -108,7 +102,6 @@ if("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
endif()


set(spv_device_compile_opts -fsycl-device-only -fsycl-device-obj=spirv)
set(bc_device_compile_opts -fsycl-device-only -fsycl-device-obj=llvmir)
set(obj-new-offload_device_compile_opts -fsycl -c --offload-new-driver
-foffload-lto=thin ${sycl_targets_opt})
Expand Down Expand Up @@ -524,15 +517,14 @@ else()
SRC sanitizer/asan_rtl.cpp
DEPENDENCIES ${asan_obj_deps}
BUILD_ARCHS ${sanitizer_build_archs}
FILETYPES "${filetypes_no_spv}"
EXTRA_OPTS -fno-sycl-instrument-device-code
-I${UR_SANITIZER_INCLUDE_DIR}
-I${CMAKE_CURRENT_SOURCE_DIR})

# asan aot
set(asan_devicetypes pvc cpu dg2)

foreach(asan_ft IN LISTS filetypes_no_spv)
foreach(asan_ft IN LISTS filetypes)
foreach(asan_device IN LISTS asan_devicetypes)
compile_lib_ext(libsycl-asan-${asan_device}
SRC sanitizer/asan_rtl.cpp
Expand All @@ -547,15 +539,14 @@ else()
SRC sanitizer/msan_rtl.cpp
DEPENDENCIES ${msan_obj_deps}
BUILD_ARCHS ${sanitizer_build_archs}
FILETYPES "${filetypes_no_spv}"
EXTRA_OPTS -fno-sycl-instrument-device-code
-I${UR_SANITIZER_INCLUDE_DIR}
-I${CMAKE_CURRENT_SOURCE_DIR})

# msan aot
set(msan_devicetypes pvc cpu)

foreach(msan_ft IN LISTS filetypes_no_spv)
foreach(msan_ft IN LISTS filetypes)
foreach(msan_device IN LISTS msan_devicetypes)
compile_lib_ext(libsycl-msan-${msan_device}
SRC sanitizer/msan_rtl.cpp
Expand All @@ -570,14 +561,13 @@ else()
SRC sanitizer/tsan_rtl.cpp
DEPENDENCIES ${tsan_obj_deps}
BUILD_ARCHS ${sanitizer_build_archs}
FILETYPES "${filetypes_no_spv}"
EXTRA_OPTS -fno-sycl-instrument-device-code
-I${UR_SANITIZER_INCLUDE_DIR}
-I${CMAKE_CURRENT_SOURCE_DIR})

set(tsan_devicetypes pvc cpu)

foreach(tsan_ft IN LISTS filetypes_no_spv)
foreach(tsan_ft IN LISTS filetypes)
foreach(tsan_device IN LISTS tsan_devicetypes)
compile_lib_ext(libsycl-tsan-${tsan_device}
SRC sanitizer/tsan_rtl.cpp
Expand Down
53 changes: 0 additions & 53 deletions libdevice/test/CMakeLists.txt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions libdevice/test/check_cmath.txt
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions libdevice/test/check_fp64.txt
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions libdevice/test/lit.cfg.py
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions libdevice/test/lit.site.cfg.py.in
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions libdevice/test/sycl_noinline.txt
View file
Open in desktop

This file was deleted.

Loading
Loading