Update FindDPCPP.cmake (#802)

* Use `CMPLR_ROOT` instead of hardcoded path
* `compiler_` --> `cxx_` in `FindDPCPP.cmake`
* Fallback to manual SYCL flags if IntelSYCL is not found
* Rename due to change in `FindDPCPP.cmake`
* Avoid using OCCA_DPCPP_COMPILER_FLAGS for build configurations

Author: thilinarmtb

CMakeLists.txt

@@ -191,9 +191,9 @@ if(OCCA_ENABLE_DPCPP)
   if(DPCPP_FOUND)
     set(OCCA_DPCPP_ENABLED 1)
 
-    message("-- DPCPP flags: ${SYCL_FLAGS}")
-    message("-- DPCPP include dirs: ${SYCL_INCLUDE_DIRS}")
-    message("-- DPCPP libraries:    ${SYCL_LIBRARIES}")
+    message("-- DPCPP flags: ${DPCPP_FLAGS}")
+    message("-- DPCPP include dirs: ${DPCPP_INCLUDE_DIRS}")
+    message("-- DPCPP libraries:    ${DPCPP_LIBRARIES}")
 
     # Use our wrapper imported target OCCA::depends::DPCPP,
     # (which wraps the _INCLUDE_DIRS and _LIBRARIES,) to make our package relocatable

CMakePresets.json

@@ -32,8 +32,7 @@
         "OCCA_ENABLE_EXAMPLES": "$env{OCCA_ENABLE_EXAMPLES}",
         "OCCA_ENABLE_CLANG_TRANSPILER": "$env{OCCA_ENABLE_CLANG_TRANSPILER}",
         "OCCA_DPCPP_COMPILER": "$env{OCCA_DPCPP_COMPILER}",
-        "OCCA_DPCPP_COMPILER_FLAGS": "$env{OCCA_DPCPP_COMPILER_FLAGS}",
-        "SYCL_FLAGS": "$env{OCCA_DPCPP_COMPILER_FLAGS}"
+        "SYCL_FLAGS": "$env{SYCL_FLAGS}"
       },
       "environment": {
         "OCCA_BUILD_DIR": "${sourceDir}/build",
@@ -92,7 +91,7 @@
       "environment": {
         "OCCA_ENABLE_DPCPP": "ON",
         "OCCA_DPCPP_COMPILER": "clang++",
-        "OCCA_DPCPP_COMPILER_FLAGS": "-fsycl -fsycl-targets=nvptx64-nvidia-cuda"
+        "SYCL_FLAGS": "-fsycl -fsycl-targets=nvptx64-nvidia-cuda"
       }
     },
     {
@@ -105,8 +104,7 @@
         "FC": "ifx",
         "CXXFLAGS": "-Wno-uninitialized",
         "OCCA_ENABLE_DPCPP": "ON",
-        "OCCA_DPCPP_COMPILER": "icpx",
-        "OCCA_DPCPP_COMPILER_FLAGS": "-fsycl"
+        "OCCA_DPCPP_COMPILER": "icpx"
       }
     }
   ],

cmake/FindDPCPP.cmake

@@ -6,64 +6,72 @@
 message(CHECK_START "Looking for DPC++")
 unset(missingDpcppComponents)
 
-cmake_path(CONVERT "${CMAKE_CXX_COMPILER}" TO_CMAKE_PATH_LIST compiler_path)
-cmake_path(GET compiler_path PARENT_PATH compiler_bin_dir)
-cmake_path(GET compiler_bin_dir PARENT_PATH compiler_root_dir)
+find_package(IntelSYCL QUIET)
+if (IntelSYCL_FOUND)
+  set(DPCPP_FOUND TRUE)
+  set(DPCPP_FLAGS "${SYCL_FLAGS}")
+  set(DPCPP_INCLUDE_DIRS "${SYCL_INCLUDE_DIR};${SYCL_INCLUDE_SYCL_DIR}")
+  set(DPCPP_LIBRARIES "${SYCL_LIBRARY}")
+else()
+  cmake_path(CONVERT "${CMAKE_CXX_COMPILER}" TO_CMAKE_PATH_LIST cxx_path)
+  cmake_path(GET cxx_path PARENT_PATH cxx_bin_dir)
+  cmake_path(GET cxx_bin_dir PARENT_PATH cxx_root_dir)
 
