Author: Hongtao Yu Date: 2021-01-22T11:07:10-08:00 New Revision: 8aa3ee241d522ee97558dcbe9ae331c9564cda4c
URL: https://github.com/llvm/llvm-project/commit/8aa3ee241d522ee97558dcbe9ae331c9564cda4c DIFF: https://github.com/llvm/llvm-project/commit/8aa3ee241d522ee97558dcbe9ae331c9564cda4c.diff LOG: [CSSPGO] LTO option for pseudo probe Adding a lld option to support emitting pseudo probe metadata in LTO mode. Reviewed By: MaskRay, wmi, wenlei Differential Revision: https://reviews.llvm.org/D95056 Added: lld/test/ELF/lto/pseudo-probe-lto.ll Modified: lld/ELF/Config.h lld/ELF/Driver.cpp lld/ELF/LTO.cpp lld/ELF/Options.td Removed: ################################################################################ diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h index 0ec4cb9a0432..c84b5f5bdfda 100644 --- a/lld/ELF/Config.h +++ b/lld/ELF/Config.h @@ -175,6 +175,7 @@ struct Configuration { bool ltoDebugPassManager; bool ltoEmitAsm; bool ltoNewPassManager; + bool ltoPseudoProbeForProfiling; bool ltoUniqueBasicBlockSectionNames; bool ltoWholeProgramVisibility; bool mergeArmExidx; diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 72d245e5dc01..e0ef61d39ac1 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -1005,6 +1005,8 @@ static void readConfigs(opt::InputArgList &args) { config->ltoo = args::getInteger(args, OPT_lto_O, 2); config->ltoObjPath = args.getLastArgValue(OPT_lto_obj_path_eq); config->ltoPartitions = args::getInteger(args, OPT_lto_partitions, 1); + config->ltoPseudoProbeForProfiling = + args.hasArg(OPT_lto_pseudo_probe_for_profiling); config->ltoSampleProfile = args.getLastArgValue(OPT_lto_sample_profile); config->ltoBasicBlockSections = args.getLastArgValue(OPT_lto_basic_block_sections); diff --git a/lld/ELF/LTO.cpp b/lld/ELF/LTO.cpp index 24d7d9a07a9c..b3d4b7dee9f8 100644 --- a/lld/ELF/LTO.cpp +++ b/lld/ELF/LTO.cpp @@ -112,6 +112,7 @@ static lto::Config createConfig() { } } + c.Options.PseudoProbeForProfiling = config->ltoPseudoProbeForProfiling; c.Options.UniqueBasicBlockSectionNames = config->ltoUniqueBasicBlockSectionNames; diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index c50aa84e30e7..0ca283cdfe08 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -550,6 +550,8 @@ def lto_sample_profile: JJ<"lto-sample-profile=">, defm lto_whole_program_visibility: BB<"lto-whole-program-visibility", "Asserts that the LTO link has whole program visibility", "Asserts that the LTO link does not have whole program visibility">; +def lto_pseudo_probe_for_profiling: F<"lto-pseudo-probe-for-profiling">, + HelpText<"Emit pseudo probes for sample profiling">; def disable_verify: F<"disable-verify">; defm mllvm: Eq<"mllvm", "Additional arguments to forward to LLVM's option processing">; def opt_remarks_filename: Separate<["--"], "opt-remarks-filename">, @@ -623,6 +625,8 @@ def: F<"plugin-opt=opt-remarks-with-hotness">, def: J<"plugin-opt=opt-remarks-hotness-threshold=">, Alias<opt_remarks_hotness_threshold>, HelpText<"Alias for --opt-remarks-hotness-threshold">; +def: J<"plugin-opt=pseudo-probe-for-profiling">, + Alias<lto_pseudo_probe_for_profiling>, HelpText<"Alias for --lto-pseudo-probe-for-profiling">; def: J<"plugin-opt=sample-profile=">, Alias<lto_sample_profile>, HelpText<"Alias for --lto-sample-profile">; def: F<"plugin-opt=save-temps">, Alias<save_temps>, HelpText<"Alias for --save-temps">; diff --git a/lld/test/ELF/lto/pseudo-probe-lto.ll b/lld/test/ELF/lto/pseudo-probe-lto.ll new file mode 100644 index 000000000000..ae71876087fc --- /dev/null +++ b/lld/test/ELF/lto/pseudo-probe-lto.ll @@ -0,0 +1,36 @@ +; REQUIRES: x86 +; RUN: opt < %s -passes=pseudo-probe -function-sections -o %t.o +; RUN: ld.lld %t.o -shared --lto-pseudo-probe-for-profiling --lto-emit-asm -o - | FileCheck %s +; RUN: ld.lld %t.o -shared -plugin-opt=pseudo-probe-for-profiling --lto-emit-asm -o - | FileCheck %s + +target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-scei-ps4" + +@g = dso_local global i32 3, align 4 + +define void @foo(void (i32)* %f) !dbg !4 { +entry: +; CHECK: .pseudoprobe [[#GUID:]] 1 0 0 +; CHECK: .pseudoprobe [[#GUID]] 2 1 0 + call void %f(i32 1), !dbg !13 + %0 = load i32, i32* @g, align 4 + %inc = add nsw i32 %0, 1 + store i32 %inc, i32* @g, align 4 + ret void +} + +; CHECK: .section .pseudo_probe_desc,"G",@progbits,.pseudo_probe_desc_foo,comdat +; CHECK-NEXT: .quad [[#GUID]] +; CHECK-NEXT: .quad [[#HASH:]] +; CHECK-NEXT: .byte 3 +; CHECK-NEXT: .ascii "foo" + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!9, !10} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1) +!1 = !DIFile(filename: "test.c", directory: "") +!4 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, unit: !0) +!9 = !{i32 2, !"Dwarf Version", i32 4} +!10 = !{i32 2, !"Debug Info Version", i32 3} +!13 = !DILocation(line: 2, column: 20, scope: !4) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
