From: Vedant Kumar Date: Tue, 11 Sep 2018 18:38:34 +0000 (+0000) Subject: [gcov] Fix branch counters with switch statements (fix PR38821) X-Git-Tag: llvmorg-8.0.0-rc1~8962 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=727d89526efba8fea09ef2ffcb83f4952e852894;p=platform%2Fupstream%2Fllvm.git [gcov] Fix branch counters with switch statements (fix PR38821) Right now, the counters are added in regards of the number of successors for a given BasicBlock: it's good when we've only 1 or 2 successors (at least with BranchInstr). But in the case of a switch statement, the BasicBlock after switch has several predecessors and we need know from which BB we're coming from. So the idea is to revert what we're doing: add a PHINode in each block which will select the counter according to the incoming BB. They're several pros for doing that: - we fix the "switch" bug - we remove the function call to "__llvm_gcov_indirect_counter_increment" and the lookup table stuff - we replace by PHINodes, so the optimizer will probably makes a better job. Patch by calixte! Differential Revision: https://reviews.llvm.org/D51619 llvm-svn: 341977 --- diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-switch1.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-switch1.c.gcov index 7d136dc..f19431e 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-switch1.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-switch1.c.gcov @@ -5,9 +5,9 @@ // CHECK-NEXT: -: 0:Programs:1 // CHECK-NEXT: -: 1:int main(void) // CHECK-NEXT: -: 2:{ -// CHECK-NEXT: 2: 3: int i = 22; +// CHECK-NEXT: 1: 3: int i = 22; // CHECK-NEXT: -: 4: -// CHECK-NEXT: 2: 5: switch (i) { +// CHECK-NEXT: 1: 5: switch (i) { // CHECK-NEXT: -: 6: case 7: // CHECK-NEXT: #####: 7: break; // CHECK-NEXT: -: 8: diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-switch2.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-switch2.c.gcov index 67f4086..0b85e0f 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-switch2.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-switch2.c.gcov @@ -5,9 +5,9 @@ // CHECK-NEXT: -: 0:Programs:1 // CHECK-NEXT: -: 1:int main(void) // CHECK-NEXT: -: 2:{ -// CHECK-NEXT: 3: 3: int i = 22; +// CHECK-NEXT: 1: 3: int i = 22; // CHECK-NEXT: -: 4: -// CHECK-NEXT: 3: 5: switch (i) { +// CHECK-NEXT: 1: 5: switch (i) { // CHECK-NEXT: -: 6: case 7: // CHECK-NEXT: #####: 7: break; // CHECK-NEXT: -: 8: diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp index 132e808..c50102f 100644 --- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -21,9 +21,9 @@ #include "llvm/ADT/Statistic.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringMap.h" -#include "llvm/ADT/UniqueVector.h" #include "llvm/Analysis/EHPersonalities.h" #include "llvm/Analysis/TargetLibraryInfo.h" +#include "llvm/IR/CFG.h" #include "llvm/IR/DebugInfo.h" #include "llvm/IR/DebugLoc.h" #include "llvm/IR/IRBuilder.h" @@ -98,28 +98,16 @@ private: // Get pointers to the functions in the runtime library. Constant *getStartFileFunc(); - Constant *getIncrementIndirectCounterFunc(); Constant *getEmitFunctionFunc(); Constant *getEmitArcsFunc(); Constant *getSummaryInfoFunc(); Constant *getEndFileFunc(); - // Create or retrieve an i32 state value that is used to represent the - // pred block number for certain non-trivial edges. - GlobalVariable *getEdgeStateValue(); - - // Produce a table of pointers to counters, by predecessor and successor - // block number. - GlobalVariable *buildEdgeLookupTable(Function *F, GlobalVariable *Counter, - const UniqueVector &Preds, - const UniqueVector &Succs); - // Add the function to write out all our counters to the global destructor // list. Function * insertCounterWriteout(ArrayRef>); Function *insertFlush(ArrayRef>); - void insertIndirectCounterIncrement(); enum class GCovFileType { GCNO, GCDA }; std::string mangleName(const DICompileUnit *CU, GCovFileType FileType); @@ -639,7 +627,6 @@ bool GCOVProfiler::emitProfileArcs() { if (!CU_Nodes) return false; bool Result = false; - bool InsertIndCounterIncrCode = false; for (unsigned i = 0, e = CU_Nodes->getNumOperands(); i != e; ++i) { SmallVector, 8> CountersBySP; for (auto &F : M->functions()) { @@ -650,13 +637,17 @@ bool GCOVProfiler::emitProfileArcs() { if (isUsingScopeBasedEH(F)) continue; if (!Result) Result = true; + DenseMap, unsigned> EdgeToCounter; unsigned Edges = 0; for (auto &BB : F) { TerminatorInst *TI = BB.getTerminator(); - if (isa(TI)) - ++Edges; - else - Edges += TI->getNumSuccessors(); + if (isa(TI)) { + EdgeToCounter[{&BB, nullptr}] = Edges++; + } else { + for (BasicBlock *Succ : successors(TI)) { + EdgeToCounter[{&BB, Succ}] = Edges++; + } + } } ArrayType *CounterTy = @@ -668,63 +659,42 @@ bool GCOVProfiler::emitProfileArcs() { "__llvm_gcov_ctr"); CountersBySP.push_back(std::make_pair(Counters, SP)); - UniqueVector ComplexEdgePreds; - UniqueVector ComplexEdgeSuccs; - - unsigned Edge = 0; + // If a BB has several predecessors, use a PHINode to select + // the correct counter. for (auto &BB : F) { - TerminatorInst *TI = BB.getTerminator(); - int Successors = isa(TI) ? 1 : TI->getNumSuccessors(); - if (Successors) { - if (Successors == 1) { - IRBuilder<> Builder(&*BB.getFirstInsertionPt()); - Value *Counter = Builder.CreateConstInBoundsGEP2_64(Counters, 0, - Edge); - Value *Count = Builder.CreateLoad(Counter); - Count = Builder.CreateAdd(Count, Builder.getInt64(1)); - Builder.CreateStore(Count, Counter); - } else if (BranchInst *BI = dyn_cast(TI)) { - IRBuilder<> Builder(BI); - Value *Sel = Builder.CreateSelect(BI->getCondition(), - Builder.getInt64(Edge), - Builder.getInt64(Edge + 1)); - Value *Counter = Builder.CreateInBoundsGEP( - Counters->getValueType(), Counters, {Builder.getInt64(0), Sel}); + const unsigned EdgeCount = + std::distance(pred_begin(&BB), pred_end(&BB)); + if (EdgeCount) { + // The phi node must be at the begin of the BB. + IRBuilder<> BuilderForPhi(&*BB.begin()); + Type *Int64PtrTy = Type::getInt64PtrTy(*Ctx); + PHINode *Phi = BuilderForPhi.CreatePHI(Int64PtrTy, EdgeCount); + for (BasicBlock *Pred : predecessors(&BB)) { + auto It = EdgeToCounter.find({Pred, &BB}); + assert(It != EdgeToCounter.end()); + const unsigned Edge = It->second; + Value *EdgeCounter = + BuilderForPhi.CreateConstInBoundsGEP2_64(Counters, 0, Edge); + Phi->addIncoming(EdgeCounter, Pred); + } + + // Skip phis, landingpads. + IRBuilder<> Builder(&*BB.getFirstInsertionPt()); + Value *Count = Builder.CreateLoad(Phi); + Count = Builder.CreateAdd(Count, Builder.getInt64(1)); + Builder.CreateStore(Count, Phi); + + TerminatorInst *TI = BB.getTerminator(); + if (isa(TI)) { + auto It = EdgeToCounter.find({&BB, nullptr}); + assert(It != EdgeToCounter.end()); + const unsigned Edge = It->second; + Value *Counter = + Builder.CreateConstInBoundsGEP2_64(Counters, 0, Edge); Value *Count = Builder.CreateLoad(Counter); Count = Builder.CreateAdd(Count, Builder.getInt64(1)); Builder.CreateStore(Count, Counter); - } else { - ComplexEdgePreds.insert(&BB); - for (int i = 0; i != Successors; ++i) - ComplexEdgeSuccs.insert(TI->getSuccessor(i)); } - - Edge += Successors; - } - } - - if (!ComplexEdgePreds.empty()) { - GlobalVariable *EdgeTable = - buildEdgeLookupTable(&F, Counters, - ComplexEdgePreds, ComplexEdgeSuccs); - GlobalVariable *EdgeState = getEdgeStateValue(); - - for (int i = 0, e = ComplexEdgePreds.size(); i != e; ++i) { - IRBuilder<> Builder(&*ComplexEdgePreds[i + 1]->getFirstInsertionPt()); - Builder.CreateStore(Builder.getInt32(i), EdgeState); - } - - for (int i = 0, e = ComplexEdgeSuccs.size(); i != e; ++i) { - // Call runtime to perform increment. - IRBuilder<> Builder(&*ComplexEdgeSuccs[i + 1]->getFirstInsertionPt()); - Value *CounterPtrArray = - Builder.CreateConstInBoundsGEP2_64(EdgeTable, 0, - i * ComplexEdgePreds.size()); - - // Build code to increment the counter. - InsertIndCounterIncrCode = true; - Builder.CreateCall(getIncrementIndirectCounterFunc(), - {EdgeState, CounterPtrArray}); } } } @@ -763,60 +733,9 @@ bool GCOVProfiler::emitProfileArcs() { appendToGlobalCtors(*M, F, 0); } - if (InsertIndCounterIncrCode) - insertIndirectCounterIncrement(); - return Result; } -// All edges with successors that aren't branches are "complex", because it -// requires complex logic to pick which counter to update. -GlobalVariable *GCOVProfiler::buildEdgeLookupTable( - Function *F, - GlobalVariable *Counters, - const UniqueVector &Preds, - const UniqueVector &Succs) { - // TODO: support invoke, threads. We rely on the fact that nothing can modify - // the whole-Module pred edge# between the time we set it and the time we next - // read it. Threads and invoke make this untrue. - - // emit [(succs * preds) x i64*], logically [succ x [pred x i64*]]. - size_t TableSize = Succs.size() * Preds.size(); - Type *Int64PtrTy = Type::getInt64PtrTy(*Ctx); - ArrayType *EdgeTableTy = ArrayType::get(Int64PtrTy, TableSize); - - std::unique_ptr EdgeTable(new Constant *[TableSize]); - Constant *NullValue = Constant::getNullValue(Int64PtrTy); - for (size_t i = 0; i != TableSize; ++i) - EdgeTable[i] = NullValue; - - unsigned Edge = 0; - for (BasicBlock &BB : *F) { - TerminatorInst *TI = BB.getTerminator(); - int Successors = isa(TI) ? 1 : TI->getNumSuccessors(); - if (Successors > 1 && !isa(TI) && !isa(TI)) { - for (int i = 0; i != Successors; ++i) { - BasicBlock *Succ = TI->getSuccessor(i); - IRBuilder<> Builder(Succ); - Value *Counter = Builder.CreateConstInBoundsGEP2_64(Counters, 0, - Edge + i); - EdgeTable[((Succs.idFor(Succ) - 1) * Preds.size()) + - (Preds.idFor(&BB) - 1)] = cast(Counter); - } - } - Edge += Successors; - } - - GlobalVariable *EdgeTableGV = - new GlobalVariable( - *M, EdgeTableTy, true, GlobalValue::InternalLinkage, - ConstantArray::get(EdgeTableTy, - makeArrayRef(&EdgeTable[0],TableSize)), - "__llvm_gcda_edge_table"); - EdgeTableGV->setUnnamedAddr(GlobalValue::UnnamedAddr::Global); - return EdgeTableGV; -} - Constant *GCOVProfiler::getStartFileFunc() { Type *Args[] = { Type::getInt8PtrTy(*Ctx), // const char *orig_filename @@ -832,17 +751,6 @@ Constant *GCOVProfiler::getStartFileFunc() { } -Constant *GCOVProfiler::getIncrementIndirectCounterFunc() { - Type *Int32Ty = Type::getInt32Ty(*Ctx); - Type *Int64Ty = Type::getInt64Ty(*Ctx); - Type *Args[] = { - Int32Ty->getPointerTo(), // uint32_t *predecessor - Int64Ty->getPointerTo()->getPointerTo() // uint64_t **counters - }; - FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Ctx), Args, false); - return M->getOrInsertFunction("__llvm_gcov_indirect_counter_increment", FTy); -} - Constant *GCOVProfiler::getEmitFunctionFunc() { Type *Args[] = { Type::getInt32Ty(*Ctx), // uint32_t ident @@ -886,19 +794,6 @@ Constant *GCOVProfiler::getEndFileFunc() { return M->getOrInsertFunction("llvm_gcda_end_file", FTy); } -GlobalVariable *GCOVProfiler::getEdgeStateValue() { - GlobalVariable *GV = M->getGlobalVariable("__llvm_gcov_global_state_pred"); - if (!GV) { - GV = new GlobalVariable(*M, Type::getInt32Ty(*Ctx), false, - GlobalValue::InternalLinkage, - ConstantInt::get(Type::getInt32Ty(*Ctx), - 0xffffffff), - "__llvm_gcov_global_state_pred"); - GV->setUnnamedAddr(GlobalValue::UnnamedAddr::Global); - } - return GV; -} - Function *GCOVProfiler::insertCounterWriteout( ArrayRef > CountersBySP) { FunctionType *WriteoutFTy = FunctionType::get(Type::getVoidTy(*Ctx), false); @@ -1122,57 +1017,6 @@ Function *GCOVProfiler::insertCounterWriteout( return WriteoutF; } -void GCOVProfiler::insertIndirectCounterIncrement() { - Function *Fn = - cast(GCOVProfiler::getIncrementIndirectCounterFunc()); - Fn->setUnnamedAddr(GlobalValue::UnnamedAddr::Global); - Fn->setLinkage(GlobalValue::InternalLinkage); - Fn->addFnAttr(Attribute::NoInline); - if (Options.NoRedZone) - Fn->addFnAttr(Attribute::NoRedZone); - - // Create basic blocks for function. - BasicBlock *BB = BasicBlock::Create(*Ctx, "entry", Fn); - IRBuilder<> Builder(BB); - - BasicBlock *PredNotNegOne = BasicBlock::Create(*Ctx, "", Fn); - BasicBlock *CounterEnd = BasicBlock::Create(*Ctx, "", Fn); - BasicBlock *Exit = BasicBlock::Create(*Ctx, "exit", Fn); - - // uint32_t pred = *predecessor; - // if (pred == 0xffffffff) return; - Argument *Arg = &*Fn->arg_begin(); - Arg->setName("predecessor"); - Value *Pred = Builder.CreateLoad(Arg, "pred"); - Value *Cond = Builder.CreateICmpEQ(Pred, Builder.getInt32(0xffffffff)); - BranchInst::Create(Exit, PredNotNegOne, Cond, BB); - - Builder.SetInsertPoint(PredNotNegOne); - - // uint64_t *counter = counters[pred]; - // if (!counter) return; - Value *ZExtPred = Builder.CreateZExt(Pred, Builder.getInt64Ty()); - Arg = &*std::next(Fn->arg_begin()); - Arg->setName("counters"); - Value *GEP = Builder.CreateGEP(Type::getInt64PtrTy(*Ctx), Arg, ZExtPred); - Value *Counter = Builder.CreateLoad(GEP, "counter"); - Cond = Builder.CreateICmpEQ(Counter, - Constant::getNullValue( - Builder.getInt64Ty()->getPointerTo())); - Builder.CreateCondBr(Cond, Exit, CounterEnd); - - // ++*counter; - Builder.SetInsertPoint(CounterEnd); - Value *Add = Builder.CreateAdd(Builder.CreateLoad(Counter), - Builder.getInt64(1)); - Builder.CreateStore(Add, Counter); - Builder.CreateBr(Exit); - - // Fill in the exit block. - Builder.SetInsertPoint(Exit); - Builder.CreateRetVoid(); -} - Function *GCOVProfiler:: insertFlush(ArrayRef > CountersBySP) { FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Ctx), false);