[llvm] r267665 - Support "preserving" the summary information when using setModule() API in LTOCodeGenerator

[Mehdi Amini via llvm-commits]

Author: mehdi_amini
Date: Tue Apr 26 23:24:10 2016
New Revision: 267665

URL: http://llvm.org/viewvc/llvm-project?rev=267665&view=rev
Log:
Support "preserving" the summary information when using setModule() API in LTOCodeGenerator

Another attempt at r267655...

From: Mehdi Amini <mehdi.amini at apple.com>

Added:
    llvm/trunk/test/LTO/X86/set-merged-thin.ll
Modified:
    llvm/trunk/include/llvm/LTO/LTOCodeGenerator.h
    llvm/trunk/lib/LTO/LTOCodeGenerator.cpp

Modified: llvm/trunk/include/llvm/LTO/LTOCodeGenerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LTO/LTOCodeGenerator.h?rev=267665&r1=267664&r2=267665&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LTO/LTOCodeGenerator.h (original)
+++ llvm/trunk/include/llvm/LTO/LTOCodeGenerator.h Tue Apr 26 23:24:10 2016
@@ -201,6 +201,7 @@ private:
 
   LLVMContext &Context;
   std::unique_ptr<Module> MergedModule;
+  bool MainModuleHasSummary = false;
   std::unique_ptr<Linker> TheLinker;
   std::unique_ptr<TargetMachine> TargetMach;
   bool EmitDwarfDebugInfo = false;

Modified: llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTOCodeGenerator.cpp?rev=267665&r1=267664&r2=267665&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/LTOCodeGenerator.cpp Tue Apr 26 23:24:10 2016
@@ -18,6 +18,7 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Analysis/Passes.h"
+#include "llvm/Analysis/ModuleSummaryAnalysis.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Bitcode/ReaderWriter.h"
@@ -145,6 +146,7 @@ void LTOCodeGenerator::setModule(std::un
 
   MergedModule = Mod->takeModule();
   TheLinker = make_unique<Linker>(*MergedModule);
+  MainModuleHasSummary = Mod->isThinLTO();
 
   const std::vector<const char*> &Undefs = Mod->getAsmUndefinedRefs();
   for (int I = 0, E = Undefs.size(); I != E; ++I)
@@ -209,8 +211,13 @@ bool LTOCodeGenerator::writeMergedModule
     return false;
   }
 
+  std::unique_ptr<ModuleSummaryIndex> Index;
+  if (MainModuleHasSummary)
+    Index = ModuleSummaryIndexBuilder(MergedModule.get()).takeIndex();
+
   // write bitcode to it
-  WriteBitcodeToFile(MergedModule.get(), Out.os(), ShouldEmbedUselists);
+  WriteBitcodeToFile(MergedModule.get(), Out.os(), ShouldEmbedUselists,
+                     Index.get());
   Out.os().close();
 
   if (Out.os().has_error()) {

Added: llvm/trunk/test/LTO/X86/set-merged-thin.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/X86/set-merged-thin.ll?rev=267665&view=auto
==============================================================================
--- llvm/trunk/test/LTO/X86/set-merged-thin.ll (added)
+++ llvm/trunk/test/LTO/X86/set-merged-thin.ll Tue Apr 26 23:24:10 2016
@@ -0,0 +1,37 @@
+; RUN: opt  -module-summary  < %s > %t1
+; RUN: llvm-lto -save-merged-module -exported-symbol=_main -set-merged-module -o %t2 %t1
+; RUN: llvm-bcanalyzer -dump %t2.merged.bc | FileCheck %s
+; Verify that the module includes the ThinLTO summary
+; CHECK: <PERMODULE
+
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.10.0"
+
+define i32 @_Z3fooi(i32 %a) {
+entry:
+  %a.addr = alloca i32, align 4
+  store i32 %a, i32* %a.addr, align 4
+  %0 = load i32, i32* %a.addr, align 4
+  %1 = load i32, i32* %a.addr, align 4
+  %call = call i32 @_Z4bar2i(i32 %1)
+  %add = add nsw i32 %0, %call
+  ret i32 %add
+}
+
+define i32 @_Z4bar2i(i32 %a) {
+entry:
+  %a.addr = alloca i32, align 4
+  store i32 %a, i32* %a.addr, align 4
+  %0 = load i32, i32* %a.addr, align 4
+  %mul = mul nsw i32 2, %0
+  ret i32 %mul
+}
+
+define i32 @main() {
+entry:
+  %retval = alloca i32, align 4
+  store i32 0, i32* %retval
+  %call = call i32 @_Z3fooi(i32 44)
+  ret i32 %call
+}