[Draft]Refine Codepin

clang/lib/DPCT/CodePin/GenCodePinHeader.cpp

@@ -263,7 +263,7 @@ void GenCodePinHeaderRule::collectMemberInfo(
                                    CodePinVarInfoType::Base, true, IsBaseMember,
                                    PrintPolicy);
     if (isTypeInAnalysisScope(BaseType.getTypePtrOrNull())) {
-      collectMemberInfo(BaseType, VI, MembersType, true, PrintPolicy);
+      collectInfoForCodePinDumpFunction(BaseType);
     }
   }
 

clang/lib/DPCT/FileGenerator/GenFiles.cpp

@@ -845,32 +845,39 @@ void genCodePinDumpFunc(dpct::RawFDOStream &RS, bool IsForCUDADebug) {
     RS << "template <> class data_ser<" << CodepinTypeName << "> {" << getNL()
        << "public:" << getNL()
        << "  static void dump(dpctexp::codepin::detail::json_stringstream "
-          "&ss, "
+          "&ss, dpctexp::codepin::bin_ofstream &ofst, "
        << CodepinTypeName << " &value," << getNL()
-       << "                   dpctexp::codepin::queue_t queue) {" << getNL();
-    RS << "    auto arr = ss.array();" << getNL();
+       << "dpctexp::codepin::queue_t queue) {" << getNL();
 
+    RS << "    auto obj = ss.object();" << getNL();
     if (int MemberNum = Info.Members.size()) {
       for (int i = 0; i < MemberNum; i++) {
-        RS << "    {" << getNL() << "      auto obj" << i << " = arr.object();"
-           << getNL() << "      obj" << i << ".key(\""
+        RS << "    {" 
+           << getNL() << "      obj.key(\""
            << Info.Members[i].MemberName << "\");" << getNL()
-           << "      auto value" << i << " = obj" << i
-           << ".value<dpctexp::codepin::detail::json_stringstream::json_obj>("
+           << "      auto value" << i << " = obj.value<dpctexp::codepin::detail::json_stringstream::json_obj>("
               ");"
            << getNL() << "      dpctexp::codepin::detail::data_ser<"
            << getCodePinPostfixName(Info.Members[i], IsForCUDADebug);
         for (auto &D : Info.Members[i].Dims) {
           RS << "[" << std::to_string(D) << "]";
         }
-        RS << ">::print_type_name(value" << i << ");" << getNL() << "      obj"
-           << i << ".key(\"Data\");" << getNL()
-           << "      dpctexp::codepin::detail::data_ser<"
+        RS << ">::print_type_name(value" << i << ");" << getNL() << "      obj.key(\"Offset\");" << getNL();
+        RS << "      obj.value(static_cast<size_t>(ofst.tellp()));" << getNL();
+        RS << "      obj.key(\"Size\");" << getNL();
+        RS << "      obj.value(get_size_of_type(value." << Info.Members[i].CodePinMemberName <<")); " << getNL();  
+        RS << " if(is_expand_to_dump<std::remove_pointer_t<"
+        << getCodePinPostfixName(Info.Members[i], IsForCUDADebug);
+        for (auto &D : Info.Members[i].Dims) {
+          RS << "[" << std::to_string(D) << "]";
+        }
+        RS << ">>())  obj.key(\"Data\");" << getNL();
+        RS << "      dpctexp::codepin::detail::data_ser<"
            << getCodePinPostfixName(Info.Members[i], IsForCUDADebug);
         for (auto &D : Info.Members[i].Dims) {
           RS << "[" << std::to_string(D) << "]";
         }
-        RS << ">::dump(ss, value." << Info.Members[i].CodePinMemberName
+        RS << ">::dump(ss, ofst, value." << Info.Members[i].CodePinMemberName
            << ", queue);" << getNL() << "    }" << getNL();
       }
     }
@@ -883,13 +890,13 @@ void genCodePinDumpFunc(dpct::RawFDOStream &RS, bool IsForCUDADebug) {
       RS << "template <> class data_ser<" << Name << "> {" << getNL()
          << "public:" << getNL()
          << "  static void dump(dpctexp::codepin::detail::json_stringstream "
-            "&ss, "
+            "&ss, std::ofstream &ofst, "
          << Name << " &value," << getNL()
          << "                   dpctexp::codepin::queue_t queue) {" << getNL();
       RS << "    " + CodepinTypeName << "& temp = reinterpret_cast<"
          << CodepinTypeName << "&>(value);" << getNL();
       RS << "    dpctexp::codepin::detail::data_ser<" << CodepinTypeName
-         << ">::dump(ss, temp, queue);" << getNL() << "  }" << getNL()
+         << ">::dump(ss, ofst, temp, queue);" << getNL() << "  }" << getNL()
          << "  static void print_type_name(json_stringstream::json_obj &obj) {"
          << getNL() << "    obj.key(\"Type\");" << getNL() << "    obj.value(\""
          << Name << "\");" << getNL() << "  }" << getNL() << "};" << getNL()
@@ -1179,6 +1186,38 @@ int saveNewFiles(clang::tooling::RefactoringTool &Tool,
   saveUpdatedMigrationDataIntoYAML(MainSrcFilesRepls, MainSrcFilesInfo,
                                    YamlFile, SrcFile, MainSrcFileMap);
   if (dpct::DpctGlobalInfo::isCodePinEnabled()) {
+    auto formatAllLineRanges =
+        [&](const clang::tooling::UnifiedPath &FileName) {
+          clang::FileSystemOptions FSO;
+          FSO.WorkingDir = ".";
+          clang::FileManager FM(FSO, nullptr);
+          clang::SourceManager SM(Diagnostics, FM, false);
+          clang::Rewriter Rewrite(SM, clang::LangOptions());
+          ErrorOr<std::unique_ptr<MemoryBuffer>> ErrorOrMemoryBuffer =
+              MemoryBuffer::getFileAsStream(FileName.getCanonicalPath());
+          if (std::error_code EC = ErrorOrMemoryBuffer.getError()) {
+            return false;
+          }
+          std::unique_ptr<llvm::MemoryBuffer> FileBuffer =
+              std::move(ErrorOrMemoryBuffer.get());
+          if (FileBuffer->getBufferSize() == 0)
+            return false;
+          std::vector<clang::tooling::Range> AllLineRanges;
+          clang::format::FormatStyle Style =
+              DpctGlobalInfo::getCodeFormatStyle();
+
+          AllLineRanges.push_back(
+              clang::tooling::Range(0, FileBuffer.get()->getBufferSize()));
+          auto FormatRange = DpctGlobalInfo::getFormatRange();
+          DpctGlobalInfo::setFormatRange(clang::format::FormatRange::all);
+          clang::tooling::Replacements FormatChanges =
+              reformat(Style, FileBuffer->getBuffer(), AllLineRanges,
+                       FileName.getCanonicalPath());
+          clang::tooling::applyAllReplacements(FormatChanges, Rewrite);
+          Rewrite.overwriteChangedFiles();
+          DpctGlobalInfo::setFormatRange(FormatRange);
+          return true;
+        };
     copyFileToOutRoot(InRoot, CUDAMigratedOutRoot, "MAKEFILE");
     copyFileToOutRoot(InRoot, CUDAMigratedOutRoot, "CMAKELISTS.TXT");
     copyFileToOutRoot(InRoot, CUDAMigratedOutRoot, ".CMAKE");
@@ -1197,6 +1236,11 @@ int saveNewFiles(clang::tooling::RefactoringTool &Tool,
     genCodePinHeader(SchemaStreamSYCL, false);
 
     processallOptionAction(InRoot, CUDAMigratedOutRoot, false);
+
+    SchemaStreamCUDA.flush();
+    SchemaStreamSYCL.flush();
+    formatAllLineRanges(SchemaPathCUDA);
+    formatAllLineRanges(SchemaPathSYCL);
   }
   processallOptionAction(InRoot, OutRoot, true);
 

clang/lib/DPCT/RulesLang/RulesLang.cpp

@@ -5430,11 +5430,11 @@ bool MemoryMigrationRule::canUseTemplateStyleMigration(
 }
 
 void MemoryMigrationRule::instrumentAddressToSizeRecordForCodePin(
-    const CallExpr *C, int PtrArgLoc, int AllocMemSizeLoc) {
-  auto &SM = dpct::DpctGlobalInfo::getSourceManager(); 
+    const CallExpr *C, std::string ReplaceText, int AllocMemSizeLoc) {
+  auto &SM = dpct::DpctGlobalInfo::getSourceManager();
   if (DpctGlobalInfo::isCodePinEnabled()) {
     SourceLocation CallEnd = C->getEndLoc();
-    if(SM.isMacroArgExpansion(C->getEndLoc())){
+    if (SM.isMacroArgExpansion(C->getEndLoc())) {
       CallEnd = SM.getExpansionRange(C->getEndLoc()).getEnd();
     } else {
       CallEnd = getDefinitionRange(C->getBeginLoc(), C->getEndLoc()).getEnd();
@@ -5446,19 +5446,20 @@ void MemoryMigrationRule::instrumentAddressToSizeRecordForCodePin(
 
     emplaceTransformation(new InsertText(
         PtrSizeLoc,
-        std::string(getNL()) + "dpctexp::codepin::get_ptr_size_map()[" +
-            getDrefName(C->getArg(PtrArgLoc)) + "] = " +
+        std::string(getNL()) + "dpctexp::codepin::set_ptr_size_map(" +
+            ReplaceText + ", " +
             std::string(Lexer::getSourceText(
                 CharSourceRange::getTokenRange(
                     C->getArg(AllocMemSizeLoc)->getSourceRange()),
                 DpctGlobalInfo::getSourceManager(), LangOptions())) +
-            ";",
+            ");",
         0, RT_CUDAWithCodePin));
+
     emplaceTransformation(new InsertText(
         PtrSizeLoc,
-        std::string(getNL()) + "dpctexp::codepin::get_ptr_size_map()[" +
-            getDrefName(C->getArg(PtrArgLoc)) +
-            "] = " + ExprAnalysis::ref(C->getArg(AllocMemSizeLoc)) + ";",
+        std::string(getNL()) + "dpctexp::codepin::set_ptr_size_map(" +
+            ReplaceText + "," + ExprAnalysis::ref(C->getArg(AllocMemSizeLoc)) +
+            ");",
         0, RT_ForSYCLMigration));
     DpctGlobalInfo::getInstance().insertHeader(
         C->getBeginLoc(), HT_DPCT_CodePin_CUDA, RT_CUDAWithCodePin);
@@ -5654,7 +5655,7 @@ void MemoryMigrationRule::mallocMigration(
     // to the post process. At that time, the MainFile is invalid.
     DpctGlobalInfo::getInstance().insertHeader(C->getBeginLoc(),
                                                HeaderType::HT_SYCL);
-    instrumentAddressToSizeRecordForCodePin(C,0,1);
+    instrumentAddressToSizeRecordForCodePin(C, getDrefName(C->getArg(0)) ,1);
   } else if (Name == "cudaHostAlloc" || Name == "cudaMallocHost" ||
              Name == "cuMemHostAlloc" || Name == "cuMemAllocHost_v2" ||
              Name == "cuMemAllocPitch_v2" || Name == "cudaMallocPitch" ||
@@ -5822,6 +5823,7 @@ void MemoryMigrationRule::memcpyMigration(
   if (!CallExprRewriterFactoryBase::RewriterMap)
     return;
   auto Itr = CallExprRewriterFactoryBase::RewriterMap->find(Name);
+  instrumentAddressToSizeRecordForCodePin(C, ExprAnalysis::ref(C->getArg(0)), 2);
   if (Itr != CallExprRewriterFactoryBase::RewriterMap->end()) {
     ExprAnalysis EA(C);
     emplaceTransformation(EA.getReplacement());

clang/lib/DPCT/RulesLang/RulesLang.h

@@ -662,8 +662,9 @@ class MemoryMigrationRule : public NamedMigrationRule<MemoryMigrationRule> {
       emplaceTransformation(new InsertBeforeStmt(C->getArg(InsertArgIndex),
                                                  std::string(InsertedText)));
   }
-  void instrumentAddressToSizeRecordForCodePin(const CallExpr *C, int PtrArgLoc,
+  void instrumentAddressToSizeRecordForCodePin(const CallExpr *C, std::string ReplaceText,
                                                int AllocMemSizeLoc);
+
 };
 
 class MemoryDataTypeRule : public NamedMigrationRule<MemoryDataTypeRule> {