resolve review feedback

Author: mingmingl-llvm

llvm/include/llvm/Bitcode/BitcodeWriter.h

@@ -103,7 +103,7 @@ class raw_ostream;
     void writeIndex(
         const ModuleSummaryIndex *Index,
         const std::map<std::string, GVSummaryMapTy> *ModuleToSummariesForIndex,
-        const ModuleToGVSummaryPtrSet *ModuleToDecSummaries);
+        const GVSummaryPtrSet *DecSummaries);
   };
 
   /// Write the specified module to the specified raw output stream.
@@ -148,14 +148,12 @@ class raw_ostream;
   /// where it will be written in a new bitcode block. This is used when
   /// writing the combined index file for ThinLTO. When writing a subset of the
   /// index for a distributed backend, provide the \p ModuleToSummariesForIndex
-  /// map. For each module, \p ModuleToDecSummaries specifies the set of
-  /// summaries for which the corresponding value should be imported as a
-  /// declaration (prototype).
-  void writeIndexToFile(
-      const ModuleSummaryIndex &Index, raw_ostream &Out,
-      const std::map<std::string, GVSummaryMapTy> *ModuleToSummariesForIndex =
-          nullptr,
-      const ModuleToGVSummaryPtrSet *ModuleToDecSummaries = nullptr);
+  /// map. \p DecSummaries specifies the set of summaries for which the
+  /// corresponding value should be imported as a declaration (prototype).
+  void writeIndexToFile(const ModuleSummaryIndex &Index, raw_ostream &Out,
+                        const std::map<std::string, GVSummaryMapTy>
+                            *ModuleToSummariesForIndex = nullptr,
+                        const GVSummaryPtrSet *DecSummaries = nullptr);
 
   /// If EmbedBitcode is set, save a copy of the llvm IR as data in the
   ///  __LLVM,__bitcode section (.llvmbc on non-MacOS).

llvm/include/llvm/IR/ModuleSummaryIndex.h

@@ -1275,9 +1275,6 @@ using GVSummaryMapTy = DenseMap<GlobalValue::GUID, GlobalValueSummary *>;
 /// A set of global value summary pointers.
 using GVSummaryPtrSet = SmallPtrSet<GlobalValueSummary *, 4>;
 
-/// The key is module path, and value is a set of global value summary pointers.
-using ModuleToGVSummaryPtrSet = std::map<std::string, GVSummaryPtrSet>;
-
 /// Map of a type GUID to type id string and summary (multimap used
 /// in case of GUID conflicts).
 using TypeIdSummaryMapTy =

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -428,9 +428,10 @@ class IndexBitcodeWriter : public BitcodeWriterBase {
   /// The combined index to write to bitcode.
   const ModuleSummaryIndex &Index;
 
-  /// For each module, provides the set of global value summaries for which the
-  /// value (function, function alias, etc) should be imported as a declaration.
-  const ModuleToGVSummaryPtrSet *ModuleToDecSummaries = nullptr;
+  /// When writing combined summaries, provides the set of global value
+  /// summaries for which the value (function, function alias, etc) should be
+  /// imported as a declaration.
+  const GVSummaryPtrSet *DecSummaries = nullptr;
 
   /// When writing a subset of the index for distributed backends, client
   /// provides a map of modules to the corresponding GUIDs/summaries to write.
@@ -459,14 +460,13 @@ class IndexBitcodeWriter : public BitcodeWriterBase {
   /// If provided, \p ModuleToDecSummaries specifies the set of summaries for
   /// which the corresponding functions or aliased functions should be imported
   /// as a declaration (but not definition) for each module.
-  IndexBitcodeWriter(
-      BitstreamWriter &Stream, StringTableBuilder &StrtabBuilder,
-      const ModuleSummaryIndex &Index,
-      const ModuleToGVSummaryPtrSet *ModuleToDecSummaries = nullptr,
-      const std::map<std::string, GVSummaryMapTy> *ModuleToSummariesForIndex =
-          nullptr)
+  IndexBitcodeWriter(BitstreamWriter &Stream, StringTableBuilder &StrtabBuilder,
+                     const ModuleSummaryIndex &Index,
+                     const GVSummaryPtrSet *DecSummaries = nullptr,
+                     const std::map<std::string, GVSummaryMapTy>
+                         *ModuleToSummariesForIndex = nullptr)
       : BitcodeWriterBase(Stream, StrtabBuilder), Index(Index),
-        ModuleToDecSummaries(ModuleToDecSummaries),
+        DecSummaries(DecSummaries),
         ModuleToSummariesForIndex(ModuleToSummariesForIndex) {
     // Assign unique value ids to all summaries to be written, for use
     // in writing out the call graph edges. Save the mapping from GUID
@@ -4556,14 +4556,9 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
   unsigned AllocAbbrev = Stream.EmitAbbrev(std::move(Abbv));
 
   auto shouldImportValueAsDecl = [&](GlobalValueSummary *GVS) -> bool {
-    if (ModuleToDecSummaries == nullptr)
+    if (DecSummaries == nullptr)
       return false;
-    auto Iter = ModuleToDecSummaries->find(GVS->modulePath().str());
-    if (Iter == ModuleToDecSummaries->end())
-      return false;
-    // For the current module, the value for GVS should be imported as a
-    // declaration.
-    return Iter->second.contains(GVS);
+    return DecSummaries->contains(GVS);
   };
 
   // The aliases are emitted as a post-pass, and will point to the value
@@ -5062,9 +5057,8 @@ void BitcodeWriter::writeModule(const Module &M,
 void BitcodeWriter::writeIndex(
     const ModuleSummaryIndex *Index,
     const std::map<std::string, GVSummaryMapTy> *ModuleToSummariesForIndex,
-    const ModuleToGVSummaryPtrSet *ModuleToDecSummaries) {
-  IndexBitcodeWriter IndexWriter(*Stream, StrtabBuilder, *Index,
-                                 ModuleToDecSummaries,
+    const GVSummaryPtrSet *DecSummaries) {
+  IndexBitcodeWriter IndexWriter(*Stream, StrtabBuilder, *Index, DecSummaries,
                                  ModuleToSummariesForIndex);
   IndexWriter.write();
 }
@@ -5118,12 +5112,12 @@ void IndexBitcodeWriter::write() {
 void llvm::writeIndexToFile(
     const ModuleSummaryIndex &Index, raw_ostream &Out,
     const std::map<std::string, GVSummaryMapTy> *ModuleToSummariesForIndex,
-    const ModuleToGVSummaryPtrSet *ModuleToDecSummaries) {
+    const GVSummaryPtrSet *DecSummaries) {
   SmallVector<char, 0> Buffer;
   Buffer.reserve(256 * 1024);
 
   BitcodeWriter Writer(Buffer);
-  Writer.writeIndex(&Index, ModuleToSummariesForIndex, ModuleToDecSummaries);
+  Writer.writeIndex(&Index, ModuleToSummariesForIndex, DecSummaries);
   Writer.writeStrtab();
 
   Out.write((char *)&Buffer.front(), Buffer.size());