[SYCLomatic][NFC] Move migration rules in ASTTraversal.cpp into RulesLang/RulesLang.cpp/h. (#2477)

Author: zhimingwang36

clang/lib/DPCT/ASTTraversal.cpp

@@ -112,6 +112,7 @@ add_clang_library(DPCT
   ASTTraversal.cpp
   PreProcessor.cpp
   AnalysisInfo.cpp
+  RulesLang/RulesLang.cpp
   RulesLangLib/CUB/CallExprRewriterCUB.cpp
   RulesLangLib/CUB/RewriterClassMethods.cpp
   RulesLangLib/CUB/RewriterDeviceHistgram.cpp

clang/lib/DPCT/ASTTraversal.h

@@ -563,8 +563,8 @@ makeFuncNameFromDevAttrCreator(unsigned idx) {
     auto Arg = CE->getArg(idx)->IgnoreImplicitAsWritten();
     if (auto DRE = dyn_cast<DeclRefExpr>(Arg)) {
       auto ArgName = DRE->getNameInfo().getAsString();
-      auto Search = EnumConstantRule::EnumNamesMap.find(ArgName);
-      if (Search != EnumConstantRule::EnumNamesMap.end()) {
+      auto Search = MapNames::EnumNamesMap.find(ArgName);
+      if (Search != MapNames::EnumNamesMap.end()) {
         requestHelperFeatureForEnumNames(ArgName);
         return Search->second->NewName;
       }

clang/lib/DPCT/CMakeLists.txt

@@ -9,6 +9,7 @@
 #include "RuleInfra/ExprAnalysis.h"
 
 #include "ASTTraversal.h"
+#include "RulesLang/RulesLang.h"
 #include "AnalysisInfo.h"
 #include "RulesLangLib/CUBAPIMigration.h"
 #include "RuleInfra/CallExprRewriter.h"
@@ -577,10 +578,10 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
       }
 
     auto &ReplEnum =
-        MapNames::findReplacedName(EnumConstantRule::EnumNamesMap, RefString);
+        MapNames::findReplacedName(MapNames::EnumNamesMap, RefString);
     requestHelperFeatureForEnumNames(RefString);
-    auto ItEnum = EnumConstantRule::EnumNamesMap.find(RefString);
-    if (ItEnum != EnumConstantRule::EnumNamesMap.end()) {
+    auto ItEnum = MapNames::EnumNamesMap.find(RefString);
+    if (ItEnum != MapNames::EnumNamesMap.end()) {
       for (auto ItHeader = ItEnum->second->Includes.begin();
            ItHeader != ItEnum->second->Includes.end(); ItHeader++) {
         DpctGlobalInfo::getInstance().insertHeader(DRE->getBeginLoc(),

clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h

@@ -11,8 +11,10 @@
 #include "RuleInfra/CallExprRewriter.h"
 #include "RulesDNN/DNNAPIMigration.h"
 #include "FileGenerator/GenFiles.h"
+#include "RulesLang/RulesLang.h"
 #include <map>
 
+
 using namespace clang;
 using namespace clang::dpct;
 // Not use sycl:: namespace explicitly
@@ -42,7 +44,7 @@ MapNames::MapTy MapNames::DeviceRandomGeneratorTypeMap;
 std::unordered_map<std::string, std::shared_ptr<TypeNameRule>>
     MapNames::CuDNNTypeNamesMap;
 std::unordered_map<std::string, std::shared_ptr<EnumNameRule>>
-    EnumConstantRule::EnumNamesMap;
+    MapNames::EnumNamesMap;
 MapNames::MapTy CuDNNTypeRule::CuDNNEnumNamesMap;
 std::map<std::string /*Original API*/, HelperFeatureEnum>
     CuDNNTypeRule::CuDNNEnumNamesHelperFeaturesMap;
@@ -1303,7 +1305,7 @@ void MapNames::setExplicitNamespaceMap(
       {"CUDNN_RNN_DATA_LAYOUT_SEQ_MAJOR_PACKED", HelperFeatureEnum::device_ext},
   };
   // Enum constants name mapping.
-  EnumConstantRule::EnumNamesMap = {
+  MapNames::EnumNamesMap = {
       // ...
       // enum Device Attribute
       // ...

clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -309,6 +309,9 @@ class MapNames {
   using SetTy = std::set<std::string>;
   using ThrustMapTy = std::map<std::string, ThrustFuncReplInfo>;
 
+  
+  static std::unordered_map<std::string, std::shared_ptr<EnumNameRule>>
+      EnumNamesMap;
   static const SetTy SupportedVectorTypes;
   static const SetTy VectorTypes2MArray;
   static const std::map<std::string, int> VectorTypeMigratedTypeSizeMap;

clang/lib/DPCT/RuleInfra/MapNames.cpp

@@ -8,6 +8,7 @@
 
 #include "RuleInfra/CallExprRewriter.h"
 #include "RuleInfra/CallExprRewriterCommon.h"
+#include "RulesLang/RulesLang.h"
 
 namespace clang {
 namespace dpct {

clang/lib/DPCT/RuleInfra/MapNames.h

@@ -26,12 +26,12 @@ void CallExprRewriterFactoryBase::initRewriterMapWmma() {
   // nvcuda::wmma::mem_row_major, this mapping must be protected by option
   // "--use-experimental-features=matrix".
   if (DpctGlobalInfo::useExtJointMatrix() && !DpctGlobalInfo::useSYCLCompat()) {
-    EnumConstantRule::EnumNamesMap.insert(
+    MapNames::EnumNamesMap.insert(
         {"nvcuda::wmma::mem_row_major",
          std::make_shared<EnumNameRule>(
              MapNames::getClNamespace() +
              "ext::oneapi::experimental::matrix::layout::row_major")});
-    EnumConstantRule::EnumNamesMap.insert(
+    MapNames::EnumNamesMap.insert(
         {"nvcuda::wmma::mem_col_major",
          std::make_shared<EnumNameRule>(
              MapNames::getClNamespace() +