Skip to content

[RNG] Added -fsycl -fsycl-device-code-split=per_kernel at the linking stage to have device code #533

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

Merged
egrabovskaya merged 7 commits into from
Jul 18, 2024
Merged

[RNG] Added -fsycl -fsycl-device-code-split=per_kernel at the linking stage to have device code #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5890883
added -fsycl -fsycl-device-code-split=per_kernel at the linking stage…
egrabovskaya Jul 11, 2024
ff92b25
using is_dpcpp instead of (NOT STREQUAL hipsycl)
egrabovskaya Jul 15, 2024
8a11860
debugging
egrabovskaya Jul 15, 2024
13eec50
Revert "using is_dpcpp instead of (NOT STREQUAL hipsycl)"
egrabovskaya Jul 17, 2024
3c8b42d
Debugging revert
egrabovskaya Jul 17, 2024
6e9cbfc
Removed added spaces in FindCompiler.cmake
egrabovskaya Jul 17, 2024
bfbd99a
Removed space in CMakeLists.txt
egrabovskaya Jul 17, 2024
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
1 change: 0 additions & 1 deletion cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
install(FILES FindCompiler.cmake
DESTINATION "lib/cmake/${PROJECT_NAME}"
)

if(ENABLE_MKLGPU_BACKEND OR ENABLE_MKLCPU_BACKEND)
install(FILES mkl/MKLConfig.cmake
DESTINATION "lib/cmake/${PROJECT_NAME}"
Expand Down
2 changes: 0 additions & 2 deletions cmake/FindCompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
#===============================================================================

include_guard()

include(CheckCXXCompilerFlag)
include(FindPackageHandleStandardArgs)

check_cxx_compiler_flag("-fsycl" is_dpcpp)

if(is_dpcpp)
Expand Down
4 changes: 4 additions & 0 deletions examples/rng/device/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ foreach(rng_device_source ${RNG_DEVICE_SOURCES})
ONEMKL::SYCL::SYCL
)

if(NOT ${ONEMKL_SYCL_IMPLEMENTATION} STREQUAL "hipsycl")
target_link_options(example_${domain}_${rng_device_source} PUBLIC -fsycl -fsycl-device-code-split=per_kernel)
endif()

# Register example as ctest
foreach(device_filter ${DEVICE_FILTERS})
add_test(NAME ${domain}/EXAMPLE/DEVICE/${rng_device_source}/${device_filter} COMMAND example_${domain}_${rng_device_source})
Expand Down
10 changes: 7 additions & 3 deletions tests/unit_tests/rng/device/moments/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#===============================================================================

# Build object from all test sources
set(SERVICE_TESTS_SOURCES "moments.cpp")
set(MOMENTS_DEVICE_TESTS_SOURCES "moments.cpp")

add_library(rng_device_moments_ct OBJECT ${SERVICE_TESTS_SOURCES})
add_library(rng_device_moments_ct OBJECT ${MOMENTS_DEVICE_TESTS_SOURCES})
target_compile_options(rng_device_moments_ct PRIVATE -DNOMINMAX)
target_include_directories(rng_device_moments_ct
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include
Expand All @@ -30,7 +30,11 @@ target_include_directories(rng_device_moments_ct
PUBLIC ${CMAKE_BINARY_DIR}/bin
)
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
add_sycl_to_target(TARGET rng_device_moments_ct SOURCES ${SERVICE_TESTS_SOURCES})
add_sycl_to_target(TARGET rng_device_moments_ct SOURCES ${MOMENTS_DEVICE_TESTS_SOURCES})
else()
target_link_libraries(rng_device_moments_ct PUBLIC ONEMKL::SYCL::SYCL)
endif()

if(NOT ${ONEMKL_SYCL_IMPLEMENTATION} STREQUAL "hipsycl")
target_link_options(rng_device_moments_ct PUBLIC -fsycl -fsycl-device-code-split=per_kernel)
endif()
10 changes: 7 additions & 3 deletions tests/unit_tests/rng/device/service/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#===============================================================================

# Build object from all test sources
set(SERVICE_TESTS_SOURCES "skip_ahead.cpp")
set(SERVICE_DEVICE_TESTS_SOURCES "skip_ahead.cpp")

add_library(rng_device_service_ct OBJECT ${SERVICE_TESTS_SOURCES})
add_library(rng_device_service_ct OBJECT ${SERVICE_DEVICE_TESTS_SOURCES})
target_compile_options(rng_device_service_ct PRIVATE -DNOMINMAX)
target_include_directories(rng_device_service_ct
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include
Expand All @@ -30,7 +30,11 @@ target_include_directories(rng_device_service_ct
PUBLIC ${CMAKE_BINARY_DIR}/bin
)
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
add_sycl_to_target(TARGET rng_device_service_ct SOURCES ${SERVICE_TESTS_SOURCES})
add_sycl_to_target(TARGET rng_device_service_ct SOURCES ${SERVICE_DEVICE_TESTS_SOURCES})
else()
target_link_libraries(rng_device_service_ct PUBLIC ONEMKL::SYCL::SYCL)
endif()

if(NOT ${ONEMKL_SYCL_IMPLEMENTATION} STREQUAL "hipsycl")
target_link_options(rng_device_service_ct PUBLIC -fsycl -fsycl-device-code-split=per_kernel)
endif()