[SYCLomatic] Fix the bug of migration that CUDART_VERSION would not be migrated (#840)

Signed-off-by: Ni, Wenhui <[email protected]>

Author: wenhuiNi

clang/lib/DPCT/ASTTraversal.cpp

@@ -156,13 +156,13 @@ void IncludesCallbacks::insertCudaArchRepl(
   return;
 }
 
-void IncludesCallbacks::ReplaceCuMacro(const Token &MacroNameTok) {
+bool IncludesCallbacks::ReplaceCuMacro(const Token &MacroNameTok) {
   bool IsInAnalysisScope = isInAnalysisScope(MacroNameTok.getLocation());
   if (!IsInAnalysisScope) {
-    return;
+    return false;
   }
   if (!MacroNameTok.getIdentifierInfo()) {
-    return;
+    return false;
   }
   std::string MacroName = MacroNameTok.getIdentifierInfo()->getName().str();
   auto Iter = MapNames::MacrosMap.find(MacroName);
@@ -175,14 +175,17 @@ void IncludesCallbacks::ReplaceCuMacro(const Token &MacroNameTok) {
         requestFeature(HelperFeatureEnum::Dpct_dpct_compatibility_temp,
                        MacroNameTok.getLocation());
         insertCudaArchRepl(Repl->getReplacement(DpctGlobalInfo::getContext()));
+        return true;
       }
-      return;
+      return false;
     }
     if (MacroName == "__CUDACC__" &&
         !MacroNameTok.getIdentifierInfo()->hasMacroDefinition())
-      return;
+      return false;
     TransformSet.emplace_back(Repl);
+    return true;
   }
+  return false;
 }
 
 void IncludesCallbacks::MacroDefined(const Token &MacroNameTok,
@@ -396,29 +399,9 @@ void IncludesCallbacks::MacroExpands(const Token &MacroNameTok,
   if (!IsInAnalysisScope) {
     return;
   }
-
-  if (MacroNameTok.getIdentifierInfo() &&
-      MacroNameTok.getIdentifierInfo()->getName() == "__CUDA_ARCH__") {
-    if (DpctGlobalInfo::getInstance().getContext().getLangOpts().CUDA) {
-      requestFeature(HelperFeatureEnum::Dpct_dpct_compatibility_temp,
-                     Range.getBegin());
-      auto Repl = std::make_shared<ReplaceText>(Range.getBegin(), 13,
-                                                "DPCT_COMPATIBILITY_TEMP");
-      insertCudaArchRepl(Repl->getReplacement(DpctGlobalInfo::getContext()));
-    }
-    return;
-  }
-  // CUFFT_FORWARD and CUFFT_INVERSE are migrated to integer literal in all
-  // places except in cufftExec call.
-  // CUFFT_FORWARD and CUFFT_INVERSE in cufftExec call are migrated with
-  // FFTDirExpr and longer replacement will overlap shorter replacement, so the
-  // migration is expected.
-  else if (MacroNameTok.getIdentifierInfo() &&
-             MacroNameTok.getIdentifierInfo()->getName() == "CUFFT_FORWARD") {
-    TransformSet.emplace_back(new ReplaceText(Range.getBegin(), 13, "-1"));
-  } else if (MacroNameTok.getIdentifierInfo() &&
-             MacroNameTok.getIdentifierInfo()->getName() == "CUFFT_INVERSE") {
-    TransformSet.emplace_back(new ReplaceText(Range.getBegin(), 13, "1"));
+  
+  if (ReplaceCuMacro(MacroNameTok)){
+    return ;
   }
 
   // For the un-specialized struct, there is no AST for the extern function

clang/lib/DPCT/ASTTraversal.h

@@ -60,7 +60,7 @@ class IncludesCallbacks : public PPCallbacks {
   void Ifndef(SourceLocation Loc, const Token &MacroNameTok,
               const MacroDefinition &MD) override;
   // TODO: implement one of this for each source language.
-  void ReplaceCuMacro(const Token &MacroNameTok);
+  bool ReplaceCuMacro(const Token &MacroNameTok);
   void ReplaceCuMacro(SourceRange ConditionRange, IfType IT,
                       SourceLocation IfLoc, SourceLocation ElifLoc);
   void Defined(const Token &MacroNameTok, const MacroDefinition &MD,

clang/lib/DPCT/MapNames.cpp

@@ -4187,6 +4187,8 @@ const MapNames::MapTy MapNames::MacrosMap{
     {"CUDART_VERSION", "SYCL_LANGUAGE_VERSION"},
     {"CUBLAS_V2_H_", "MKL_SYCL_HPP"},
     {"__CUDA__", "SYCL_LANGUAGE_VERSION"},
+    {"CUFFT_FORWARD", "-1"},
+    {"CUFFT_INVERSE", "1"},
     //...
 };
 

clang/test/dpct/predefined_macro_replacement.cu

@@ -154,3 +154,22 @@ int2 b;
   a.x = 1;
   return a.x;
 }
+
+int foo2(){
+  int version;
+  //CHECK: int ret = (version = dpct::get_current_device().get_major_version(), 0);
+  int ret = cudaRuntimeGetVersion(&version);
+  int major = version / 1000;
+  int minor = (version - major * 1000) / 10;
+  int pl = version - major * 1000 - minor * 10;
+  //CHECK: if (version != SYCL_LANGUAGE_VERSION) {
+  //CHECK-NEXT:   major = SYCL_LANGUAGE_VERSION / 1000;
+  //CHECK-NEXT:   minor = (SYCL_LANGUAGE_VERSION - major * 1000) / 10;
+  //CHECK-NEXT:   pl = SYCL_LANGUAGE_VERSION - major * 1000 - minor * 10;
+  //CHECK-NEXT: }
+  if (version != CUDART_VERSION) {
+    major = CUDART_VERSION / 1000;
+    minor = (CUDART_VERSION - major * 1000) / 10;
+    pl = CUDART_VERSION - major * 1000 - minor * 10;
+  }
+}