From 1f54500af04bcdc2a4cd41b154778abf691ed300 Mon Sep 17 00:00:00 2001 From: Eugene Leviant Date: Wed, 24 Oct 2018 07:48:32 +0000 Subject: [PATCH] [ThinLTO] Fix dot dumper for regular LTO modules Regular LTO module identifier is (unsigned)-1. This patch emits correct module identifier while printing edges with source summary in regular LTO module. Differential revision: https://reviews.llvm.org/D53583 llvm-svn: 345118 --- llvm/lib/IR/ModuleSummaryIndex.cpp | 2 +- llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll diff --git a/llvm/lib/IR/ModuleSummaryIndex.cpp b/llvm/lib/IR/ModuleSummaryIndex.cpp index 4c4466f..0266191 100644 --- a/llvm/lib/IR/ModuleSummaryIndex.cpp +++ b/llvm/lib/IR/ModuleSummaryIndex.cpp @@ -241,7 +241,7 @@ void ModuleSummaryIndex::exportToDot(raw_ostream& OS) const { "_" + std::to_string(Id); }; - auto DrawEdge = [&](const char *Pfx, int SrcMod, GlobalValue::GUID SrcId, + auto DrawEdge = [&](const char *Pfx, uint64_t SrcMod, GlobalValue::GUID SrcId, int DstMod, GlobalValue::GUID DstId, int TypeOrHotness) { // 0 corresponds to alias edge, 1 to ref edge, 2 to call with unknown // hotness, ... diff --git a/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll b/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll new file mode 100644 index 0000000..6d4d1ef --- /dev/null +++ b/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll @@ -0,0 +1,28 @@ +; RUN: opt -module-summary %s -o %t1.bc +; RUN: opt -module-summary %p/Inputs/dot-dumper.ll -o %t2.bc +; RUN: llvm-lto2 run -save-temps %t1.bc %t2.bc -o %t3 \ +; RUN: -r=%t1.bc,main,px \ +; RUN: -r=%t1.bc,A, \ +; RUN: -r=%t2.bc,foo,p \ +; RUN: -r=%t2.bc,bar,p \ +; RUN: -r=%t2.bc,A,p \ +; RUN: -r=%t2.bc,B,p +; RUN: cat %t3.index.dot | FileCheck %s + +; CHECK: subgraph cluster_4294967295 +; CHECK: M4294967295_[[ID:[0-9]+]]{{.*}}main +; CHECK: // Cross-module edges: +; CHECK: M4294967295_[[ID]] -> M0_{{[0-9]+}}{{.*}}// ref + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@A = external global i32 + +define i32 @main() { + %v = load i32, i32* @A + ret i32 %v +} + +!0 = !{i32 1, !"ThinLTO", i32 0} +!llvm.module.flags = !{ !0 } -- 2.7.4