[SYCLomatic][CMake] Support migration of ${CUDA_cufft_LIBRARY} and refine migration of ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} (#2254)

Signed-off-by: chenwei.sun <[email protected]>

Author: tomflinda

clang/test/dpct/cmake_migration/case_039/expected.txt

@@ -32,3 +32,5 @@ add_link_options("")
 add_link_options("")
 add_link_options("")
 add_link_options("")
+target_link_libraries(dali_kernels PRIVATE ${MKL_LIB})
+include_directories(SYSTEM "${SYCLToolkit_LIBRARY_DIR}")

clang/test/dpct/cmake_migration/case_039/input.cmake

@@ -32,3 +32,5 @@ add_link_options("--no-ptxas-options")
 add_link_options("--emit-ptx=output.ptx")
 add_link_options("--nvvmir-library=my_nvvm_library")
 add_link_options("--library-path=/path/to/libraries")
+target_link_libraries(dali_kernels PRIVATE ${CUDA_cufft_LIBRARY})
+include_directories(SYSTEM "${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")

clang/test/dpct/cmake_migration/case_054/expected.txt

@@ -7,7 +7,7 @@ target_include_directories(${lib_name} SYSTEM INTERFACE "${SYCL_INCLUDE_DIR}")
 # TransformerEngine/transformer_engine/cmake/FindCUDNN.cmake
 target_include_directories(target $<BUILD_INTERFACE:${SYCL_INCLUDE_DIR}>)
 
-target_include_directories(nvshmem_device_lib INTERFACE ${SYCL_INCLUDE_DIR})
+target_include_directories(nvshmem_device_lib INTERFACE ${SYCLToolkit_LIBRARY_DIR})
 
 target_include_directories(quda SYSTEM PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${SYCL_INCLUDE_DIR}>)
 

clang/tools/dpct/DpctOptRules/cmake_script_migration_rule.yaml

@@ -573,6 +573,26 @@
       Out: ""
       RuleId: "remove_CUDA_nvToolsExt_LIBRARY"
 
+- Rule: rule_CUDA_cufft_LIBRARY
+  Kind: CMakeRule
+  Priority: Fallback
+  MatchMode: Partial
+  CmakeSyntax: CUDA_cufft_LIBRARY
+  In: ${func_name}(${value})
+  Out: ${func_name}(${value})
+  Subrules:
+    value:
+      MatchMode: Full
+      In: \${CUDA_cufft_LIBRARY}
+      Out: \${MKL_LIB}
+
+- Rule: rule_CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
+  Kind: CMakeRule
+  Priority: Fallback
+  CmakeSyntax: CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
+  In: \${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+  Out: \${SYCLToolkit_LIBRARY_DIR}
+
 - Rule: rule_cuda_compile_with_opts
   Kind: CMakeRule
   Priority: Fallback
@@ -2508,20 +2528,6 @@
       MatchMode: Full
       RuleId: "replace_cudnn_include_dir_with_sycl_include_dir"
 
-- Rule: rule_target_include_directories_cmake_cuda_toolkit_include_dir
-  Kind: CMakeRule
-  Priority: Fallback
-  CmakeSyntax: target_include_directories_cmake_cuda_toolkit_inc
-  MatchMode: Partial
-  In: target_include_directories${empty}(${value})
-  Out: target_include_directories(${value})
-  Subrules:
-    value:
-      In: CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
-      Out: SYCL_INCLUDE_DIR
-      MatchMode: Full
-      RuleId: "replace_cmake_cuda_toolkit_include_dir_with_sycl_include_dir"
-
 - Rule: rule_target_include_directories_cuda_toolkit_math_include_dir
   Kind: CMakeRule
   Priority: Fallback