Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
- 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
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
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
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

This file was deleted.

12 changes: 0 additions & 12 deletions libdevice/test/check_cmath.txt

This file was deleted.

18 changes: 0 additions & 18 deletions libdevice/test/check_fp64.txt

This file was deleted.

50 changes: 0 additions & 50 deletions libdevice/test/lit.cfg.py

This file was deleted.

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

This file was deleted.

74 changes: 0 additions & 74 deletions libdevice/test/sycl_noinline.txt

This file was deleted.

Loading
Loading