refactor cmake files

Author: pgorlani

sycl/cmake/modules/FindCUDACupti.cmake

@@ -0,0 +1,20 @@
+macro(find_cuda_cupti_library)
+# The following if can be removed when FindCUDA -> FindCUDAToolkit
+  find_library(CUDA_cupti_LIBRARY
+    NAMES cupti
+    HINTS ${CUDA_TOOLKIT_ROOT_DIR}
+          ENV CUDA_PATH
+    PATH_SUFFIXES nvidia/current lib64 lib/x64 lib
+                  ../extras/CUPTI/lib64/
+                  ../extras/CUPTI/lib/
+  )
+endmacro()
+
+macro(find_cuda_cupti_include_dir)
+  find_path(CUDA_CUPTI_INCLUDE_DIR cupti.h PATHS
+      "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
+      "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include"
+      "${CUDA_INCLUDE_DIRS}"
+      NO_DEFAULT_PATH)
+endmacro()
+

sycl/plugins/cuda/CMakeLists.txt

@@ -27,15 +27,15 @@ if (SYCL_ENABLE_XPTI_TRACING)
   set(XPTI_PROXY_SRC "${CMAKE_SOURCE_DIR}/../xpti/src/xpti_proxy.cpp")
 endif()
 
+# The following two if's can be removed when FindCUDA -> FindCUDAToolkit.
+# CUDA_CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
+include(FindCUDACupti)
+if(NOT CUDA_CUPTI_INCLUDE_DIR)
+   find_cuda_cupti_include_dir()
+endif()
+# CUDA_cupti_LIBRARY -> CUDAToolkit_cupti_LIBRARY
 if(NOT CUDA_cupti_LIBRARY)
-  find_library(CUDA_cupti_LIBRARY
-    NAMES cupti
-    HINTS ${CUDA_TOOLKIT_ROOT_DIR}
-          ENV CUDA_PATH
-    PATH_SUFFIXES nvidia/current lib64 lib/x64 lib
-                  ../extras/CUPTI/lib64/
-                  ../extras/CUPTI/lib/
-  )
+   find_cuda_cupti_library()
 endif()
 
 add_sycl_plugin(cuda
@@ -60,18 +60,11 @@ if (SYCL_ENABLE_XPTI_TRACING)
   target_link_libraries(pi_cuda PRIVATE ${CMAKE_DL_LIBS})
 endif()
 
-# The following find_path can be removed when FindCUDA -> FindCUDAToolkit, and
-# _CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
-find_path(_CUPTI_INCLUDE_DIR cupti.h PATHS
-    "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
-    "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include"
-    "${CUDA_INCLUDE_DIRS}"
-    NO_DEFAULT_PATH)
 
 target_include_directories(pi_cuda
   PRIVATE
     ${sycl_inc_dir}
-    ${_CUPTI_INCLUDE_DIR}
+    ${CUDA_CUPTI_INCLUDE_DIR}
 )
 
 set_target_properties(pi_cuda PROPERTIES LINKER_LANGUAGE CXX)

sycl/tools/sycl-trace/CMakeLists.txt

@@ -61,36 +61,28 @@ add_dependencies(sycl_pi_trace_collector pi-pretty-printers ze-pretty-printers)
 if(SYCL_BUILD_PI_CUDA)
 
   find_package(CUDA 10.1 REQUIRED)
+
   target_compile_definitions(sycl_pi_trace_collector
     PRIVATE
       $<$<BOOL:${SYCL_BUILD_PI_CUDA}>:USE_PI_CUDA>
   )
 
-  # The following find_path can be removed when FindCUDA -> FindCUDAToolkit, and
-  # _CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
-  find_path(_CUPTI_INCLUDE_DIR cupti.h PATHS
-      "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
-      "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include"
-      "${CUDA_INCLUDE_DIRS}"
-      NO_DEFAULT_PATH)
+  # The following two if's can be removed when FindCUDA -> FindCUDAToolkit.
+  # CUDA_CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
+  include(FindCUDACupti)
+  if(NOT CUDA_CUPTI_INCLUDE_DIR)
+     find_cuda_cupti_include_dir()
+  endif()
+  # CUDA_cupti_LIBRARY -> CUDAToolkit_cupti_LIBRARY
+  if(NOT CUDA_cupti_LIBRARY)
+     find_cuda_cupti_library()
+  endif()
 
   target_include_directories(sycl_pi_trace_collector
     PRIVATE
-    ${_CUPTI_INCLUDE_DIR}
+    ${CUDA_CUPTI_INCLUDE_DIR}
   )
 
-  # The following if can be removed when FindCUDA -> FindCUDAToolkit
-  if(NOT CUDA_cupti_LIBRARY)
-    find_library(CUDA_cupti_LIBRARY
-      NAMES cupti
-      HINTS ${CUDA_TOOLKIT_ROOT_DIR}
-            ENV CUDA_PATH
-      PATH_SUFFIXES nvidia/current lib64 lib/x64 lib
-                    ../extras/CUPTI/lib64/
-                    ../extras/CUPTI/lib/
-    )
-  endif()
-
   target_link_libraries(sycl_pi_trace_collector
     PRIVATE
       cudadrv