Use IntelSYCL instead of IntelDPCPP compiler CMake script

Author: oleksandr-pavlyk

Publications/GPU-Opt-Guide/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 include(CheckLanguage)
 enable_testing()
 
-find_package(IntelDPCPP REQUIRED)
+find_package(IntelSYCL REQUIRED)
 
 if (BUILD_FOTRAN_EXAMPLES)
   check_language(Fortran)
@@ -39,36 +39,44 @@ string(CONCAT WARNING_CXX_FLAGS_STR
 string(REPLACE " " ";" COMMON_CXX_FLAGS "${WARNING_CXX_FLAGS_STR}")
 
 function(add_example_with_mkl name)
-  add_executable(${name} ${name}.cpp)
+  set(_sources ${name}.cpp)
+  add_executable(${name} ${_sources})
+  add_sycl_to_target(TARGET ${_name} SOURCES ${_sources})
   target_compile_options(${name} PRIVATE ${COMMON_CXX_FLAGS})
   target_compile_options(${name} PRIVATE -fiopenmp -fopenmp-targets=spir64 -qmkl)
-  target_link_libraries(${name} PRIVATE MKL::MKL_DPCPP)
+  target_link_libraries(${name} PRIVATE MKL::MKL_SYCL)
   target_link_options(${name} PRIVATE -fiopenmp -fopenmp-targets=spir64 -qmkl -lOpenCL)
   add_test(NAME ${name} COMMAND ${name} ${ARGN})
 endfunction(add_example_with_mkl)
 
 function(add_fortran_example_with_mkl name)
   if(CMAKE_Fortran_COMPILER)
-    add_executable(${name} ${name}.f)
+    set(_sources ${name}.f)
+    add_executable(${name} ${_sources})
+    add_sycl_to_target(TARGET ${name} SOURCES ${_sources})
     target_compile_options(${name} PRIVATE -warn all)
     target_compile_options(${name} PRIVATE -fiopenmp -fopenmp-targets=spir64 -qmkl -fpp -free)
     set_target_properties(${name} PROPERTIES LINKER_LANGUAGE Fortran)
-    target_link_libraries(${name} PUBLIC MKL::MKL_DPCPP)
+    target_link_libraries(${name} PUBLIC MKL::MKL_MKL)
     target_link_options(${name} PRIVATE -fiopenmp -fopenmp-targets=spir64 -qmkl -lOpenCL)
     add_test(NAME ${name} COMMAND ${name} ${ARGN})
   endif()
 endfunction(add_fortran_example_with_mkl)
 
 function(add_example name)
-  add_executable(${name} ${name}.cpp)
+  set(_sources ${name}.cpp)
+  add_executable(${name} ${_sources})
+  add_sycl_to_target(TARGET ${name} SOURCES ${_sources})
   target_compile_options(${name} PRIVATE ${COMMON_CXX_FLAGS})
   target_link_options(${name} PRIVATE -fsycl-device-code-split=per_kernel)
   add_test(NAME ${name} COMMAND ${name} ${ARGN})
 endfunction(add_example)
 
 function(add_fortran_example name)
   if(CMAKE_Fortran_COMPILER)
-    add_executable(${name} ${name}.f90)
+    set(_sources ${name}.f90)
+    add_executable(${name} ${_sources})
+    add_sycl_to_target(TARGET ${name} SOURCES ${_sources})
     target_compile_options(${name} PRIVATE -warn all)
     target_compile_options(${name} PRIVATE -fiopenmp -fopenmp-targets=spir64)
     set_target_properties(${name} PROPERTIES LINKER_LANGUAGE Fortran)
@@ -79,7 +87,9 @@ endfunction(add_fortran_example)
 
 function(add_mpi_example name)
   if(MPI_FOUND)
-    add_executable(${name} ${name}.cpp)
+    set(_sources ${name}.cpp)
+    add_executable(${name} ${_sources})
+    add_sycl_to_target(TARGET ${name} SOURCES ${_sources})
     target_compile_options(${name} PRIVATE -O3 -fiopenmp -fopenmp-targets=spir64)
     target_link_options(${name} PRIVATE -O3 -fiopenmp -fopenmp-targets=spir64)
     target_link_libraries(${name} PRIVATE MPI::MPI_CXX)