[SYCLomatic][NFC] refine the include betwwen Rules* folder. (#2478)

zhimingwang36 · web-flow · commit 0748273c202b · 2024-11-11T14:19:59.000+08:00
1. move Statics.h/cpp into MigrationReport folder.
2. clean the include relationship between Rules* folder.
diff --git a/clang/lib/DPCT/ASTTraversal.cpp b/clang/lib/DPCT/ASTTraversal.cpp
@@ -86,7 +86,7 @@ void MigrationRule::emplaceTransformation(TextModification *TM) {
   TransformSet->emplace_back(T);
 }
 
-
+// RuleLang
 REGISTER_RULE(IterationSpaceBuiltinRule, PassKind::PK_Analysis)
 REGISTER_RULE(ErrorHandlingIfStmtRule, PassKind::PK_Migration)
 REGISTER_RULE(ErrorHandlingHostAPIRule, PassKind::PK_Migration)
@@ -101,17 +101,7 @@ REGISTER_RULE(DeviceInfoVarRule, PassKind::PK_Migration)
 REGISTER_RULE(EnumConstantRule, PassKind::PK_Migration)
 REGISTER_RULE(ErrorConstantsRule, PassKind::PK_Migration)
 REGISTER_RULE(LinkageSpecDeclRule, PassKind::PK_Migration)
-REGISTER_RULE(FFTEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_FFT)
 REGISTER_RULE(CU_JITEnumsRule, PassKind::PK_Migration)
-REGISTER_RULE(BLASEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_BLas)
-REGISTER_RULE(RandomEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Rng)
-REGISTER_RULE(SPBLASEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Sparse)
-REGISTER_RULE(SPBLASFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Sparse)
-REGISTER_RULE(RandomFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Rng)
-REGISTER_RULE(DeviceRandomFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Rng)
-REGISTER_RULE(BLASFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_BLas)
-REGISTER_RULE(SOLVEREnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Solver)
-REGISTER_RULE(SOLVERFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Solver)
 REGISTER_RULE(FunctionCallRule, PassKind::PK_Migration)
 REGISTER_RULE(EventAPICallRule, PassKind::PK_Migration)
 REGISTER_RULE(ProfilingEnableOnDemandRule, PassKind::PK_Analysis)
@@ -142,19 +132,13 @@ REGISTER_RULE(CXXNewExprRule, PassKind::PK_Migration)
 REGISTER_RULE(NamespaceRule, PassKind::PK_Migration)
 REGISTER_RULE(RemoveBaseClassRule, PassKind::PK_Migration)
 REGISTER_RULE(AsmRule, PassKind::PK_Analysis)
-REGISTER_RULE(FFTFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_FFT)
 REGISTER_RULE(VirtualMemRule, PassKind::PK_Migration)
 REGISTER_RULE(DriverModuleAPIRule, PassKind::PK_Migration)
 REGISTER_RULE(DriverDeviceAPIRule, PassKind::PK_Migration)
 REGISTER_RULE(DriverContextAPIRule, PassKind::PK_Migration)
 REGISTER_RULE(CudaArchMacroRule, PassKind::PK_Migration)
 REGISTER_RULE(ConfusableIdentifierDetectionRule, PassKind::PK_Migration)
 REGISTER_RULE(MisleadingBidirectionalRule, PassKind::PK_Migration)
-REGISTER_RULE(CuDNNTypeRule, PassKind::PK_Migration, RuleGroupKind::RK_DNN)
-REGISTER_RULE(CuDNNAPIRule, PassKind::PK_Migration, RuleGroupKind::RK_DNN)
-REGISTER_RULE(LIBCURule, PassKind::PK_Migration, RuleGroupKind::RK_Libcu)
-REGISTER_RULE(ThrustAPIRule, PassKind::PK_Migration, RuleGroupKind::RK_Thrust)
-REGISTER_RULE(ThrustTypeRule, PassKind::PK_Migration, RuleGroupKind::RK_Thrust)
 REGISTER_RULE(WMMARule, PassKind::PK_Analysis)
 REGISTER_RULE(ForLoopUnrollRule, PassKind::PK_Migration)
 REGISTER_RULE(SpBLASTypeLocRule, PassKind::PK_Migration)
@@ -170,5 +154,32 @@ REGISTER_RULE(CompatWithClangRule, PassKind::PK_Migration)
 REGISTER_RULE(AssertRule, PassKind::PK_Migration)
 REGISTER_RULE(GraphRule, PassKind::PK_Migration)
 REGISTER_RULE(GraphicsInteropRule, PassKind::PK_Migration)
+
+//
+REGISTER_RULE(BLASEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_BLas)
+REGISTER_RULE(RandomEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Rng)
+REGISTER_RULE(SPBLASEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Sparse)
+REGISTER_RULE(SPBLASFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Sparse)
+REGISTER_RULE(RandomFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Rng)
+REGISTER_RULE(DeviceRandomFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Rng)
+REGISTER_RULE(BLASFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_BLas)
+REGISTER_RULE(SOLVEREnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_Solver)
+REGISTER_RULE(SOLVERFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_Solver)
+
+//
+REGISTER_RULE(LIBCURule, PassKind::PK_Migration, RuleGroupKind::RK_Libcu)
+//
+REGISTER_RULE(ThrustAPIRule, PassKind::PK_Migration, RuleGroupKind::RK_Thrust)
+REGISTER_RULE(ThrustTypeRule, PassKind::PK_Migration, RuleGroupKind::RK_Thrust)
+// Rules NCCL
 REGISTER_RULE(ManualMigrateEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_NCCL)
 REGISTER_RULE(NCCLRule, PassKind::PK_Migration, RuleGroupKind::RK_NCCL)
+
+
+// Rules FFT
+REGISTER_RULE(FFTEnumsRule, PassKind::PK_Migration, RuleGroupKind::RK_FFT)
+REGISTER_RULE(FFTFunctionCallRule, PassKind::PK_Migration,RuleGroupKind::RK_FFT)
+
+// Rules DNN
+REGISTER_RULE(CuDNNTypeRule, PassKind::PK_Migration, RuleGroupKind::RK_DNN)
+REGISTER_RULE(CuDNNAPIRule, PassKind::PK_Migration, RuleGroupKind::RK_DNN)
diff --git a/clang/lib/DPCT/AnalysisInfo.cpp b/clang/lib/DPCT/AnalysisInfo.cpp
@@ -10,7 +10,7 @@
 #include "Diagnostics/Diagnostics.h"
 #include "RuleInfra/ExprAnalysis.h"
 #include "RuleInfra/MapNames.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "TextModification.h"
 #include "Utility.h"
 
diff --git a/clang/lib/DPCT/AnalysisInfo.h b/clang/lib/DPCT/AnalysisInfo.h
@@ -15,7 +15,7 @@
 #include "RulesInclude/InclusionHeaders.h"
 #include "UserDefinedRules/UserDefinedRules.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "TextModification.h"
 #include "Utility.h"
 #include "CommandOption/ValidateArguments.h"
diff --git a/clang/lib/DPCT/CMakeLists.txt b/clang/lib/DPCT/CMakeLists.txt
@@ -175,7 +175,7 @@ add_clang_library(DPCT
   ErrorHandle/CrashRecovery.cpp
   Diagnostics/Diagnostics.cpp
   ErrorHandle/Error.cpp
-  Statics.cpp
+  MigrationReport/Statics.cpp
   RuleInfra/ExprAnalysis.cpp
   ExtReplacements.cpp
   RuleInfra/MapNames.cpp
diff --git a/clang/lib/DPCT/CodePin/GenCodePinHeader.cpp b/clang/lib/DPCT/CodePin/GenCodePinHeader.cpp
@@ -11,7 +11,7 @@
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
 #include "RuleInfra/MapNames.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/clang/lib/DPCT/CommandOption/ValidateArguments.cpp b/clang/lib/DPCT/CommandOption/ValidateArguments.cpp
@@ -8,7 +8,7 @@
 
 #include "CommandOption/ValidateArguments.h"
 #include "ErrorHandle/Error.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "Utility.h"
 
 #include "clang/DPCT/DpctOptions.h"
diff --git a/clang/lib/DPCT/DPCT.cpp b/clang/lib/DPCT/DPCT.cpp
@@ -27,7 +27,7 @@
 #include "UserDefinedRules/PatternRewriter.h"
 #include "UserDefinedRules/UserDefinedRules.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "RuleInfra/TypeLocRewriters.h"
 #include "Utility.h"
 #include "CommandOption/ValidateArguments.h"
diff --git a/clang/lib/DPCT/Diagnostics/Diagnostics.h b/clang/lib/DPCT/Diagnostics/Diagnostics.h
@@ -11,7 +11,7 @@
 
 #include "AnalysisInfo.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "TextModification.h"
 
 #include "clang/Basic/DiagnosticIDs.h"
diff --git a/clang/lib/DPCT/ErrorHandle/Error.cpp b/clang/lib/DPCT/ErrorHandle/Error.cpp
@@ -10,7 +10,7 @@
 
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 
 namespace clang {
 namespace dpct {
diff --git a/clang/lib/DPCT/ExtReplacements.cpp b/clang/lib/DPCT/ExtReplacements.cpp
@@ -9,7 +9,7 @@
 #include "ExtReplacements.h"
 
 #include "AnalysisInfo.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 
 #include <assert.h>
 #include <optional>
diff --git a/clang/lib/DPCT/FileGenerator/GenFiles.cpp b/clang/lib/DPCT/FileGenerator/GenFiles.cpp
@@ -13,7 +13,7 @@
 #include "IncMigration/ExternalReplacement.h"
 #include "MigrateScript/GenMakefile.h"
 #include "UserDefinedRules/PatternRewriter.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "TextModification.h"
 #include "Utility.h"
 
diff --git a/clang/lib/DPCT/MigrateScript/MigrateCmakeScript.cpp b/clang/lib/DPCT/MigrateScript/MigrateCmakeScript.cpp
@@ -10,7 +10,7 @@
 #include "ErrorHandle/Error.h"
 #include "UserDefinedRules/PatternRewriter.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "Utility.h"
 
 #include "llvm/Support/FileSystem.h"
diff --git a/clang/lib/DPCT/MigrateScript/MigratePythonBuildScript.cpp b/clang/lib/DPCT/MigrateScript/MigratePythonBuildScript.cpp
@@ -10,7 +10,7 @@
 #include "ErrorHandle/Error.h"
 #include "UserDefinedRules/PatternRewriter.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "Utility.h"
 
 #include "llvm/Support/FileSystem.h"
diff --git a/clang/lib/DPCT/MigrationReport/Statics.cpp b/clang/lib/DPCT/MigrationReport/Statics.cpp
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "ASTTraversal.h"
 #include "FileGenerator/GenFiles.h"
 
diff --git a/clang/lib/DPCT/MigrationReport/Statics.h b/clang/lib/DPCT/MigrationReport/Statics.h
diff --git a/clang/lib/DPCT/RuleInfra/ExprAnalysis.h b/clang/lib/DPCT/RuleInfra/ExprAnalysis.h
@@ -9,7 +9,7 @@
 #ifndef DPCT_EXPR_ANALYSIS_H
 #define DPCT_EXPR_ANALYSIS_H
 
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "TextModification.h"
 
 #include "clang/AST/DeclTemplate.h"
diff --git a/clang/lib/DPCT/RulesDNN/DNNAPIMigration.cpp b/clang/lib/DPCT/RulesDNN/DNNAPIMigration.cpp
@@ -10,7 +10,7 @@
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "RuleInfra/MapNames.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang/lib/DPCT/RulesLang/OptimizeMigration.cpp b/clang/lib/DPCT/RulesLang/OptimizeMigration.cpp
@@ -10,7 +10,7 @@
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "RuleInfra/MapNames.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
diff --git a/clang/lib/DPCT/RulesLang/RulesLang.cpp b/clang/lib/DPCT/RulesLang/RulesLang.cpp
@@ -67,46 +67,6 @@ using namespace clang::tooling;
 extern clang::tooling::UnifiedPath DpctInstallPath; // Installation directory for this tool
 extern DpctOption<opt, bool> ProcessAll;
 
-TextModification *clang::dpct::replaceText(SourceLocation Begin, SourceLocation End,
-                              std::string &&Str, const SourceManager &SM) {
-  auto Length = SM.getFileOffset(End) - SM.getFileOffset(Begin);
-  if (Length > 0) {
-    return new ReplaceText(Begin, Length, std::move(Str));
-  }
-  return nullptr;
-}
-
-SourceLocation getArgEndLocation(const CallExpr *C, unsigned Idx,
-                                 const SourceManager &SM) {
-  auto SL = getStmtExpansionSourceRange(C->getArg(Idx)).getEnd();
-  return SL.getLocWithOffset(Lexer::MeasureTokenLength(
-      SL, SM, DpctGlobalInfo::getContext().getLangOpts()));
-}
-
-/// Return a TextModication that removes nth argument of the CallExpr,
-/// together with the preceding comma.
-TextModification *clang::dpct::removeArg(const CallExpr *C, unsigned n,
-                            const SourceManager &SM) {
-  if (C->getNumArgs() <= n)
-    return nullptr;
-  if (C->getArg(n)->isDefaultArgument())
-    return nullptr;
-
-  SourceLocation Begin, End;
-  if (n) {
-    Begin = getArgEndLocation(C, n - 1, SM);
-    End = getArgEndLocation(C, n, SM);
-  } else {
-    Begin = getStmtExpansionSourceRange(C->getArg(n)).getBegin();
-    if (C->getNumArgs() > 1) {
-      End = getStmtExpansionSourceRange(C->getArg(n + 1)).getBegin();
-    } else {
-      End = getArgEndLocation(C, n, SM);
-    }
-  }
-  return replaceText(Begin, End, "", SM);
-}
-
 auto parentStmt = []() {
   return anyOf(
       hasParent(compoundStmt()), hasParent(forStmt()), hasParent(whileStmt()),
diff --git a/clang/lib/DPCT/RulesLangLib/CUBAPIMigration.cpp b/clang/lib/DPCT/RulesLangLib/CUBAPIMigration.cpp
@@ -8,7 +8,7 @@
 
 #include "RulesLangLib/CUBAPIMigration.h"
 #include "ASTTraversal.h"
-#include "RulesLang/RulesLang.h"
+#include "TextModification.h"
 #include "AnalysisInfo.h"
 #include "RuleInfra/CallExprRewriter.h"
 #include "RuleInfra/ExprAnalysis.h"
diff --git a/clang/lib/DPCT/RulesLangLib/LIBCUAPIMigration.cpp b/clang/lib/DPCT/RulesLangLib/LIBCUAPIMigration.cpp
@@ -12,7 +12,7 @@
 #include "RuleInfra/CallExprRewriter.h"
 #include "Diagnostics/Diagnostics.h"
 #include "RuleInfra/MapNames.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/clang/lib/DPCT/RulesLangLib/ThrustAPIMigration.cpp b/clang/lib/DPCT/RulesLangLib/ThrustAPIMigration.cpp
@@ -8,7 +8,6 @@
 
 #include "RulesLangLib/ThrustAPIMigration.h"
 #include "ASTTraversal.h"
-#include "RulesLang/RulesLang.h"
 #include "RuleInfra/ExprAnalysis.h"
 #include "TextModification.h"
 
diff --git a/clang/lib/DPCT/TextModification.cpp b/clang/lib/DPCT/TextModification.cpp
@@ -866,3 +866,42 @@ void ReplaceText::print(llvm::raw_ostream &OS, ASTContext &Context,
   printLocation(OS, BeginLoc, Context, PrintDetail);
   printInsertion(OS, T);
 }
+
+TextModification *clang::dpct::replaceText(SourceLocation Begin, SourceLocation End,
+                              std::string &&Str, const SourceManager &SM) {
+  auto Length = SM.getFileOffset(End) - SM.getFileOffset(Begin);
+  if (Length > 0) {
+    return new ReplaceText(Begin, Length, std::move(Str));
+  }
+  return nullptr;
+}
+SourceLocation clang::dpct::getArgEndLocation(const CallExpr *C, unsigned Idx,
+                                 const SourceManager &SM) {
+  auto SL = getStmtExpansionSourceRange(C->getArg(Idx)).getEnd();
+  return SL.getLocWithOffset(Lexer::MeasureTokenLength(
+      SL, SM, DpctGlobalInfo::getContext().getLangOpts()));
+}
+
+/// Return a TextModication that removes nth argument of the CallExpr,
+/// together with the preceding comma.
+TextModification *clang::dpct::removeArg(const CallExpr *C, unsigned n,
+                            const SourceManager &SM) {
+  if (C->getNumArgs() <= n)
+    return nullptr;
+  if (C->getArg(n)->isDefaultArgument())
+    return nullptr;
+
+  SourceLocation Begin, End;
+  if (n) {
+    Begin = getArgEndLocation(C, n - 1, SM);
+    End = getArgEndLocation(C, n, SM);
+  } else {
+    Begin = getStmtExpansionSourceRange(C->getArg(n)).getBegin();
+    if (C->getNumArgs() > 1) {
+      End = getStmtExpansionSourceRange(C->getArg(n + 1)).getBegin();
+    } else {
+      End = getArgEndLocation(C, n, SM);
+    }
+  }
+  return replaceText(Begin, End, "", SM);
+}
diff --git a/clang/lib/DPCT/TextModification.h b/clang/lib/DPCT/TextModification.h
@@ -626,6 +626,14 @@ class ReplaceText : public TextModification {
              const bool PrintDetail = true) const override;
 };
 
+SourceLocation getArgEndLocation(const CallExpr *C, unsigned Idx,
+                                 const SourceManager &SM);
+TextModification *replaceText(SourceLocation Begin, SourceLocation End,
+                              std::string &&Str, const SourceManager &SM);
+
+TextModification *removeArg(const CallExpr *C, unsigned n,
+                            const SourceManager &SM) ;
+
 } // namespace dpct
 } // namespace clang
 
diff --git a/clang/lib/DPCT/UserDefinedRules/UserDefinedRules.cpp b/clang/lib/DPCT/UserDefinedRules/UserDefinedRules.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include "UserDefinedRules/UserDefinedRules.h"
-//#include "ASTTraversal.h"
+#include "ASTTraversal.h"
 #include "RulesLang/RulesLang.h"
 #include "RuleInfra/CallExprRewriter.h"
 #include "ErrorHandle/Error.h"
@@ -19,6 +19,7 @@
 #include "llvm/Support/YAMLTraits.h"
 
 using namespace clang::ast_matchers;
+using namespace clang::dpct;
 
 std::vector<clang::tooling::UnifiedPath> MetaRuleObject::RuleFiles;
 std::vector<std::shared_ptr<MetaRuleObject>> MetaRules;
diff --git a/clang/lib/DPCT/Utility.cpp b/clang/lib/DPCT/Utility.cpp
@@ -15,7 +15,7 @@
 #include "RuleInfra/ExprAnalysis.h"
 #include "RuleInfra/MapNames.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTTypeTraits.h"
 #include "clang/AST/Expr.h"
diff --git a/clang/lib/DPCT/Windows/VcxprojParser.cpp b/clang/lib/DPCT/Windows/VcxprojParser.cpp
@@ -8,7 +8,7 @@
 #include "VcxprojParser.h"
 #include "ErrorHandle/Error.h"
 #include "FileGenerator/GenFiles.h"
-#include "Statics.h"
+#include "MigrationReport/Statics.h"
 #include "Utility.h"
 
 std::map<std::string, std::vector<std::string>> OptionsMap;
