[SYCLomatic][NFC] Further refine DPCT file structure.

clang/lib/DPCT/ASTTraversal.cpp

@@ -10,16 +10,16 @@
 #include "AnalysisInfo.h"
 #include "RulesAsm/AsmMigration.h"
 #include "RulesLang/BarrierFenceSpaceAnalyzer.h"
-#include "CallExprRewriter.h"
-#include "CallExprRewriterCommon.h"
+#include "RuleInfra/CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriterCommon.h"
 #include "RulesDNN/DNNAPIMigration.h"
-#include "ExprAnalysis.h"
+#include "RuleInfra/ExprAnalysis.h"
 #include "RulesMathLib/FFTAPIMigration.h"
 #include "CodePin/GenCodePinHeader.h"
 #include "RulesLang/GroupFunctionAnalyzer.h"
 #include "RulesSecurity/Homoglyph.h"
 #include "RulesLangLib/LIBCUAPIMigration.h"
-#include "MemberExprRewriter.h"
+#include "RuleInfra/MemberExprRewriter.h"
 #include "MigrationRuleManager.h"
 #include "RulesSecurity/MisleadingBidirectional.h"
 #include "RulesCCL/NCCLAPIMigration.h"

clang/lib/DPCT/ASTTraversal.h

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

clang/lib/DPCT/AnalysisInfo.cpp

@@ -8,8 +8,8 @@
 
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "ExprAnalysis.h"
-#include "MapNames.h"
+#include "RuleInfra/ExprAnalysis.h"
+#include "RuleInfra/MapNames.h"
 #include "Statics.h"
 #include "TextModification.h"
 #include "Utility.h"

clang/lib/DPCT/AnalysisInfo.h

@@ -10,7 +10,7 @@
 #define DPCT_ANALYSIS_INFO_H
 
 #include "ErrorHandle/Error.h"
-#include "ExprAnalysis.h"
+#include "RuleInfra/ExprAnalysis.h"
 #include "ExtReplacements.h"
 #include "RulesInclude/InclusionHeaders.h"
 #include "LibraryAPIMigration.h"
@@ -19,7 +19,7 @@
 #include "Statics.h"
 #include "TextModification.h"
 #include "Utility.h"
-#include "ValidateArguments.h"
+#include "CommandOption/ValidateArguments.h"
 #include <bitset>
 #include <memory>
 #include <optional>

clang/lib/DPCT/CMakeLists.txt

