From 0158e00998862b2eb5dfcccce5ecb02089da3d6b Mon Sep 17 00:00:00 2001 From: Rong Xu Date: Mon, 29 Feb 2016 19:16:04 +0000 Subject: [PATCH] Minor code cleanup. NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@262242 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Instrumentation/PGOInstrumentation.cpp | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/lib/Transforms/Instrumentation/PGOInstrumentation.cpp index a8ad7c3fbda..fa46811e485 100644 --- a/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -99,10 +99,9 @@ static cl::opt // Command line options to disable value profiling. The default is false: // i.e. value profiling is enabled by default. This is for debug purpose. -static cl::opt -DisableValueProfiling("disable-vp", cl::init(false), - cl::Hidden, - cl::desc("Disable Value Profiling")); +static cl::opt DisableValueProfiling("disable-vp", cl::init(false), + cl::Hidden, + cl::desc("Disable Value Profiling")); namespace { class PGOInstrumentationGen : public ModulePass { @@ -404,7 +403,8 @@ struct PGOUseEdge : public PGOEdge { const std::string infoString() const { if (!CountValid) return PGOEdge::infoString(); - return (Twine(PGOEdge::infoString()) + " Count=" + Twine(CountValue)).str(); + return (Twine(PGOEdge::infoString()) + " Count=" + Twine(CountValue)) + .str(); } }; @@ -731,12 +731,12 @@ void PGOUseFunc::annotateIndirectCallSites() { unsigned IndirectCallSiteIndex = 0; PGOIndirectCallSiteVisitor ICV; ICV.visit(F); - unsigned NumValueSites= + unsigned NumValueSites = ProfileRecord.getNumValueSites(IPVK_IndirectCallTarget); if (NumValueSites != ICV.IndirectCallInsts.size()) { std::string Msg = std::string("Inconsistent number of indirect call sites: ") + - F.getName().str(); + F.getName().str(); auto &Ctx = M->getContext(); Ctx.diagnose( DiagnosticInfoPGOProfile(M->getName().data(), Msg, DS_Warning)); @@ -745,8 +745,8 @@ void PGOUseFunc::annotateIndirectCallSites() { for (auto &I : ICV.IndirectCallInsts) { DEBUG(dbgs() << "Read one indirect call instrumentation: Index=" - << IndirectCallSiteIndex << " out of " - << NumValueSites<< "\n"); + << IndirectCallSiteIndex << " out of " << NumValueSites + << "\n"); annotateValueSite(*M, *I, ProfileRecord, IPVK_IndirectCallTarget, IndirectCallSiteIndex); IndirectCallSiteIndex++; @@ -759,17 +759,17 @@ void PGOUseFunc::annotateIndirectCallSites() { static void createIRLevelProfileFlagVariable(Module &M) { Type *IntTy64 = Type::getInt64Ty(M.getContext()); uint64_t ProfileVersion = (INSTR_PROF_RAW_VERSION | VARIANT_MASK_IR_PROF); - auto IRLevelVersionVariable = - new GlobalVariable(M, IntTy64, true, GlobalVariable::ExternalLinkage, - Constant::getIntegerValue(IntTy64, APInt(64, ProfileVersion)), - INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)); + auto IRLevelVersionVariable = new GlobalVariable( + M, IntTy64, true, GlobalVariable::ExternalLinkage, + Constant::getIntegerValue(IntTy64, APInt(64, ProfileVersion)), + INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)); IRLevelVersionVariable->setVisibility(GlobalValue::DefaultVisibility); Triple TT(M.getTargetTriple()); if (TT.isOSBinFormatMachO()) IRLevelVersionVariable->setLinkage(GlobalValue::LinkOnceODRLinkage); else - IRLevelVersionVariable->setComdat( - M.getOrInsertComdat(StringRef(INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)))); + IRLevelVersionVariable->setComdat(M.getOrInsertComdat( + StringRef(INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR)))); } bool PGOInstrumentationGen::runOnModule(Module &M) { @@ -819,7 +819,6 @@ bool PGOInstrumentationUse::runOnModule(Module &M) { return false; } - for (auto &F : M) { if (F.isDeclaration()) continue;