From a54c8af4c3f8bc2b01500a427aeeb2e01a5c9495 Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Fri, 8 Feb 2019 17:08:27 +0000 Subject: [PATCH] ArgumentPromotion should copy all metadata to new Function Summary: ArgumentPromotion had code to specifically move the dbg metadata over to the new function, but other metadata such as the function_entry_count !prof metadata was not. Replace code that moved dbg metadata with a call to copyMetadata. The old metadata is automatically removed when the old Function is removed. Reviewers: davidxl Subscribers: llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D57846 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@353537 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/ArgumentPromotion.cpp | 5 +--- test/Transforms/ArgumentPromotion/profile.ll | 28 ++++++++++++++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index 13df8280f34..30763f26971 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -216,10 +216,7 @@ doPromotion(Function *F, SmallPtrSetImpl &ArgsToPromote, Function *NF = Function::Create(NFTy, F->getLinkage(), F->getAddressSpace(), F->getName()); NF->copyAttributesFrom(F); - - // Patch the pointer to LLVM function in debug info descriptor. - NF->setSubprogram(F->getSubprogram()); - F->setSubprogram(nullptr); + NF->copyMetadata(F, 0); LLVM_DEBUG(dbgs() << "ARG PROMOTION: Promoting to:" << *NF << "\n" << "From: " << *F); diff --git a/test/Transforms/ArgumentPromotion/profile.ll b/test/Transforms/ArgumentPromotion/profile.ll index f667f9ea2c2..64d424cd2cc 100644 --- a/test/Transforms/ArgumentPromotion/profile.ll +++ b/test/Transforms/ArgumentPromotion/profile.ll @@ -1,17 +1,18 @@ ; RUN: opt -argpromotion -mem2reg -S < %s | FileCheck %s target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" -; Checks if !prof metadata is corret in deadargelim. +; Checks if !prof metadata is correct after argpromotion define void @caller() #0 { %x = alloca i32 store i32 42, i32* %x - call void @promote_i32_ptr(i32* %x), !prof !0 -; CHECK: call void @promote_i32_ptr(i32 42), !prof ![[PROF:[0-9]]] + call void @promote_i32_ptr(i32* %x), !prof !6 +; CHECK: call void @promote_i32_ptr(i32 42), !prof ![[PROF:[0-9]+]] ret void } -define internal void @promote_i32_ptr(i32* %xp) { +; CHECK: define internal void @promote_i32_ptr(i32 %xp.val) !dbg ![[DBG:[0-9]+]] !prof ![[FUNCPROF:[0-9]+]] +define internal void @promote_i32_ptr(i32* %xp) !dbg !7 !prof !12 { %x = load i32, i32* %xp call void @use_i32(i32 %x) ret void @@ -19,5 +20,22 @@ define internal void @promote_i32_ptr(i32* %xp) { declare void @use_i32(i32) +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!3, !4, !5} + +!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 9.0.0 (trunk 353186) (llvm/trunk 353190)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None) +!1 = !DIFile(filename: "profile.cc", directory: ".") +!2 = !{} +!3 = !{i32 2, !"Dwarf Version", i32 4} +!4 = !{i32 2, !"Debug Info Version", i32 3} +!5 = !{i32 1, !"wchar_size", i32 4} ; CHECK: ![[PROF]] = !{!"branch_weights", i32 30} -!0 = !{!"branch_weights", i32 30} +!6 = !{!"branch_weights", i32 30} +; CHECK: ![[DBG]] = distinct !DISubprogram(name: "promote_i32_ptr" +!7 = distinct !DISubprogram(name: "promote_i32_ptr", linkageName: "_ZL15promote_i32_ptrPi", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagPrototyped, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition, unit: !0, retainedNodes: !2) +!8 = !DISubroutineType(types: !9) +!9 = !{null, !10} +!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64) +!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +; CHECK: ![[FUNCPROF]] = !{!"function_entry_count", i64 331} +!12 = !{!"function_entry_count", i64 331} -- 2.40.0