diff --git a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h --- a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h +++ b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h @@ -35,7 +35,6 @@ protected: MCSymbolRefExpr::VariantKind PLTRelativeVariantKind = MCSymbolRefExpr::VK_None; - const TargetMachine *TM = nullptr; public: TargetLoweringObjectFileELF() = default; diff --git a/llvm/include/llvm/Target/TargetLoweringObjectFile.h b/llvm/include/llvm/Target/TargetLoweringObjectFile.h --- a/llvm/include/llvm/Target/TargetLoweringObjectFile.h +++ b/llvm/include/llvm/Target/TargetLoweringObjectFile.h @@ -61,6 +61,8 @@ /// This section contains the static destructor pointer list. MCSection *StaticDtorSection = nullptr; + const TargetMachine *TM = nullptr; + public: TargetLoweringObjectFile() = default; TargetLoweringObjectFile(const TargetLoweringObjectFile &) = delete; @@ -81,6 +83,9 @@ /// Emit the module-level metadata that the platform cares about. virtual void emitModuleMetadata(MCStreamer &Streamer, Module &M) const {} + /// Emit Call Graph Profile metadata. + virtual void emitCGProfile(MCStreamer &Streamer, Module &M) const; + /// Get the module-level metadata that the platform cares about. virtual void getModuleMetadata(Module &M) {} diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -108,7 +108,6 @@ void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx, const TargetMachine &TgtM) { TargetLoweringObjectFile::Initialize(Ctx, TgtM); - TM = &TgtM; CodeModel::Model CM = TgtM.getCodeModel(); InitializeELF(TgtM.Options.UseInitArray); @@ -325,46 +324,7 @@ Streamer.AddBlankLine(); } - SmallVector ModuleFlags; - M.getModuleFlagsMetadata(ModuleFlags); - - MDNode *CFGProfile = nullptr; - - for (const auto &MFE : ModuleFlags) { - StringRef Key = MFE.Key->getString(); - if (Key == "CG Profile") { - CFGProfile = cast(MFE.Val); - break; - } - } - - if (!CFGProfile) - return; - - auto GetSym = [this](const MDOperand &MDO) -> MCSymbol * { - if (!MDO) - return nullptr; - auto V = cast(MDO); - const Function *F = cast(V->getValue()); - return TM->getSymbol(F); - }; - - for (const auto &Edge : CFGProfile->operands()) { - MDNode *E = cast(Edge); - const MCSymbol *From = GetSym(E->getOperand(0)); - const MCSymbol *To = GetSym(E->getOperand(1)); - // Skip null functions. This can happen if functions are dead stripped after - // the CGProfile pass has been run. - if (!From || !To) - continue; - uint64_t Count = cast(E->getOperand(2)) - ->getValue() - ->getUniqueInteger() - .getZExtValue(); - Streamer.emitCGProfileEntry( - MCSymbolRefExpr::create(From, MCSymbolRefExpr::VK_None, C), - MCSymbolRefExpr::create(To, MCSymbolRefExpr::VK_None, C), Count); - } + emitCGProfile(Streamer, M); } MCSymbol *TargetLoweringObjectFileELF::getCFIPersonalitySymbol( @@ -1599,18 +1559,20 @@ StringRef Section; GetObjCImageInfo(M, Version, Flags, Section); - if (Section.empty()) - return; + if (!Section.empty()) { + auto &C = getContext(); + auto *S = C.getCOFFSection(Section, + COFF::IMAGE_SCN_CNT_INITIALIZED_DATA | + COFF::IMAGE_SCN_MEM_READ, + SectionKind::getReadOnly()); + Streamer.SwitchSection(S); + Streamer.emitLabel(C.getOrCreateSymbol(StringRef("OBJC_IMAGE_INFO"))); + Streamer.emitInt32(Version); + Streamer.emitInt32(Flags); + Streamer.AddBlankLine(); + } - auto &C = getContext(); - auto *S = C.getCOFFSection( - Section, COFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_MEM_READ, - SectionKind::getReadOnly()); - Streamer.SwitchSection(S); - Streamer.emitLabel(C.getOrCreateSymbol(StringRef("OBJC_IMAGE_INFO"))); - Streamer.emitInt32(Version); - Streamer.emitInt32(Flags); - Streamer.AddBlankLine(); + emitCGProfile(Streamer, M); } void TargetLoweringObjectFileCOFF::emitLinkerDirectives( diff --git a/llvm/lib/MC/MCWinCOFFStreamer.cpp b/llvm/lib/MC/MCWinCOFFStreamer.cpp --- a/llvm/lib/MC/MCWinCOFFStreamer.cpp +++ b/llvm/lib/MC/MCWinCOFFStreamer.cpp @@ -341,7 +341,6 @@ bool Created; getAssembler().registerSymbol(*S, &Created); if (Created) { - cast(S)->setIsWeakExternal(); cast(S)->setExternal(true); } } diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp --- a/llvm/lib/Target/TargetLoweringObjectFile.cpp +++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp @@ -49,6 +49,8 @@ // Reset various EH DWARF encodings. PersonalityEncoding = LSDAEncoding = TTypeEncoding = dwarf::DW_EH_PE_absptr; CallSiteEncoding = dwarf::DW_EH_PE_uleb128; + + this->TM = &TM; } TargetLoweringObjectFile::~TargetLoweringObjectFile() { @@ -136,6 +138,52 @@ const MCSymbol *Sym) const { } +void TargetLoweringObjectFile::emitCGProfile(MCStreamer &Streamer, + Module &M) const { + MCContext &C = getContext(); + SmallVector ModuleFlags; + M.getModuleFlagsMetadata(ModuleFlags); + + MDNode *CFGProfile = nullptr; + + for (const auto &MFE : ModuleFlags) { + StringRef Key = MFE.Key->getString(); + if (Key == "CG Profile") { + CFGProfile = cast(MFE.Val); + break; + } + } + + if (!CFGProfile) + return; + + auto GetSym = [this](const MDOperand &MDO) -> MCSymbol * { + if (!MDO) + return nullptr; + auto *V = cast(MDO); + const Function *F = cast(V->getValue()); + if (F->hasDLLImportStorageClass()) + return nullptr; + return TM->getSymbol(F); + }; + + for (const auto &Edge : CFGProfile->operands()) { + MDNode *E = cast(Edge); + const MCSymbol *From = GetSym(E->getOperand(0)); + const MCSymbol *To = GetSym(E->getOperand(1)); + // Skip null functions. This can happen if functions are dead stripped after + // the CGProfile pass has been run. + if (!From || !To) + continue; + uint64_t Count = cast(E->getOperand(2)) + ->getValue() + ->getUniqueInteger() + .getZExtValue(); + Streamer.emitCGProfileEntry( + MCSymbolRefExpr::create(From, MCSymbolRefExpr::VK_None, C), + MCSymbolRefExpr::create(To, MCSymbolRefExpr::VK_None, C), Count); + } +} /// getKindForGlobal - This is a top-level target-independent classifier for /// a global object. Given a global variable and information from the TM, this diff --git a/llvm/test/MC/COFF/cgprofile.ll b/llvm/test/MC/COFF/cgprofile.ll new file mode 100644 --- /dev/null +++ b/llvm/test/MC/COFF/cgprofile.ll @@ -0,0 +1,51 @@ +; RUN: llc -filetype=asm %s -o - -mtriple x86_64-pc-windows-msvc | FileCheck %s +; RUN: llc -filetype=obj %s -o %t -mtriple x86_64-pc-windows-msvc +; RUN: llvm-readobj --cg-profile %t | FileCheck %s --check-prefix=OBJ + +declare void @b() + +define void @a() { + call void @b() + ret void +} + +define void @freq(i1 %cond) { + br i1 %cond, label %A, label %B +A: + call void @a(); + ret void +B: + call void @b(); + ret void +} + +!llvm.module.flags = !{!0} + +!0 = !{i32 5, !"CG Profile", !1} +!1 = !{!2, !3, !4, !5} +!2 = !{void ()* @a, void ()* @b, i64 32} +!3 = !{void (i1)* @freq, void ()* @a, i64 11} +!4 = !{void (i1)* @freq, void ()* @b, i64 20} +!5 = !{void (i1)* @freq, null, i64 20} + +; CHECK: .cg_profile a, b, 32 +; CHECK: .cg_profile freq, a, 11 +; CHECK: .cg_profile freq, b, 20 + +; OBJ: CGProfile [ +; OBJ: CGProfileEntry { +; OBJ: From: a +; OBJ: To: b +; OBJ: Weight: 32 +; OBJ: } +; OBJ: CGProfileEntry { +; OBJ: From: freq +; OBJ: To: a +; OBJ: Weight: 11 +; OBJ: } +; OBJ: CGProfileEntry { +; OBJ: From: freq +; OBJ: To: b +; OBJ: Weight: 20 +; OBJ: } +; OBJ:] diff --git a/llvm/test/MC/COFF/cgprofile.s b/llvm/test/MC/COFF/cgprofile.s --- a/llvm/test/MC/COFF/cgprofile.s +++ b/llvm/test/MC/COFF/cgprofile.s @@ -30,7 +30,7 @@ # CHECK-NEXT: ] # CHECK-NEXT: SectionData ( # CHECK-NEXT: 0000: 0A000000 0E000000 20000000 00000000 -# CHECK-NEXT: 0010: 11000000 0A000000 0B000000 00000000 +# CHECK-NEXT: 0010: 0F000000 0A000000 0B000000 00000000 # CHECK-NEXT: 0020: 0B000000 0C000000 14000000 00000000 # CHECK-NEXT: ) @@ -68,37 +68,15 @@ # CHECK-NEXT: Section: IMAGE_SYM_UNDEFINED # CHECK-NEXT: BaseType: # CHECK-NEXT: ComplexType: -# CHECK-NEXT: StorageClass: WeakExternal -# CHECK-NEXT: AuxSymbolCount: 1 -# CHECK-NEXT: AuxWeakExternal { -# CHECK-NEXT: Linked: .weak.b.default.late -# CHECK-NEXT: Search: Alias -# CHECK-NEXT: } -# CHECK: Name: .weak.b.default.late -# CHECK-NEXT: Value: -# CHECK-NEXT: Section: IMAGE_SYM_ABSOLUTE -# CHECK-NEXT: BaseType: -# CHECK-NEXT: ComplexType: # CHECK-NEXT: StorageClass: External -# CHECK-NEXT: AuxSymbolCount: 0 +# CHECK-NEXT: AuxSymbolCount: # CHECK: Name: freq # CHECK-NEXT: Value: # CHECK-NEXT: Section: IMAGE_SYM_UNDEFINED # CHECK-NEXT: BaseType: # CHECK-NEXT: ComplexType: -# CHECK-NEXT: StorageClass: WeakExternal -# CHECK-NEXT: AuxSymbolCount: 1 -# CHECK-NEXT: AuxWeakExternal { -# CHECK-NEXT: Linked: .weak.freq.default.late -# CHECK-NEXT: Search: Alias -# CHECK-NEXT: } -# CHECK: Name: .weak.freq.default.late -# CHECK-NEXT: Value: -# CHECK-NEXT: Section: IMAGE_SYM_ABSOLUTE -# CHECK-NEXT: BaseType: -# CHECK-NEXT: ComplexType: # CHECK-NEXT: StorageClass: External -# CHECK-NEXT: AuxSymbolCount: 0 +# CHECK-NEXT: AuxSymbolCount: # CHECK: CGProfile [ # CHECK-NEXT: CGProfileEntry {