[SYCLomatic][NFC] Further refine file structure. (#2469)

Author: zhimingwang36

clang/lib/DPCT/APINames_template.inc

@@ -9,22 +9,22 @@
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "RulesAsm/AsmMigration.h"
-#include "BarrierFenceSpaceAnalyzer.h"
+#include "RulesLang/BarrierFenceSpaceAnalyzer.h"
 #include "CallExprRewriter.h"
 #include "CallExprRewriterCommon.h"
 #include "RulesDNN/DNNAPIMigration.h"
 #include "ExprAnalysis.h"
 #include "RulesMathLib/FFTAPIMigration.h"
 #include "CodePin/GenCodePinHeader.h"
-#include "GroupFunctionAnalyzer.h"
+#include "RulesLang/GroupFunctionAnalyzer.h"
 #include "RulesSecurity/Homoglyph.h"
 #include "RulesLangLib/LIBCUAPIMigration.h"
 #include "MemberExprRewriter.h"
 #include "MigrationRuleManager.h"
 #include "RulesSecurity/MisleadingBidirectional.h"
 #include "RulesCCL/NCCLAPIMigration.h"
-#include "OptimizeMigration.h"
-#include "GenFiles.h"
+#include "RulesLang/OptimizeMigration.h"
+#include "FileGenerator/GenFiles.h"
 #include "RulesMathLib/SpBLASAPIMigration.h"
 #include "TextModification.h"
 #include "RulesLangLib/ThrustAPIMigration.h"
@@ -11615,7 +11615,7 @@ void MathFunctionsRule::registerMatcher(MatchFinder &MF) {
 #define ENTRY_TYPECAST(APINAME) APINAME,
 #define ENTRY_UNSUPPORTED(APINAME) APINAME,
 #define ENTRY_REWRITE(APINAME) APINAME,
-#include "APINamesMath.inc"
+#include "RulesLang/APINamesMath.inc"
 #undef ENTRY_RENAMED
 #undef ENTRY_RENAMED_NO_REWRITE
 #undef ENTRY_RENAMED_SINGLE
@@ -11637,7 +11637,7 @@ void MathFunctionsRule::registerMatcher(MatchFinder &MF) {
 #define ENTRY_TYPECAST(APINAME)
 #define ENTRY_UNSUPPORTED(APINAME)
 #define ENTRY_REWRITE(APINAME) APINAME,
-#include "APINamesMath.inc"
+#include "RulesLang/APINamesMath.inc"
 #undef ENTRY_RENAMED
 #undef ENTRY_RENAMED_NO_REWRITE
 #undef ENTRY_RENAMED_SINGLE

clang/lib/DPCT/ASTTraversal.cpp

@@ -11,7 +11,7 @@
 
 #include "AnalysisInfo.h"
 #include "ErrorHandle/CrashRecovery.h"
-#include "Diagnostics.h"
+#include "Diagnostics/Diagnostics.h"
 #include "RulesMathLib/FFTAPIMigration.h"
 #include "RulesInclude/InclusionHeaders.h"
 #include "MapNames.h"

clang/lib/DPCT/ASTTraversal.h

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AnalysisInfo.h"
-#include "Diagnostics.h"
+#include "Diagnostics/Diagnostics.h"
 #include "ExprAnalysis.h"
 #include "MapNames.h"
 #include "Statics.h"

clang/lib/DPCT/AnalysisInfo.cpp

@@ -14,8 +14,8 @@
 #include "ExtReplacements.h"
 #include "RulesInclude/InclusionHeaders.h"
 #include "LibraryAPIMigration.h"
-#include "UserDefinedRules.h"
-#include "GenFiles.h"
+#include "UserDefinedRules/UserDefinedRules.h"
+#include "FileGenerator/GenFiles.h"
 #include "Statics.h"
 #include "TextModification.h"
 #include "Utility.h"

clang/lib/DPCT/AnalysisInfo.h

@@ -171,38 +171,38 @@ add_clang_library(DPCT
   RulesLang/CallExprRewriterCG.cpp
   RulesLang/CallExprRewriterWmma.cpp
   ErrorHandle/CrashRecovery.cpp
-  Diagnostics.cpp
+  Diagnostics/Diagnostics.cpp
   ErrorHandle/Error.cpp
   Statics.cpp
   ExprAnalysis.cpp
   ExtReplacements.cpp
   MapNames.cpp
-  GenFiles.cpp
+  FileGenerator/GenFiles.cpp
   DPCT.cpp
   DpctOptions.cpp
   TextModification.cpp
   Utility.cpp
   ValidateArguments.cpp
   ExternalReplacement.cpp
-  VcxprojParser.cpp
+  Windows/VcxprojParser.cpp
   LibraryAPIMigration.cpp
   MigrateScript/GenMakefile.cpp
   RulesInclude/InclusionHeaders.cpp
   IncrementalMigrationUtility.cpp
-  UserDefinedRules.cpp
-  PatternRewriter.cpp
+  UserDefinedRules/UserDefinedRules.cpp
+  UserDefinedRules/PatternRewriter.cpp
   MigrateScript/MigrateBuildScript.cpp
   MigrateScript/MigrateCmakeScript.cpp
   MigrateScript/MigratePythonBuildScript.cpp
   RulesSecurity/Homoglyph.cpp
   RulesSecurity/MisleadingBidirectional.cpp
-  BarrierFenceSpaceAnalyzer.cpp
+  RulesLang/BarrierFenceSpaceAnalyzer.cpp
   RulesMathLib/BLASAPIMigration.cpp
   RulesMathLib/FFTAPIMigration.cpp
   RulesDNN/DNNAPIMigration.cpp
   RulesCCL/NCCLAPIMigration.cpp
   TypeLocRewriters.cpp
-  AutoComplete/AutoComplete.cpp
+  Linux/AutoComplete.cpp
   RulesAsm/AsmMigration.cpp
   APIMapping/QueryAPIMapping.cpp
   RulesAsm/Parser/AsmNodes.cpp
@@ -216,10 +216,10 @@ add_clang_library(DPCT
   MigrationRuleManager.cpp
   MigrationAction.cpp
   RulesLangLib/ThrustAPIMigration.cpp
-  GenHelperFunction.cpp
+  FileGenerator/GenHelperFunction.cpp
   RulesLang/WMMAAPIMigration.cpp
-  OptimizeMigration.cpp
-  GroupFunctionAnalyzer.cpp
+  RulesLang/OptimizeMigration.cpp
+  RulesLang/GroupFunctionAnalyzer.cpp
   RulesMathLib/SpBLASAPIMigration.cpp
   CodePin/GenCodePinHeader.cpp
 

clang/lib/DPCT/CMakeLists.txt

@@ -9,7 +9,7 @@
 #ifndef CALL_EXPR_REWRITER_H
 #define CALL_EXPR_REWRITER_H
 
-#include "Diagnostics.h"
+#include "Diagnostics/Diagnostics.h"
 
 
 namespace clang {

clang/lib/DPCT/CallExprRewriter.h

@@ -9,7 +9,7 @@
 #include "GenCodePinHeader.h"
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
-#include "Diagnostics.h"
+#include "Diagnostics/Diagnostics.h"
 #include "MapNames.h"
 #include "Statics.h"
 #include "clang/AST/Expr.h"

clang/lib/DPCT/CodePin/GenCodePinHeader.cpp

@@ -10,28 +10,28 @@
 #include "APIMapping/QueryAPIMapping.h"
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
-#include "AutoComplete/AutoComplete.h"
+#include "Linux/AutoComplete.h"
 #include "CallExprRewriter.h"
 #include "Config.h"
 #include "ErrorHandle/CrashRecovery.h"
 #include "ErrorHandle/Error.h"
 #include "ExternalReplacement.h"
-#include "GenHelperFunction.h"
+#include "FileGenerator/GenHelperFunction.h"
 #include "MigrateScript/GenMakefile.h"
 #include "IncrementalMigrationUtility.h"
 #include "MemberExprRewriter.h"
 #include "MigrateScript/MigrateCmakeScript.h"
 #include "MigrateScript/MigratePythonBuildScript.h"
 #include "MigrationAction.h"
 #include "RulesSecurity/MisleadingBidirectional.h"
-#include "PatternRewriter.h"
-#include "UserDefinedRules.h"
-#include "GenFiles.h"
+#include "UserDefinedRules/PatternRewriter.h"
+#include "UserDefinedRules/UserDefinedRules.h"
+#include "FileGenerator/GenFiles.h"
 #include "Statics.h"
 #include "TypeLocRewriters.h"
 #include "Utility.h"
 #include "ValidateArguments.h"
-#include "VcxprojParser.h"
+#include "Windows/VcxprojParser.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Format/Format.h"

clang/lib/DPCT/DPCT.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include "Diagnostics.h"
+#include "Diagnostics/Diagnostics.h"
 #include "clang/Basic/DiagnosticIDs.h"
 
 namespace clang {