Merge remote-tracking branch 'origin/SYCLomatic' into remove_ipc

Author: ShengchenJ

clang/include/clang/Tooling/Core/Replacement.h

@@ -436,6 +436,8 @@ struct TranslationUnitReplacements {
 #ifdef SYCLomatic_CUSTOMIZATION
   std::vector<MainSourceFileInfo> MainSourceFilesDigest;
   std::string DpctVersion = "";
+  std::string SDKVersionMajor = "";
+  std::string SDKVersionMinor = "";
   std::string MainHelperFileName = "";
   std::string USMLevel = ""; // deprecated
 

clang/include/clang/Tooling/ReplacementsYaml.h

@@ -269,6 +269,8 @@ template <> struct MappingTraits<clang::tooling::TranslationUnitReplacements> {
 #ifdef SYCLomatic_CUSTOMIZATION
     Io.mapOptional("MainSourceFilesDigest", Doc.MainSourceFilesDigest);
     Io.mapOptional("DpctVersion", Doc.DpctVersion);
+    Io.mapOptional("SDKVersionMajor", Doc.SDKVersionMajor);
+    Io.mapOptional("SDKVersionMinor", Doc.SDKVersionMinor);
     Io.mapOptional("MainHelperFileName", Doc.MainHelperFileName);
     Io.mapOptional("USMLevel", Doc.USMLevel);
     // Keep here only for backward compatibility - begin

clang/lib/DPCT/ASTTraversal.cpp

@@ -27,6 +27,7 @@
 #include "RulesSHMEM/NVSHMEMAPIMigration.h"
 #include "RulesSecurity/Homoglyph.h"
 #include "RulesSecurity/MisleadingBidirectional.h"
+#include "RulesTensor/CUTensorAPIMigration.h"
 #include "TextModification.h"
 #include "Utility.h"
 
@@ -197,5 +198,7 @@ REGISTER_RULE(CuDNNAPIRule, PassKind::PK_Migration, RuleGroupKind::RK_DNN)
 
 REGISTER_RULE(NVSHMEMRule, PassKind::PK_Migration, RuleGroupKind::RK_NVSHMEM)
 
+REGISTER_RULE(CUTensorRule, PassKind::PK_Migration, RuleGroupKind::RK_CUTensor)
+
 } // namespace dpct
 } // namespace clang

clang/lib/DPCT/AnalysisInfo.cpp

