[SYCLomatic] Inline 4 cmake macros

clang/CMakeLists.txt

@@ -494,14 +494,6 @@ list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets)
 if(LLVM_ENABLE_MODULES)
   list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
 endif()
-# SYCLomatic_CUSTOMIZATION begin
-list(INSERT CMAKE_MODULE_PATH 0
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/DPCT/cmake"
-  "${CMAKE_CURRENT_SOURCE_DIR}/tools/dpct/cmake"
-  )
-include(libDPCT)
-include(dpct)
-# SYCLomatic_CUSTOMIZATION end
 add_subdirectory(lib)
 add_subdirectory(tools)
 add_subdirectory(runtime)
@@ -1008,7 +1000,25 @@ configure_file(
 
 # SYCLomatic_CUSTOMIZATION begin
 if (NOT CLANG_BUILT_STANDALONE)
-  set_dpct_package()
+  if(WIN32)
+    list(APPEND DPCT_RUN
+      install-dpct-pattern-rewriter
+      install-dpct-headers
+      install-clang-resource-headers
+      install-dpct-binary
+      install-dpct-opt-rules
+      )
+  else()
+    list(APPEND DPCT_RUN
+      install-dpct-intercept-build
+      install-dpct-pattern-rewriter
+      install-dpct-headers
+      install-clang-resource-headers
+      install-dpct-binary
+      install-dpct-autocomplete
+      install-dpct-opt-rules
+      )
+  endif()
 endif()
 add_custom_target(install-dpct DEPENDS ${DPCT_RUN})
 set_target_properties(install-dpct PROPERTIES FOLDER "install dpct")

clang/lib/DPCT/CMakeLists.txt

@@ -106,4 +106,85 @@ include_directories(
 
 add_subdirectory(ConfusableTable)
 
-build_lib_dpct()
+add_clang_library(DPCT
+  ASTTraversal.cpp
+  AnalysisInfo.cpp
+  CallExprRewriter.cpp
+  CallExprRewriterCUB.cpp
+  CallExprRewriterCUFFT.cpp
+  CallExprRewriterCUBLAS.cpp
+  CallExprRewriterCURAND.cpp
+  CallExprRewriterCUSOLVER.cpp
+  CallExprRewriterCUSPARSE.cpp
+  CallExprRewriterComplex.cpp
+  CallExprRewriterDriver.cpp
+  CallExprRewriterMemory.cpp
+  CallExprRewriterNccl.cpp
+  CallExprRewriterStream.cpp
+  CallExprRewriterTexture.cpp
+  CallExprRewriterThrust.cpp
+  CallExprRewriterWarp.cpp
+  CallExprRewriterCUDNN.cpp
+  CallExprRewriterErrorHandling.cpp
+  CallExprRewriterLIBCU.cpp
+  CallExprRewriterEvent.cpp
+  CallExprRewriterMath.cpp
+  CallExprRewriterCG.cpp
+  Diagnostics.cpp
+  Error.cpp
+  Statics.cpp
+  ExprAnalysis.cpp
+  ExtReplacements.cpp
+  MapNames.cpp
+  SaveNewFiles.cpp
+  DPCT.cpp
+  TextModification.cpp
+  Utility.cpp
+  ValidateArguments.cpp
+  ExternalReplacement.cpp
+  SignalProcess.cpp
+  VcxprojParser.cpp
+  LibraryAPIMigration.cpp
+  CustomHelperFiles.cpp
+  GenMakefile.cpp
+  IncrementalMigrationUtility.cpp
+  Rules.cpp
+  Homoglyph.cpp
+  MisleadingBidirectional.cpp
+  BarrierFenceSpaceAnalyzer.cpp
+  BLASAPIMigration.cpp
+  FFTAPIMigration.cpp
+  DNNAPIMigration.cpp
+  NCCLAPIMigration.cpp
+  TypeLocRewriters.cpp
+  QueryApiMapping.cpp
+  AutoComplete.cpp
+  LIBCUAPIMigration.cpp
+  CUBAPIMigration.cpp
+  MemberExprRewriter.cpp
+  MigrationRuleManager.cpp
+  MigrationAction.cpp
+  ThrustAPIMigration.cpp
+
+  DEPENDS
+  ClangDriverOptions
+  dpct_helper_headers_and_inc
+  genconfusable
+
+  LINK_LIBS
+  clangBasic
+  clangLex
+  clangAnalysis
+  clangAST
+  clangASTMatchers
+  clangDriver
+  clangEdit
+  clangFormat
+  clangFrontend
+  clangParse
+  clangRewrite
+  clangSema
+  clangSerialization
+  clangTooling
+  clangToolingCore
+)

clang/tools/dpct/CMakeLists.txt

@@ -19,6 +19,26 @@ include_directories(
   ../../../clang/lib/Driver/
   )
 
-install_dpct()
+target_link_libraries(dpct-binary
+  PRIVATE
+  DPCT
+  )
+
+add_clang_symlink(c2s dpct-binary)
+if(UNIX)
+  set(dpct_autocomplete_script bash-autocomplete.sh)
+endif()
+
+if(UNIX)
+  install(
+    FILES ${dpct_autocomplete_script}
+    COMPONENT dpct-autocomplete
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    DESTINATION ./env)
+  if (NOT CMAKE_CONFIGURATION_TYPES)
+    add_llvm_install_targets(install-dpct-autocomplete
+                             COMPONENT dpct-autocomplete)
+  endif()
+endif()
 
 add_subdirectory(DpctOptRules)