up

Signed-off-by: Chen, Sheng S <[email protected]>

Author: ShengchenJ

clang/lib/DPCT/DPCT.cpp

@@ -1481,7 +1481,7 @@ int runDPCT(int argc, const char **argv) {
                           ReplSYCL);
   }
   if (!ReplSYCL.empty()) {
-      CollectDepsResult(ReplSYCL);
+      CollectDepLib(ReplSYCL);
     }
   // OC_Action: Analysis mode
   if (DpctGlobalInfo::isAnalysisModeEnabled()) {

clang/lib/DPCT/FileGenerator/GenFiles.cpp

@@ -998,7 +998,7 @@ int saveNewFiles(clang::tooling::RefactoringTool &Tool,
               clang::dpct::RT_CUDAWithCodePin))
         return RewriteStatus;
     }
-    ShowDepsResult(llvm::outs());
+    PrintRecommendLibs(llvm::outs());
     // Print the in-root path and the number of processed files
     size_t ProcessedFileNumber;
     if (ProcessAll) {
@@ -1034,7 +1034,7 @@ int saveNewFiles(clang::tooling::RefactoringTool &Tool,
     } else {
       ReportMsg += "\n";
     }
-   
+
     ReportMsg += "\n";
     ReportMsg += DiagRef;
 

clang/lib/DPCT/MigrationReport/RecommandLibraries.cpp

@@ -1,4 +1,4 @@
-//===--------------- Diagnostics.inc --------------------------------------===//
+//===--------------- RecommandLibrariesVersion.inc --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -8,12 +8,12 @@
 // - Name: Obj name
 //   Feature: Feature name
 //   SupportedVersion: Time stamp of component
-//   ComponentType: Component type.
+//   LibType: Component type.
 //   ReplacementText: The migrated Replacement Text
 //   Description: Details of the feature.
 
 #ifndef RECOMMENDLIBRARY
 #define RECOMMENDLIBRARY
 #endif
 // Example:
-// RECOMMENDLIBRARY(FreeQuery, "SYCL free function query", "Time", ComponentType::DPCPP, "this_work_item", "See https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/proposed/sycl_ext_oneapi_free_function_kernels.asciidoc for more details.")
+// RECOMMENDLIBRARY(FreeQuery, "SYCL free function query", "2025", LibType::DPCPP, "this_work_item", "See https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/proposed/sycl_ext_oneapi_free_function_kernels.asciidoc for more details.")

clang/lib/DPCT/MigrationReport/RecommandLibraries.h

@@ -0,0 +1,98 @@
+//===--------------- RecommendLibraries.cpp ------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "RecommandLibraries.h"
+#include "FileGenerator/GenFiles.h"
+#include "Statics.h"
+#include <string>
+#include <unordered_map>
+
+namespace clang {
+namespace dpct {
+struct RecommendLib {
+  std::string Feature;
+  std::string SupportedVersion;
+  std::string ReplacementText;
+  LibType CompType;
+  std::string Description;
+
+  RecommendLib() = default;
+  RecommendLib(std::unordered_map<LibType, RecommendLib> &Table,
+               std::string Feature, std::string SupportedVersion, LibType CT,
+               std::string ReplacementText, std::string Description)
+      : Feature(Feature), SupportedVersion(SupportedVersion),
+        ReplacementText(ReplacementText), CompType(CT),
+        Description(Description) {
+    Table[CT] = *this;
+  }
+};
+static std::unordered_map<clang::dpct::LibType, clang::dpct::RecommendLib>
+    RecommendLibs;
+std::vector<clang::dpct::RecommendLib> RecommendLibList;
+
+#define RECOMMENDLIBRARY(NAME, Feature, VERSION, COMPTYPE, REPLACEMENT, MSG)   \
+  RecommendLib DepRecommend_##NAME(RecommendLibs, Feature, VERSION, COMPTYPE,  \
+                                   REPLACEMENT, MSG);
+#include "RecommandLibrariesVersion.inc"
+
+void CollectDepLib(ReplTy &Repls) {
+  for (auto Entry : RecommendLibs) {
+    auto &Lib = Entry.second;
+    [&]() {
+      for (auto Repl : Repls) {
+        for (auto Item : Repl.second) {
+          if (Item.getReplacementText().str().find(Lib.ReplacementText) !=
+              std::string::npos) {
+            RecommendLibList.push_back(Lib);
+            return;
+          }
+        }
+      }
+    }();
+  }
+}
+
+std::string LibTypeToString(LibType version) {
+  switch (version) {
+  case LibType::DPCPP:
+    return "oneAPI DPC++ compiler Open Source Version";
+  case LibType::oneDPL:
+    return "oneAPI DPC++ Library Open Source Version";
+  case LibType::oneMath:
+    return "oneAPI Math Library Open Source Version";
+  case LibType::oneCCL:
+    return "oneAPI Collective Communications Library Open Source Version";
+  case LibType::oneDNNL:
+    return "oneAPI Deep Neural Network Library Open Source Version";
+  case LibType::ISHMEM:
+    return "oneAPI SHMEM Library Open Source Version";
+  default:
+    return "Unknown Component Type  ";
+  }
+}
+
+void PrintRecommendLibs(llvm::raw_ostream &OStream) {
+  if (RecommendLibList.empty())
+    return;
+  if (DpctGlobalInfo::isAnalysisModeEnabled())
+    OStream << llvm::raw_ostream::Colors::BLUE;
+
+  OStream << "Recommand Library Dependencies of SYCL Project:\n";
+
+  if (DpctGlobalInfo::isAnalysisModeEnabled())
+    OStream << llvm::raw_ostream::Colors::RESET;
+  for (auto &Status : RecommendLibList) {
+    OStream << "  - The " + Status.Feature + " is supported in " +
+                   LibTypeToString(Status.CompType) + " and after " +
+                   Status.SupportedVersion + ". " + Status.Description + "\n";
+  }
+}
+
+
+} // namespace dpct
+} // namespace clang

clang/lib/DPCT/MigrationReport/RecommandLibrariesVersion.inc

@@ -0,0 +1,25 @@
+//===--------------- RecommendLibraries.h --------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+#ifndef RECOMMEND_LIBRARIES_H
+#define RECOMMEND_LIBRARIES_H
+
+#include "AnalysisInfo.h"
+#include "FileGenerator/GenFiles.h"
+#include "llvm/Support/raw_ostream.h"
+#include <string>
+#include <unordered_map>
+
+namespace clang {
+namespace dpct {
+enum class LibType { DPCPP, oneDPL, oneMath, oneCCL, oneDNNL, ISHMEM };
+
+void CollectDepLib(ReplTy &MainSrcFilesRepls);
+void PrintRecommendLibs(llvm::raw_ostream &OStream);
+} // namespace dpct
+} // namespace clang
+#endif // RECOMMEND_LIBRARIES_H

clang/lib/DPCT/MigrationReport/RecommendLibraries.cpp

@@ -29,8 +29,6 @@ std::unordered_map<std::string, std::array<unsigned int, 3>> LOCStaticsMap;
 // unsigned int -> Times met
 std::map<std::string, unsigned int> SrcAPIStaticsMap;
 
-extern std::vector<clang::dpct::DependencyStatus> DepStatusVec;
-
 int VerboseLevel = VL_NonVerbose;
 
 void StaticsInfo::printMigrationRules(
@@ -367,7 +365,7 @@ class AnalysisModeStats {
     }
     LineStream(OS, Indent) << LastMsg;
 
-    ShowDepsResult(OS);
+    PrintRecommendLibs(OS);
   }
 
   static void recordApisOrTypes(SourceLocation SL, StringRef Name,