@@ -2950,7 +2950,7 @@ void MemVarInfo::migrateToDeviceGlobal(const VarDecl *MemVar) {
   auto &Ctx = DpctGlobalInfo::getContext();
   auto &MacroArgMap = DpctGlobalInfo::getMacroArgRecordMap();
   auto TSI = MemVar->getTypeSourceInfo();
-  auto OriginTL = TSI->getTypeLoc();
+  auto OriginTL = TSI->getTypeLoc().getUnqualifiedLoc().getAs<TypeLoc>();
   auto TL = OriginTL;
   auto BegLoc = MemVar->getBeginLoc();
   if (BegLoc.isMacroID()) {

clang/lib/DPCT/CMakeLists.txt

@@ -205,6 +205,7 @@ add_clang_library(DPCT
   RulesLang/CallExprRewriterCG.cpp
   RulesLang/CallExprRewriterWmma.cpp
   RulesSHMEM/CallExprRewriterNvshmem.cpp
+  RulesTensor/CallExprRewriterCUTensor.cpp
   ErrorHandle/CrashRecovery.cpp
   Diagnostics/Diagnostics.cpp
   ErrorHandle/Error.cpp
@@ -244,6 +245,7 @@ add_clang_library(DPCT
   RulesCCL/NCCLAPIMigration.cpp
   RuleInfra/TypeLocRewriters.cpp
   RulesSHMEM/NVSHMEMAPIMigration.cpp
+  RulesTensor/CUTensorAPIMigration.cpp
   Linux/AutoComplete.cpp
   RulesAsm/AsmMigration.cpp
   QueryAPIMapping/QueryAPIMapping.cpp

clang/lib/DPCT/DPCT.cpp

@@ -463,6 +463,59 @@ void parseFormatStyle() {
   DpctGlobalInfo::setCodeFormatStyle(Style);
 }
 
+void updateCompatibilityVersionInfo(clang::tooling::UnifiedPath OutRoot,
+                                    std::string Major, std::string Minor) {
+  const std::string CmakeHelpFile =
+      appendPath(OutRoot.getCanonicalPath().str(), "dpct.cmake");
+  std::ifstream InFile(CmakeHelpFile);
+  if (!InFile) {
+    std::string ErrMsg = "Failed to open file: " + CmakeHelpFile;
+    ShowStatus(MigrationErrorReadWriteCMakeHelperFile, std::move(ErrMsg));
+    dpctExit(MigrationErrorReadWriteCMakeHelperFile);
+  }
+
+  const std::string VersionStr = Major + "." + Minor;
+  const int CompatibilityValue = std::stoi(Major) * 10 + std::stoi(Minor);
+  std::vector<std::string> Lines;
+  std::string Line;
+  bool Inserted = false;
+
+  // Constant block of content to insert
+  const std::vector<std::string> CompatibilityBlock = {
+      "set(COMPATIBILITY_VERSION " + VersionStr + ")",
+      "set(COMPATIBILITY_VALUE " + std::to_string(CompatibilityValue) + ")",
+      "set(COMPATIBILITY_VERSION_MAJOR " + Major + ")",
+      "set(COMPATIBILITY_VERSION_MINOR " + Minor + ")",
+      "" // Add an empty line for good format
+  };
+
+  auto isCommentOrEmpty = [](const std::string &Line) {
+    return Line.empty() || Line[0] == '#';
+  };
+
+  while (std::getline(InFile, Line)) {
+    // Insert the compatibility definition block after the first comment section
+    if (!Inserted && !isCommentOrEmpty(Line)) {
+      Lines.insert(Lines.end(), CompatibilityBlock.begin(),
+                   CompatibilityBlock.end());
+      Inserted = true;
+    }
+    Lines.push_back(Line);
+  }
+  InFile.close();
+
+  std::ofstream OutFile(CmakeHelpFile);
+  if (!OutFile) {
+    std::string ErrMsg = "Failed to write to file: " + CmakeHelpFile;
+    ShowStatus(MigrationErrorReadWriteCMakeHelperFile, std::move(ErrMsg));
+    dpctExit(MigrationErrorReadWriteCMakeHelperFile);
+  }
+  for (const auto &Line : Lines) {
+    OutFile << Line << "\n";
+  }
+  OutFile.close();
+}
+
 static void loadMainSrcFileInfo(clang::tooling::UnifiedPath OutRoot) {
   std::string YamlFilePath = appendPath(OutRoot.getCanonicalPath().str(),
                                         DpctGlobalInfo::getYamlFileName());
@@ -471,7 +524,16 @@ static void loadMainSrcFileInfo(clang::tooling::UnifiedPath OutRoot) {
     if (loadFromYaml(YamlFilePath, *PreTU) != 0) {
       llvm::errs() << getLoadYamlFailWarning(YamlFilePath);
     }
+
+    if (MigrateBuildScriptOnly || DpctGlobalInfo::migrateCMakeScripts()) {
+      std::string Major = PreTU->SDKVersionMajor;
+      std::string Minor = PreTU->SDKVersionMinor;
+      if (!Major.empty() && !Minor.empty()) {
+        updateCompatibilityVersionInfo(OutRoot, Major, Minor);
+      }
+    }
   }
+
   for (auto &Entry : PreTU->MainSourceFilesDigest) {
     if (Entry.HasCUDASyntax)
       MainSrcFilesHasCudaSyntex.insert(Entry.MainSourceFile);

clang/lib/DPCT/ErrorHandle/Error.cpp

@@ -220,6 +220,10 @@ void ShowStatus(int Status, std::string Message) {
   case MigrationErrorInvalidInstallPath:
     StatusString = "Error: " + Message + " not found.";
     break;
+  case MigrationErrorReadWriteCMakeHelperFile:
+    StatusString =
+        "Error: " + Message + ". Please check the file access permission.";
+    break;
   default:
     DpctLog() << "Unknown error.\n";
     dpctExit(-1);

clang/lib/DPCT/ErrorHandle/Error.h

@@ -67,6 +67,7 @@ enum ProcessStatus {
   MigrationErrorCannotWrite = -52,
   MigratePythonBuildScriptOnlyNotSpecifed = -53,
   MigratePythonBuildScriptSpecifiedButPythonRuleFileNotSpecified = -54,
+  MigrationErrorReadWriteCMakeHelperFile = -55,
 };
 
 namespace clang {

clang/lib/DPCT/IncMigration/ExternalReplacement.cpp

@@ -62,6 +62,11 @@ int save2Yaml(
   }
 
   TUR.DpctVersion = clang::dpct::getDpctVersionStr();
+
+  auto Ver = clang::getCudaVersionPair(DpctGlobalInfo::getSDKVersion());
+  TUR.SDKVersionMajor = std::to_string(Ver.first);
+  TUR.SDKVersionMinor = std::to_string(Ver.second);
+
   TUR.OptionMap = clang::dpct::DpctGlobalInfo::getCurrentOptMap();
 
   YAMLOut << TUR;

clang/lib/DPCT/RuleInfra/APINames_removed.inc

@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+// clang-format off
 ENTRY(cublasInit,                      "this functionality is redundant in SYCL.")
 ENTRY(cublasShutdown,                  "this functionality is redundant in SYCL.")
 ENTRY(cublasGetError,                  "this functionality is redundant in SYCL.")
@@ -42,4 +43,8 @@ ENTRY(cudaProfilerStop,                "SYCL currently does not support this fun
 ENTRY(cuFuncSetAttribute,              "SYCL currently does not support setting kernel function attributes")
 ENTRY(cuGetExportTable,                "SYCL does not provide a standard API to export internal runtime or driver API. Check and implement the functionality corresponding to the function of the first parameter `const void **table` populated by the API.")
 
+ENTRY(cuDevicePrimaryCtxSetFlags_v2,   "SYCL currently does not support setting device context flags.")
+ENTRY(cuDevicePrimaryCtxGetState,      "SYCL currently does not support querying device context flags.")
+
 ENTRY(cudaGraphicsResourceSetMapFlags, "this functionality is deprecated in DX12 and hence is not supported in SYCL.")
+// clang-format on