From 0f06462959bcf8224e72b7c739659292dddbdc87 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 28 Oct 2014 11:53:30 +0000 Subject: [PATCH] Untabify and whitespace cleanups. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220771 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/AliasAnalysis.cpp | 17 +++++----- lib/Analysis/DependenceAnalysis.cpp | 6 ++-- lib/Transforms/IPO/ExtractGV.cpp | 10 +++--- .../InstCombine/InstCombineSelect.cpp | 10 +++--- lib/Transforms/Scalar/LoopRerollPass.cpp | 33 +++++++++---------- lib/Transforms/Utils/Local.cpp | 8 ++--- lib/Transforms/Vectorize/LoopVectorize.cpp | 10 +++--- 7 files changed, 46 insertions(+), 48 deletions(-) diff --git a/lib/Analysis/AliasAnalysis.cpp b/lib/Analysis/AliasAnalysis.cpp index e02d6058260..df3fa8b1480 100644 --- a/lib/Analysis/AliasAnalysis.cpp +++ b/lib/Analysis/AliasAnalysis.cpp @@ -199,9 +199,9 @@ AliasAnalysis::getModRefInfo(ImmutableCallSite CS1, ImmutableCallSite CS2) { Location CS1Loc = getArgLocation(CS1, (unsigned) std::distance(CS1.arg_begin(), I), ArgMask); - // ArgMask indicates what CS1 might do to CS1Loc; if CS1 might Mod - // CS1Loc, then we care about either a Mod or a Ref by CS2. If CS1 - // might Ref, then we care only about a Mod by CS2. + // ArgMask indicates what CS1 might do to CS1Loc; if CS1 might Mod + // CS1Loc, then we care about either a Mod or a Ref by CS2. If CS1 + // might Ref, then we care only about a Mod by CS2. ModRefResult ArgR = getModRefInfo(CS2, CS1Loc); if (((ArgMask & Mod) != NoModRef && (ArgR & ModRef) != NoModRef) || ((ArgMask & Ref) != NoModRef && (ArgR & Mod) != NoModRef)) @@ -293,7 +293,7 @@ AliasAnalysis::getLocation(const AtomicRMWInst *RMWI) { getTypeStoreSize(RMWI->getValOperand()->getType()), AATags); } -AliasAnalysis::Location +AliasAnalysis::Location AliasAnalysis::getLocationForSource(const MemTransferInst *MTI) { uint64_t Size = UnknownSize; if (ConstantInt *C = dyn_cast(MTI->getLength())) @@ -303,11 +303,11 @@ AliasAnalysis::getLocationForSource(const MemTransferInst *MTI) { // to both the source and the destination. AAMDNodes AATags; MTI->getAAMetadata(AATags); - + return Location(MTI->getRawSource(), Size, AATags); } -AliasAnalysis::Location +AliasAnalysis::Location AliasAnalysis::getLocationForDest(const MemIntrinsic *MTI) { uint64_t Size = UnknownSize; if (ConstantInt *C = dyn_cast(MTI->getLength())) @@ -317,7 +317,7 @@ AliasAnalysis::getLocationForDest(const MemIntrinsic *MTI) { // to both the source and the destination. AAMDNodes AATags; MTI->getAAMetadata(AATags); - + return Location(MTI->getRawDest(), Size, AATags); } @@ -440,7 +440,7 @@ AliasAnalysis::callCapturesBefore(const Instruction *I, // assume that the call could touch the pointer, even though it doesn't // escape. if (isNoAlias(AliasAnalysis::Location(*CI), - AliasAnalysis::Location(Object))) + AliasAnalysis::Location(Object))) continue; if (CS.doesNotAccessMemory(ArgNo)) continue; @@ -557,4 +557,3 @@ bool llvm::isIdentifiedFunctionLocal(const Value *V) { return isa(V) || isNoAliasCall(V) || isNoAliasArgument(V); } - diff --git a/lib/Analysis/DependenceAnalysis.cpp b/lib/Analysis/DependenceAnalysis.cpp index 228fd69dce7..4998f2812bc 100644 --- a/lib/Analysis/DependenceAnalysis.cpp +++ b/lib/Analysis/DependenceAnalysis.cpp @@ -2957,9 +2957,9 @@ const SCEV *DependenceAnalysis::addToCoefficient(const SCEV *Expr, } if (SE->isLoopInvariant(AddRec, TargetLoop)) return SE->getAddRecExpr(AddRec, - Value, - TargetLoop, - SCEV::FlagAnyWrap); + Value, + TargetLoop, + SCEV::FlagAnyWrap); return SE->getAddRecExpr(addToCoefficient(AddRec->getStart(), TargetLoop, Value), AddRec->getStepRecurrence(*SE), diff --git a/lib/Transforms/IPO/ExtractGV.cpp b/lib/Transforms/IPO/ExtractGV.cpp index 40ec9fa8c1d..5599840fc5e 100644 --- a/lib/Transforms/IPO/ExtractGV.cpp +++ b/lib/Transforms/IPO/ExtractGV.cpp @@ -91,7 +91,7 @@ namespace { continue; } - makeVisible(*I, Delete); + makeVisible(*I, Delete); if (Delete) I->setInitializer(nullptr); @@ -106,7 +106,7 @@ namespace { continue; } - makeVisible(*I, Delete); + makeVisible(*I, Delete); if (Delete) I->deleteBody(); @@ -118,8 +118,8 @@ namespace { Module::alias_iterator CurI = I; ++I; - bool Delete = deleteStuff == (bool)Named.count(CurI); - makeVisible(*CurI, Delete); + bool Delete = deleteStuff == (bool)Named.count(CurI); + makeVisible(*CurI, Delete); if (Delete) { Type *Ty = CurI->getType()->getElementType(); @@ -148,7 +148,7 @@ namespace { char GVExtractorPass::ID = 0; } -ModulePass *llvm::createGVExtractionPass(std::vector& GVs, +ModulePass *llvm::createGVExtractionPass(std::vector& GVs, bool deleteFn) { return new GVExtractorPass(GVs, deleteFn); } diff --git a/lib/Transforms/InstCombine/InstCombineSelect.cpp b/lib/Transforms/InstCombine/InstCombineSelect.cpp index ae0b5769c64..079ae34fbef 100644 --- a/lib/Transforms/InstCombine/InstCombineSelect.cpp +++ b/lib/Transforms/InstCombine/InstCombineSelect.cpp @@ -392,11 +392,11 @@ static Value *SimplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, /// /// This also tries to turn /// --- Single bit tests: -/// if ((x & C) == 0) x |= C to x |= C -/// if ((x & C) != 0) x ^= C to x &= ~C -/// if ((x & C) == 0) x ^= C to x |= C -/// if ((x & C) != 0) x &= ~C to x &= ~C -/// if ((x & C) == 0) x &= ~C to nothing +/// if ((x & C) == 0) x |= C to x |= C +/// if ((x & C) != 0) x ^= C to x &= ~C +/// if ((x & C) == 0) x ^= C to x |= C +/// if ((x & C) != 0) x &= ~C to x &= ~C +/// if ((x & C) == 0) x &= ~C to nothing static Value *foldSelectICmpAndOr(SelectInst &SI, Value *TrueVal, Value *FalseVal, InstCombiner::BuilderTy *Builder) { diff --git a/lib/Transforms/Scalar/LoopRerollPass.cpp b/lib/Transforms/Scalar/LoopRerollPass.cpp index b6fbb16166d..98ed624e1bb 100644 --- a/lib/Transforms/Scalar/LoopRerollPass.cpp +++ b/lib/Transforms/Scalar/LoopRerollPass.cpp @@ -238,7 +238,7 @@ protected: if (PossibleReds[i].size() % Scale == 0) { PossibleRedLastSet.insert(PossibleReds[i].getReducedValue()); PossibleRedPHISet.insert(PossibleReds[i].getPHI()); - + PossibleRedSet.insert(PossibleReds[i].getPHI()); PossibleRedIdx[PossibleReds[i].getPHI()] = i; for (SimpleLoopReduction::iterator J = PossibleReds[i].begin(), @@ -487,7 +487,7 @@ void LoopReroll::collectInLoopUserSet(Loop *L, if (PN->getIncomingBlock(U) == L->getHeader()) continue; } - + if (L->contains(User) && !Exclude.count(User)) { Queue.push_back(User); } @@ -661,9 +661,9 @@ bool LoopReroll::ReductionTracker::validateSelected() { int PrevIter = 0, BaseCount = 0, Count = 0; for (SimpleLoopReduction::iterator J = PossibleReds[i].begin(), JE = PossibleReds[i].end(); J != JE; ++J) { - // Note that all instructions in the chain must have been found because - // all instructions in the function must have been assigned to some - // iteration. + // Note that all instructions in the chain must have been found because + // all instructions in the function must have been assigned to some + // iteration. int Iter = PossibleRedIter[*J]; if (Iter != PrevIter && Iter != PrevIter + 1 && !PossibleReds[i].getReducedValue()->isAssociative()) { @@ -881,7 +881,7 @@ bool LoopReroll::reroll(Instruction *IV, Loop *L, BasicBlock *Header, // needed because otherwise isSafeToSpeculativelyExecute returns // false on PHI nodes. if (!isSimpleLoadStore(J2) && !isSafeToSpeculativelyExecute(J2, DL)) - FutureSideEffects = true; + FutureSideEffects = true; } ++J2; @@ -952,9 +952,9 @@ bool LoopReroll::reroll(Instruction *IV, Loop *L, BasicBlock *Header, for (unsigned j = 0; j < J1->getNumOperands() && !MatchFailed; ++j) { Value *Op2 = J2->getOperand(j); - // If this is part of a reduction (and the operation is not - // associatve), then we match all operands, but not those that are - // part of the reduction. + // If this is part of a reduction (and the operation is not + // associatve), then we match all operands, but not those that are + // part of the reduction. if (InReduction) if (Instruction *Op2I = dyn_cast(Op2)) if (Reductions.isPairInSame(J2, Op2I)) @@ -968,11 +968,11 @@ bool LoopReroll::reroll(Instruction *IV, Loop *L, BasicBlock *Header, Op2 = IV; if (J1->getOperand(Swapped ? unsigned(!j) : j) != Op2) { - // If we've not already decided to swap the matched operands, and - // we've not already matched our first operand (note that we could - // have skipped matching the first operand because it is part of a - // reduction above), and the instruction is commutative, then try - // the swapped match. + // If we've not already decided to swap the matched operands, and + // we've not already matched our first operand (note that we could + // have skipped matching the first operand because it is part of a + // reduction above), and the instruction is commutative, then try + // the swapped match. if (!Swapped && J1->isCommutative() && !SomeOpMatched && J1->getOperand(!j) == Op2) { Swapped = true; @@ -1069,7 +1069,7 @@ bool LoopReroll::reroll(Instruction *IV, Loop *L, BasicBlock *Header, continue; } - ++J; + ++J; } // Insert the new induction variable. @@ -1110,7 +1110,7 @@ bool LoopReroll::reroll(Instruction *IV, Loop *L, BasicBlock *Header, ICMinus1 = Expander.expandCodeFor(ICMinus1SCEV, NewIV->getType(), Preheader->getTerminator()); } - + Value *Cond = new ICmpInst(BI, CmpInst::ICMP_EQ, NewIV, ICMinus1, "exitcond"); BI->setCondition(Cond); @@ -1182,4 +1182,3 @@ bool LoopReroll::runOnLoop(Loop *L, LPPassManager &LPM) { return Changed; } - diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index ef54eb20446..5bf638692b7 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -1074,9 +1074,9 @@ bool llvm::LowerDbgDeclare(Function &F) { else if (LoadInst *LI = dyn_cast(U)) ConvertDebugDeclareToDebugValue(DDI, LI, DIB); else if (CallInst *CI = dyn_cast(U)) { - // This is a call by-value or some other instruction that - // takes a pointer to the variable. Insert a *value* - // intrinsic that describes the alloca. + // This is a call by-value or some other instruction that + // takes a pointer to the variable. Insert a *value* + // intrinsic that describes the alloca. auto DbgVal = DIB.insertDbgValueIntrinsic( AI, 0, DIVariable(DDI->getVariable()), DIExpression(DDI->getExpression()), CI); @@ -1204,7 +1204,7 @@ static bool markAliveBlocks(BasicBlock *BB, dyn_cast(II->getArgOperand(0))) MakeUnreachable = Cond->isZero(); - if (MakeUnreachable) { + if (MakeUnreachable) { // Don't insert a call to llvm.trap right before the unreachable. changeToUnreachable(BBI, false); Changed = true; diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index 293c6262ddb..66aa8197430 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -2981,7 +2981,7 @@ void InnerLoopVectorizer::fixLCSSAPHIs() { LCSSAPhi->addIncoming(UndefValue::get(LCSSAPhi->getType()), LoopMiddleBlock); } -} +} InnerLoopVectorizer::VectorParts InnerLoopVectorizer::createEdgeMask(BasicBlock *Src, BasicBlock *Dst) { @@ -3250,7 +3250,7 @@ void InnerLoopVectorizer::vectorizeBlockInLoop(BasicBlock *BB, PhiVector *PV) { if (BinaryOperator *VecOp = dyn_cast(V)) VecOp->copyIRFlags(BinOp); - + Entry[Part] = V; } @@ -4268,8 +4268,8 @@ void AccessAnalysis::processMemAccesses() { if (IsWrite) SetHasWrite = true; - // Create sets of pointers connected by a shared alias set and - // underlying object. + // Create sets of pointers connected by a shared alias set and + // underlying object. typedef SmallVector ValueVector; ValueVector TempObjects; GetUnderlyingObjects(Ptr, TempObjects, DL); @@ -5396,7 +5396,7 @@ LoopVectorizationCostModel::selectVectorizationFactor(bool OptForSize) { // If the trip count that we found modulo the vectorization factor is not // zero then we require a tail. if (VF < 2) { - emitAnalysis(Report() << "cannot optimize for size and vectorize at the same time. Enable vectorization of this loop with '#pragma clang loop vectorize(enable)' when compiling with -Os"); + emitAnalysis(Report() << "cannot optimize for size and vectorize at the same time. Enable vectorization of this loop with '#pragma clang loop vectorize(enable)' when compiling with -Os"); DEBUG(dbgs() << "LV: Aborting. A tail loop is required in Os.\n"); return Factor; }