mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
Add a counter-function insertion pass
As discussed in https://reviews.llvm.org/D22666, our current mechanism to support -pg profiling, where we insert calls to mcount(), or some similar function, is fundamentally broken. We insert these calls in the frontend, which means they get duplicated when inlining, and so the accumulated execution counts for the inlined-into functions are wrong. Because we don't want the presence of these functions to affect optimizaton, they should be inserted in the backend. Here's a pass which would do just that. The knowledge of the name of the counting function lives in the frontend, so we're passing it here as a function attribute. Clang will be updated to use this mechanism. Differential Revision: https://reviews.llvm.org/D22825 llvm-svn: 280347
This commit is contained in:
parent
5d7703d77e
commit
d3039d9a41
@ -43,6 +43,9 @@ namespace llvm {
|
||||
/// the entry block.
|
||||
FunctionPass *createUnreachableBlockEliminationPass();
|
||||
|
||||
/// Insert mcount-like function calls.
|
||||
FunctionPass *createCountingFunctionInserterPass();
|
||||
|
||||
/// MachineFunctionPrinter pass - This pass prints out the machine function to
|
||||
/// the given stream as a debugging tool.
|
||||
MachineFunctionPass *
|
||||
|
@ -92,6 +92,7 @@ void initializeCallGraphPrinterLegacyPassPass(PassRegistry&);
|
||||
void initializeCallGraphViewerPass(PassRegistry&);
|
||||
void initializeCallGraphWrapperPassPass(PassRegistry &);
|
||||
void initializeCodeGenPreparePass(PassRegistry&);
|
||||
void initializeCountingFunctionInserterPass(PassRegistry&);
|
||||
void initializeConstantHoistingLegacyPassPass(PassRegistry&);
|
||||
void initializeConstantMergeLegacyPassPass(PassRegistry &);
|
||||
void initializeConstantPropagationPass(PassRegistry&);
|
||||
|
@ -160,6 +160,7 @@ namespace {
|
||||
(void) llvm::createInstCountPass();
|
||||
(void) llvm::createConstantHoistingPass();
|
||||
(void) llvm::createCodeGenPreparePass();
|
||||
(void) llvm::createCountingFunctionInserterPass();
|
||||
(void) llvm::createEarlyCSEPass();
|
||||
(void) llvm::createGVNHoistPass();
|
||||
(void) llvm::createMergedLoadStoreMotionPass();
|
||||
|
@ -10,6 +10,7 @@ add_llvm_library(LLVMCodeGen
|
||||
CallingConvLower.cpp
|
||||
CodeGen.cpp
|
||||
CodeGenPrepare.cpp
|
||||
CountingFunctionInserter.cpp
|
||||
CriticalAntiDepBreaker.cpp
|
||||
DeadMachineInstructionElim.cpp
|
||||
DetectDeadLanes.cpp
|
||||
|
@ -23,6 +23,7 @@ void llvm::initializeCodeGen(PassRegistry &Registry) {
|
||||
initializeAtomicExpandPass(Registry);
|
||||
initializeBranchFolderPassPass(Registry);
|
||||
initializeCodeGenPreparePass(Registry);
|
||||
initializeCountingFunctionInserterPass(Registry);
|
||||
initializeDeadMachineInstructionElimPass(Registry);
|
||||
initializeDetectDeadLanesPass(Registry);
|
||||
initializeDwarfEHPreparePass(Registry);
|
||||
|
62
lib/CodeGen/CountingFunctionInserter.cpp
Normal file
62
lib/CodeGen/CountingFunctionInserter.cpp
Normal file
@ -0,0 +1,62 @@
|
||||
//===- CountingFunctionInserter.cpp - Insert mcount-like function calls ---===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Insert calls to counter functions, such as mcount, intended to be called
|
||||
// once per function, at the beginning of each function.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/Analysis/GlobalsModRef.h"
|
||||
#include "llvm/CodeGen/Passes.h"
|
||||
#include "llvm/IR/Function.h"
|
||||
#include "llvm/IR/Instructions.h"
|
||||
#include "llvm/IR/Module.h"
|
||||
#include "llvm/IR/Type.h"
|
||||
#include "llvm/Pass.h"
|
||||
using namespace llvm;
|
||||
|
||||
namespace {
|
||||
struct CountingFunctionInserter : public FunctionPass {
|
||||
static char ID; // Pass identification, replacement for typeid
|
||||
CountingFunctionInserter() : FunctionPass(ID) {
|
||||
initializeCountingFunctionInserterPass(*PassRegistry::getPassRegistry());
|
||||
}
|
||||
|
||||
void getAnalysisUsage(AnalysisUsage &AU) const override {
|
||||
AU.addPreserved<GlobalsAAWrapperPass>();
|
||||
}
|
||||
|
||||
bool runOnFunction(Function &F) override {
|
||||
std::string CountingFunctionName =
|
||||
F.getFnAttribute("counting-function").getValueAsString();
|
||||
if (CountingFunctionName.empty())
|
||||
return false;
|
||||
|
||||
Type *VoidTy = Type::getVoidTy(F.getContext());
|
||||
Constant *CountingFn =
|
||||
F.getParent()->getOrInsertFunction(CountingFunctionName,
|
||||
VoidTy, nullptr);
|
||||
CallInst::Create(CountingFn, "", &*F.begin()->getFirstInsertionPt());
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
char CountingFunctionInserter::ID = 0;
|
||||
}
|
||||
|
||||
INITIALIZE_PASS(CountingFunctionInserter, "cfinserter",
|
||||
"Inserts calls to mcount-like functions", false, false)
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// CountingFunctionInserter - Give any unnamed non-void instructions "tmp" names.
|
||||
//
|
||||
FunctionPass *llvm::createCountingFunctionInserterPass() {
|
||||
return new CountingFunctionInserter();
|
||||
}
|
@ -477,6 +477,9 @@ void TargetPassConfig::addIRPasses() {
|
||||
|
||||
if (getOptLevel() != CodeGenOpt::None && !DisablePartialLibcallInlining)
|
||||
addPass(createPartiallyInlineLibCallsPass());
|
||||
|
||||
// Insert calls to mcount-like functions.
|
||||
addPass(createCountingFunctionInserterPass());
|
||||
}
|
||||
|
||||
/// Turn exception handling constructs into something the code generators can
|
||||
|
16
test/CodeGen/PowerPC/mcount-insertion.ll
Normal file
16
test/CodeGen/PowerPC/mcount-insertion.ll
Normal file
@ -0,0 +1,16 @@
|
||||
; RUN: llc < %s | FileCheck %s
|
||||
target datalayout = "E-m:e-i64:64-n32:64"
|
||||
target triple = "powerpc64-bgq-linux"
|
||||
|
||||
define void @test1() #0 {
|
||||
entry:
|
||||
ret void
|
||||
|
||||
; CHECK-LABEL: @test1
|
||||
; CHECK: bl mcount
|
||||
; CHECK-NOT: mcount
|
||||
; CHECK: blr
|
||||
}
|
||||
|
||||
attributes #0 = { "counting-function"="mcount" }
|
||||
|
27
test/Transforms/CountingFunctionInserter/mcount.ll
Normal file
27
test/Transforms/CountingFunctionInserter/mcount.ll
Normal file
@ -0,0 +1,27 @@
|
||||
; RUN: opt -S -cfinserter < %s | FileCheck %s
|
||||
target datalayout = "E-m:e-i64:64-n32:64"
|
||||
target triple = "powerpc64-bgq-linux"
|
||||
|
||||
define void @test1() #0 {
|
||||
entry:
|
||||
ret void
|
||||
|
||||
; CHECK-LABEL: define void @test1()
|
||||
; CHECK: entry:
|
||||
; CHECK-NEXT: call void @mcount()
|
||||
; CHECK: ret void
|
||||
}
|
||||
|
||||
define void @test2() #1 {
|
||||
entry:
|
||||
ret void
|
||||
|
||||
; CHECK-LABEL: define void @test2()
|
||||
; CHECK: entry:
|
||||
; CHECK-NEXT: call void @.mcount()
|
||||
; CHECK: ret void
|
||||
}
|
||||
|
||||
attributes #0 = { "counting-function"="mcount" }
|
||||
attributes #1 = { "counting-function"=".mcount" }
|
||||
|
@ -254,6 +254,7 @@ int main(int argc, char **argv) {
|
||||
initializeCodeGen(*Registry);
|
||||
initializeLoopStrengthReducePass(*Registry);
|
||||
initializeLowerIntrinsicsPass(*Registry);
|
||||
initializeCountingFunctionInserterPass(*Registry);
|
||||
initializeUnreachableBlockElimLegacyPassPass(*Registry);
|
||||
|
||||
// Register the target printer for --version.
|
||||
|
@ -384,6 +384,7 @@ int main(int argc, char **argv) {
|
||||
initializePreISelIntrinsicLoweringLegacyPassPass(Registry);
|
||||
initializeGlobalMergePass(Registry);
|
||||
initializeInterleavedAccessPass(Registry);
|
||||
initializeCountingFunctionInserterPass(Registry);
|
||||
initializeUnreachableBlockElimLegacyPassPass(Registry);
|
||||
|
||||
#ifdef LINK_POLLY_INTO_TOOLS
|
||||
|
Loading…
x
Reference in New Issue
Block a user