remove new flag and do match default

Author: lifengxiang1025

llvm/lib/Transforms/IPO/FunctionImport.cpp

@@ -163,6 +163,10 @@ static cl::opt<std::string> WorkloadDefinitions(
              "}"),
     cl::Hidden);
 
+namespace llvm {
+extern cl::opt<bool> EnableMemProfContextDisambiguation;
+}
+
 // Load lazily a module from \p FileName in \p Context.
 static std::unique_ptr<Module> loadFile(const std::string &FileName,
                                         LLVMContext &Context) {
@@ -1643,7 +1647,9 @@ Expected<bool> FunctionImporter::importFunctions(
       if (Import) {
         if (Error Err = F.materialize())
           return std::move(Err);
-        if (EnableImportMetadata) {
+        // MemProf should match function's definition and summary,
+        // 'thinlto_src_module' is needed.
+        if (EnableImportMetadata || EnableMemProfContextDisambiguation) {
           // Add 'thinlto_src_module' and 'thinlto_src_file' metadata for
           // statistics and debugging.
           F.setMetadata(

llvm/lib/Transforms/IPO/MemProfContextDisambiguation.cpp

@@ -121,11 +121,6 @@ static cl::opt<unsigned>
                         cl::desc("Max depth to recursively search for missing "
                                  "frames through tail calls."));
 
-static cl::opt<bool>
-    StrictSummaryMatch("memprof-strict-summary-match", cl::init(false),
-                       cl::Hidden,
-                       cl::desc("Match summary and definition strictly."));
-
 namespace llvm {
 // Indicate we are linking with an allocator that supports hot/cold operator
 // new interfaces.
@@ -3381,23 +3376,20 @@ bool MemProfContextDisambiguation::applyImport(Module &M) {
     auto *GVSummary =
         ImportSummary->findSummaryInModule(TheFnVI, M.getModuleIdentifier());
     if (!GVSummary) {
-      // Must have been imported, use the first summary (might be multiple if
-      // this was a linkonce_odr).
-      GVSummary = TheFnVI.getSummaryList().front().get();
-      if (StrictSummaryMatch) {
-        auto SrcModuleMD = F.getMetadata("thinlto_src_module");
-        assert(SrcModuleMD &&
-               "enable-import-metadata is needed to emit thinlto_src_module");
-        StringRef SrcModule =
-            dyn_cast<MDString>(SrcModuleMD->getOperand(0))->getString();
-        for (auto &GVS : TheFnVI.getSummaryList()) {
-          if (GVS->modulePath() == SrcModule) {
-            GVSummary = GVS.get();
-            break;
-          }
+      // Must have been imported, use the summary which matches the definition。
+      // (might be multiple if this was a linkonce_odr).
+      auto SrcModuleMD = F.getMetadata("thinlto_src_module");
+      assert(SrcModuleMD &&
+             "enable-import-metadata is needed to emit thinlto_src_module");
+      StringRef SrcModule =
+          dyn_cast<MDString>(SrcModuleMD->getOperand(0))->getString();
+      for (auto &GVS : TheFnVI.getSummaryList()) {
+        if (GVS->modulePath() == SrcModule) {
+          GVSummary = GVS.get();
+          break;
         }
-        assert(GVSummary->modulePath() == SrcModule);
       }
+      assert(GVSummary && GVSummary->modulePath() == SrcModule);
     }
 
     // If this was an imported alias skip it as we won't have the function

llvm/test/ThinLTO/X86/summary-matching.ll

@@ -16,7 +16,7 @@
 ; RUN: -r=%t/c.o,_Znwm \
 ; RUN: -r=%t/main.o,_Z1bv \
 ; RUN: -r=%t/main.o,_Z1cv \
-; RUN: -r=%t/main.o,_Z3fooIiET_S0_S0_ -enable-import-metadata=true -memprof-strict-summary-match=true
+; RUN: -r=%t/main.o,_Z3fooIiET_S0_S0_ -enable-import-metadata=true 
 
 ;; foo has two copys:
 ;; foo in b.ll is prevailing and inlines bar.

llvm/tools/llvm-link/llvm-link.cpp

@@ -134,6 +134,12 @@ static cl::opt<bool> TryUseNewDbgInfoFormat(
     cl::desc("Enable debuginfo iterator positions, if they're built in"),
     cl::init(false));
 
+namespace llvm {
+cl::opt<bool> EnableMemProfContextDisambiguation(
+    "enable-memprof-context-disambiguation", cl::init(false), cl::Hidden,
+    cl::ZeroOrMore, cl::desc("Enable MemProf context disambiguation"));
+}
+
 extern cl::opt<bool> UseNewDbgInfoFormat;
 
 static ExitOnError ExitOnErr;