-find_path(
-  SYCL_INCLUDE_DIRS
-  NAMES
-    sycl/sycl.hpp
-  PATHS
-    ENV SYCL_ROOT
-    /opt/intel/oneapi/compiler/latest/linux
-    ${SYCL_ROOT}
-    ${compiler_root_dir}
-  PATH_SUFFIXES
-    include
-    include/sycl
-    include/CL
-    include/sycl/CL
-)
+  find_path(
+    DPCPP_INCLUDE_DIRS
+    NAMES
+      sycl/sycl.hpp
+    PATHS
+      ENV SYCL_ROOT
+      ${SYCL_ROOT}
+      ENV CMPLR_ROOT
+      ${cxx_root_dir}
+    PATH_SUFFIXES
+      include
+      include/sycl
+      include/CL
+      include/sycl/CL
+  )
+  set(DPCPP_INCLUDE_DIRS "${DPCPP_INCLUDE_DIRS};${DPCPP_INCLUDE_DIRS}/sycl")
 
-find_library(
-  SYCL_LIBRARIES
-  NAMES
-    sycl libsycl
-  PATHS
-    ENV SYCL_ROOT
-    /opt/intel/oneapi/compiler/latest/linux
-    ${SYCL_ROOT}
-    ${compiler_root_dir}
-  PATH_SUFFIXES
-    lib
-)
+  find_library(
+    DPCPP_LIBRARIES
+    NAMES
+      sycl libsycl
+    PATHS
+      ENV SYCL_ROOT
+      ${SYCL_ROOT}
+      ENV CMPLR_ROOT
+      ${cxx_root_dir}
+    PATH_SUFFIXES
+      lib
+  )
 
-if(NOT OCCA_DPCPP_COMPILER_FLAGS)
-  if(DEFINED ENV{OCCA_DPCPP_COMPILER_FLAGS})
-    set(SYCL_FLAGS $ENV{OCCA_DPCPP_COMPILER_FLAGS})
-  else()
-    set(SYCL_FLAGS -fsycl)
-  endif()
+  set(DPCPP_FLAGS -fsycl)
 endif()
 
+if (NOT SYCL_FLAGS)
+  set(DPCPP_FLAGS SYCL_FLAGS)
+endif()
+# TODO: Check if the backend compiler supports DPCPP_FLAGS
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
-    DPCPP
-    REQUIRED_VARS
-    SYCL_INCLUDE_DIRS
-    SYCL_LIBRARIES
-    SYCL_FLAGS
-    )
+  DPCPP
+  REQUIRED_VARS
+  DPCPP_INCLUDE_DIRS
+  DPCPP_LIBRARIES
+  DPCPP_FLAGS
+)
 
-if(DPCPP_FOUND AND NOT TARGET OCCA::depends::DPCPP)
+if (DPCPP_FOUND AND NOT TARGET OCCA::depends::DPCPP)
   # Create our wrapper imported target
   # Put it in the OCCA namespace to make it clear that we created it.
   add_library(OCCA::depends::DPCPP INTERFACE IMPORTED)
-  separate_arguments(SYCL_FLAGS UNIX_COMMAND "${SYCL_FLAGS}")
-  target_compile_options(OCCA::depends::DPCPP INTERFACE ${SYCL_FLAGS})
+  separate_arguments(DPCPP_FLAGS UNIX_COMMAND "${DPCPP_FLAGS}")
+  target_compile_options(OCCA::depends::DPCPP INTERFACE ${DPCPP_FLAGS})
   set_target_properties(OCCA::depends::DPCPP PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${SYCL_INCLUDE_DIRS};${SYCL_INCLUDE_DIRS}/sycl"
-    INTERFACE_LINK_LIBRARIES "${SYCL_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${DPCPP_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES "${DPCPP_LIBRARIES}"
   )
 endif()