@@ -95,7 +95,7 @@ add_custom_target(gen_mapping_register
   COMMAND "${CMAKE_COMMAND}"
     -DTARGET="${API_MAPPING_REGISTER_FOLDER}APIMappingRegister.def"
     -DSRC_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/../../examples/DPCT/"
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/APIMapping/GenerateRegister.cmake
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/QueryAPIMapping/GenerateRegister.cmake
   DEPENDS ${SRC_FILES})
 include_directories(
   ${API_MAPPING_REGISTER_FOLDER}
@@ -146,7 +146,7 @@ add_clang_library(DPCT
   RulesLang/Math/RewriterCXXAPIRoutines.cpp
   RulesLang/Math/RewriterOverload.cpp
   RulesLang/RewriterSYCLcompat.cpp
-  CallExprRewriter.cpp
+  RuleInfra/CallExprRewriter.cpp
   RulesLang/CallExprRewriterAtomic.cpp
   RulesMathLib/CallExprRewriterCUFFT.cpp
   RulesMathLib/CallExprRewriterCUBLAS.cpp
@@ -174,21 +174,21 @@ add_clang_library(DPCT
   Diagnostics/Diagnostics.cpp
   ErrorHandle/Error.cpp
   Statics.cpp
-  ExprAnalysis.cpp
+  RuleInfra/ExprAnalysis.cpp
   ExtReplacements.cpp
-  MapNames.cpp
+  RuleInfra/MapNames.cpp
   FileGenerator/GenFiles.cpp
   DPCT.cpp
-  DpctOptions.cpp
+  CommandOption/DpctOptions.cpp
   TextModification.cpp
   Utility.cpp
-  ValidateArguments.cpp
-  ExternalReplacement.cpp
+  CommandOption/ValidateArguments.cpp
+  IncMigration/ExternalReplacement.cpp
   Windows/VcxprojParser.cpp
   LibraryAPIMigration.cpp
   MigrateScript/GenMakefile.cpp
   RulesInclude/InclusionHeaders.cpp
-  IncrementalMigrationUtility.cpp
+  IncMigration/IncrementalMigrationUtility.cpp
   UserDefinedRules/UserDefinedRules.cpp
   UserDefinedRules/PatternRewriter.cpp
   MigrateScript/MigrateBuildScript.cpp
@@ -201,18 +201,18 @@ add_clang_library(DPCT
   RulesMathLib/FFTAPIMigration.cpp
   RulesDNN/DNNAPIMigration.cpp
   RulesCCL/NCCLAPIMigration.cpp
-  TypeLocRewriters.cpp
+  RuleInfra/TypeLocRewriters.cpp
   Linux/AutoComplete.cpp
   RulesAsm/AsmMigration.cpp
-  APIMapping/QueryAPIMapping.cpp
+  QueryAPIMapping/QueryAPIMapping.cpp
   RulesAsm/Parser/AsmNodes.cpp
   RulesAsm/Parser/AsmLexer.cpp
   RulesAsm/Parser/AsmParser.cpp
   RulesAsm/Parser/AsmIdentifierTable.cpp
   RulesAsm/Parser/AsmTokenKinds.cpp
   RulesLangLib/LIBCUAPIMigration.cpp
   RulesLangLib/CUBAPIMigration.cpp
-  MemberExprRewriter.cpp
+  RuleInfra/MemberExprRewriter.cpp
   MigrationRuleManager.cpp
   MigrationAction.cpp
   RulesLangLib/ThrustAPIMigration.cpp

clang/lib/DPCT/CodePin/GenCodePinHeader.cpp

@@ -10,7 +10,7 @@
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 #include "Statics.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"

clang/lib/DPCT/ValidateArguments.cpp → clang/lib/DPCT/CommandOption/ValidateArguments.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ValidateArguments.h"
+#include "CommandOption/ValidateArguments.h"
 #include "ErrorHandle/Error.h"
 #include "Statics.h"
 #include "Utility.h"

clang/lib/DPCT/DPCT.cpp

@@ -7,19 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/DPCT/DPCT.h"
-#include "APIMapping/QueryAPIMapping.h"
+#include "QueryAPIMapping/QueryAPIMapping.h"
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "Linux/AutoComplete.h"
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 #include "Config.h"
 #include "ErrorHandle/CrashRecovery.h"
 #include "ErrorHandle/Error.h"
-#include "ExternalReplacement.h"
+#include "IncMigration/ExternalReplacement.h"
 #include "FileGenerator/GenHelperFunction.h"
 #include "MigrateScript/GenMakefile.h"
-#include "IncrementalMigrationUtility.h"
-#include "MemberExprRewriter.h"
+#include "IncMigration/IncrementalMigrationUtility.h"
+#include "RuleInfra/MemberExprRewriter.h"
 #include "MigrateScript/MigrateCmakeScript.h"
 #include "MigrateScript/MigratePythonBuildScript.h"
 #include "MigrationAction.h"
@@ -28,9 +28,9 @@
 #include "UserDefinedRules/UserDefinedRules.h"
 #include "FileGenerator/GenFiles.h"
 #include "Statics.h"
-#include "TypeLocRewriters.h"
+#include "RuleInfra/TypeLocRewriters.h"
 #include "Utility.h"
-#include "ValidateArguments.h"
+#include "CommandOption/ValidateArguments.h"
 #include "Windows/VcxprojParser.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"

clang/lib/DPCT/FileGenerator/GenFiles.cpp

@@ -10,7 +10,7 @@
 #include "AnalysisInfo.h"
 #include "ErrorHandle/CrashRecovery.h"
 #include "Diagnostics/Diagnostics.h"
-#include "ExternalReplacement.h"
+#include "IncMigration/ExternalReplacement.h"
 #include "MigrateScript/GenMakefile.h"
 #include "UserDefinedRules/PatternRewriter.h"
 #include "Statics.h"

clang/lib/DPCT/ExternalReplacement.cpp → clang/lib/DPCT/IncMigration/ExternalReplacement.cpp

@@ -19,7 +19,7 @@
 #include "llvm/Support/Path.h"
 
 #include "ExternalReplacement.h"
-#include "IncrementalMigrationUtility.h"
+#include "IncMigration/IncrementalMigrationUtility.h"
 #include "clang/Tooling/Core/Diagnostic.h"
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/ReplacementsYaml.h"

clang/lib/DPCT/LibraryAPIMigration.cpp

@@ -9,7 +9,7 @@
 #include "LibraryAPIMigration.h"
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 #include "Utility.h"
 
 #include "clang/AST/Attr.h"

clang/lib/DPCT/LibraryAPIMigration.h

@@ -9,8 +9,8 @@
 #ifndef DPCT_LIBRARY_API_MIGRATION_H
 #define DPCT_LIBRARY_API_MIGRATION_H
 
-#include "ExprAnalysis.h"
-#include "MapNames.h"
+#include "RuleInfra/ExprAnalysis.h"
+#include "RuleInfra/MapNames.h"
 
 #include "clang/AST/Attr.h"
 #include "clang/AST/Decl.h"

clang/lib/DPCT/MigrateScript/GenMakefile.cpp

@@ -10,7 +10,7 @@
 #include "Diagnostics/Diagnostics.h"
 #include "FileGenerator/GenFiles.h"
 #include "Utility.h"
-#include "ValidateArguments.h"
+#include "CommandOption/ValidateArguments.h"
 
 #include "ToolChains/Cuda.h"
 #include "clang/Driver/Driver.h"

clang/lib/DPCT/CallExprRewriter.cpp → clang/lib/DPCT/RuleInfra/CallExprRewriter.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CallExprRewriter.h"
-#include "CallExprRewriterCommon.h"
+#include "RuleInfra/CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriterCommon.h"
 #include <memory>
 
 namespace clang {

clang/lib/DPCT/CallExprRewriterCommon.h → clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h

@@ -12,10 +12,10 @@
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "RulesMathLib/BLASAPIMigration.h"
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 #include "Config.h"
-#include "ExprAnalysis.h"
-#include "MapNames.h"
+#include "RuleInfra/ExprAnalysis.h"
+#include "RuleInfra/MapNames.h"
 #include "Utility.h"
 #include "ToolChains/Cuda.h"
 #include "clang/AST/Attr.h"

clang/lib/DPCT/ExprAnalysis.cpp → clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExprAnalysis.h"
+#include "RuleInfra/ExprAnalysis.h"
 
 #include "ASTTraversal.h"
 #include "AnalysisInfo.h"
 #include "RulesLangLib/CUBAPIMigration.h"
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 #include "Config.h"
 #include "RulesDNN/DNNAPIMigration.h"
-#include "MemberExprRewriter.h"
-#include "TypeLocRewriters.h"
+#include "RuleInfra/MemberExprRewriter.h"
+#include "RuleInfra/TypeLocRewriters.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprConcepts.h"

clang/lib/DPCT/MapNames.cpp → clang/lib/DPCT/RuleInfra/MapNames.cpp

@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 #include "ASTTraversal.h"
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 #include "RulesDNN/DNNAPIMigration.h"
 #include "FileGenerator/GenFiles.h"
 #include <map>

clang/lib/DPCT/MapNames.h → clang/lib/DPCT/RuleInfra/MapNames.h

@@ -11,7 +11,7 @@
 
 #include "UserDefinedRules/UserDefinedRules.h"
 #include "Utility.h"
-#include "ValidateArguments.h"
+#include "CommandOption/ValidateArguments.h"
 #include <map>
 #include <set>
 

clang/lib/DPCT/MemberExprRewriter.cpp → clang/lib/DPCT/RuleInfra/MemberExprRewriter.cpp

@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MemberExprRewriter.h"
+#include "RuleInfra/MemberExprRewriter.h"
 #include "AnalysisInfo.h"
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 
 namespace clang {
 namespace dpct {

clang/lib/DPCT/MemberExprRewriter.h → clang/lib/DPCT/RuleInfra/MemberExprRewriter.h

@@ -9,7 +9,7 @@
 #ifndef DPCT_MEMBEREXPR_H
 #define DPCT_MEMBEREXPR_H
 
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 
 namespace clang {
 namespace dpct {

clang/lib/DPCT/TypeLocRewriters.cpp → clang/lib/DPCT/RuleInfra/TypeLocRewriters.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "TypeLocRewriters.h"
+#include "RuleInfra/TypeLocRewriters.h"
 #include "UserDefinedRules/UserDefinedRules.h"
 #include "clang/AST/TypeLoc.h"
 

clang/lib/DPCT/TypeLocRewriters.h → clang/lib/DPCT/RuleInfra/TypeLocRewriters.h

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CallExprRewriter.h"
+#include "RuleInfra/CallExprRewriter.h"
 #include <memory>
 
 namespace clang {

clang/lib/DPCT/RulesAsm/AsmMigration.cpp

@@ -13,7 +13,7 @@
 #include "RulesAsm/Parser/AsmTokenKinds.h"
 #include "ErrorHandle/CrashRecovery.h"
 #include "Diagnostics/Diagnostics.h"
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 #include "TextModification.h"
 #include "Utility.h"
 #include "clang/AST/Expr.h"

clang/lib/DPCT/RulesCCL/CallExprRewriterNccl.cpp

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

clang/lib/DPCT/RulesCCL/NCCLAPIMigration.cpp

@@ -9,7 +9,7 @@
 #include "NCCLAPIMigration.h"
 
 #include "ASTTraversal.h"
-#include "ExprAnalysis.h"
+#include "RuleInfra/ExprAnalysis.h"
 #include "MigrationRuleManager.h"
 
 using namespace clang::dpct;

clang/lib/DPCT/RulesDNN/CallExprRewriterCUDNN.cpp

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

clang/lib/DPCT/RulesDNN/DNNAPIMigration.cpp

@@ -11,7 +11,7 @@
 #include "AnalysisInfo.h"
 #include "Diagnostics/Diagnostics.h"
 #include "Statics.h"
-#include "MapNames.h"
+#include "RuleInfra/MapNames.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Preprocessor.h"

clang/lib/DPCT/RulesLang/CallExprRewriterAtomic.cpp

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