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

Author: zhimingwang36

clang/lib/DPCT/ASTTraversal.cpp

@@ -17,7 +17,7 @@
 #include "RulesMathLib/FFTAPIMigration.h"
 #include "GenCodePinHeader.h"
 #include "GroupFunctionAnalyzer.h"
-#include "Homoglyph.h"
+#include "RulesSecurity/Homoglyph.h"
 #include "RulesLangLib/LIBCUAPIMigration.h"
 #include "MemberExprRewriter.h"
 #include "MigrationRuleManager.h"

clang/lib/DPCT/ASTTraversal.h

@@ -13,7 +13,7 @@
 #include "CrashRecovery.h"
 #include "Diagnostics.h"
 #include "RulesMathLib/FFTAPIMigration.h"
-#include "InclusionHeaders.h"
+#include "RulesInclude/InclusionHeaders.h"
 #include "MapNames.h"
 #include "TextModification.h"
 #include "Utility.h"

clang/lib/DPCT/AnalysisInfo.cpp

@@ -53,7 +53,7 @@ static const std::string RegexPrefix = "{{NEEDREPLACE", RegexSuffix = "}}";
 void initHeaderSpellings() {
   HeaderSpellings = {
 #define HEADER(Name, Spelling) {HT_##Name, Spelling},
-#include "HeaderTypes.inc"
+#include "RulesInclude/HeaderTypes.inc"
   };
 }
 const std::string &getDefaultString(HelperFuncType HFT) {
@@ -1010,7 +1010,7 @@ void DpctFileInfo::insertHeader(HeaderType Type, ReplacementType IsForCodePin) {
 #define HEADER(Name, Spelling)                                                 \
   case HT_##Name:                                                              \
     return insertHeader(HT_##Name, LastIncludeOffset, IsForCodePin);
-#include "HeaderTypes.inc"
+#include "RulesInclude/HeaderTypes.inc"
   default:
     return;
   }

clang/lib/DPCT/AnalysisInfo.h

@@ -12,7 +12,7 @@
 #include "Error.h"
 #include "ExprAnalysis.h"
 #include "ExtReplacements.h"
-#include "InclusionHeaders.h"
+#include "RulesInclude/InclusionHeaders.h"
 #include "LibraryAPIMigration.h"
 #include "UserDefinedRules.h"
 #include "GenFiles.h"

clang/lib/DPCT/CMakeLists.txt

@@ -145,7 +145,7 @@ add_clang_library(DPCT
   RulesLang/Math/RewriterSIMDIntrinsics.cpp
   RulesLang/Math/RewriterCXXAPIRoutines.cpp
   RulesLang/Math/RewriterOverload.cpp
-  Rewriters/RewriterSYCLcompat.cpp
+  RulesLang/RewriterSYCLcompat.cpp
   CallExprRewriter.cpp
   RulesLang/CallExprRewriterAtomic.cpp
   RulesMathLib/CallExprRewriterCUFFT.cpp
@@ -186,15 +186,15 @@ add_clang_library(DPCT
   ExternalReplacement.cpp
   VcxprojParser.cpp
   LibraryAPIMigration.cpp
-  GenMakefile.cpp
-  InclusionHeaders.cpp
+  MigrateScript/GenMakefile.cpp
+  RulesInclude/InclusionHeaders.cpp
   IncrementalMigrationUtility.cpp
   UserDefinedRules.cpp
   PatternRewriter.cpp
-  MigrateBuildScript.cpp
-  MigrateCmakeScript.cpp
-  MigratePythonBuildScript.cpp
-  Homoglyph.cpp
+  MigrateScript/MigrateBuildScript.cpp
+  MigrateScript/MigrateCmakeScript.cpp
+  MigrateScript/MigratePythonBuildScript.cpp
+  RulesSecurity/Homoglyph.cpp
   RulesSecurity/MisleadingBidirectional.cpp
   BarrierFenceSpaceAnalyzer.cpp
   RulesMathLib/BLASAPIMigration.cpp

clang/lib/DPCT/DPCT.cpp

@@ -17,11 +17,11 @@
 #include "Error.h"
 #include "ExternalReplacement.h"
 #include "GenHelperFunction.h"
-#include "GenMakefile.h"
+#include "MigrateScript/GenMakefile.h"
 #include "IncrementalMigrationUtility.h"
 #include "MemberExprRewriter.h"
-#include "MigrateCmakeScript.h"
-#include "MigratePythonBuildScript.h"
+#include "MigrateScript/MigrateCmakeScript.h"
+#include "MigrateScript/MigratePythonBuildScript.h"
 #include "MigrationAction.h"
 #include "RulesSecurity/MisleadingBidirectional.h"
 #include "PatternRewriter.h"

clang/lib/DPCT/GenFiles.cpp

@@ -11,7 +11,7 @@
 #include "CrashRecovery.h"
 #include "Diagnostics.h"
 #include "ExternalReplacement.h"
-#include "GenMakefile.h"
+#include "MigrateScript/GenMakefile.h"
 #include "PatternRewriter.h"
 #include "Statics.h"
 #include "TextModification.h"

clang/lib/DPCT/GenMakefile.cpp renamed to clang/lib/DPCT/MigrateScript/GenMakefile.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include "MigrateBuildScript.h"
+#include "MigrateScript/MigrateBuildScript.h"
 #include "PatternRewriter.h"
 #include "Utility.h"