From 8dae138d06df9cecbee421ef645d0b74f9ac13d7 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Sun, 14 Sep 2008 17:21:12 +0000 Subject: [PATCH] Fix WriteAsOperand to not emit a leading space character. Adjust its callers to emit a space character before calling it when a space is needed. This fixes several spurious whitespace issues in ScalarEvolution's debug dumps. See the test changes for examples. This also fixes odd space-after-tab indentation in the output for switch statements, and changes calls from being printed like this: call void @foo( i32 %x ) to this: call void @foo(i32 %x) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56196 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ScalarEvolution.cpp | 8 +- lib/VMCore/AsmWriter.cpp | 86 ++++++++++++------- .../LoopInfo/2003-05-15-NestingProblem.ll | 2 +- .../2007-07-15-NegativeStride.ll | 2 +- .../ScalarEvolution/2007-08-06-Unsigned.ll | 2 +- .../2008-02-12-SMAXTripCount.ll | 2 +- .../2008-07-29-SGTTripCount.ll | 2 +- .../ScalarEvolution/2008-07-29-SMinExpr.ll | 2 +- .../ScalarEvolution/2008-08-04-IVOverflow.ll | 2 +- .../ScalarEvolution/2008-08-04-LongAddRec.ll | 2 +- test/Analysis/ScalarEvolution/avoid-smax.ll | 2 +- test/Analysis/ScalarEvolution/smax.ll | 2 +- 12 files changed, 70 insertions(+), 44 deletions(-) diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index 786212ed879..db9792e3b3e 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -891,7 +891,7 @@ SCEVHandle ScalarEvolution::getAddExpr(std::vector &Ops) { // If we found some loop invariants, fold them into the recurrence. if (!LIOps.empty()) { - // NLI + LI + { Start,+,Step} --> NLI + { LI+Start,+,Step } + // NLI + LI + {Start,+,Step} --> NLI + {LI+Start,+,Step} LIOps.push_back(AddRec->getStart()); std::vector AddRecOps(AddRec->op_begin(), AddRec->op_end()); @@ -1039,7 +1039,7 @@ SCEVHandle ScalarEvolution::getMulExpr(std::vector &Ops) { // If we found some loop invariants, fold them into the recurrence. if (!LIOps.empty()) { - // NLI * LI * { Start,+,Step} --> NLI * { LI*Start,+,LI*Step } + // NLI * LI * {Start,+,Step} --> NLI * {LI*Start,+,LI*Step} std::vector NewOps; NewOps.reserve(AddRec->getNumOperands()); if (LIOps.size() == 1) { @@ -1155,7 +1155,7 @@ SCEVHandle ScalarEvolution::getAddRecExpr(std::vector &Operands, if (Operands.back()->isZero()) { Operands.pop_back(); - return getAddRecExpr(Operands, L); // { X,+,0 } --> X + return getAddRecExpr(Operands, L); // {X,+,0} --> X } // Canonicalize nested AddRecs in by nesting them in order of loop depth. @@ -3044,7 +3044,7 @@ void ScalarEvolution::print(std::ostream &OS, const Module* ) const { for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) if (I->getType()->isInteger()) { OS << *I; - OS << " --> "; + OS << " --> "; SCEVHandle SV = getSCEV(&*I); SV->print(OS); OS << "\t\t"; diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 4d18fb174d3..daf3a31a29b 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -777,15 +777,18 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, if (CA->getNumOperands()) { Out << ' '; printTypeInt(Out, ETy, TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CA->getOperand(0), TypeTable, Machine); for (unsigned i = 1, e = CA->getNumOperands(); i != e; ++i) { Out << ", "; printTypeInt(Out, ETy, TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CA->getOperand(i), TypeTable, Machine); } + Out << ' '; } - Out << " ]"; + Out << ']'; } return; } @@ -798,18 +801,21 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, if (N) { Out << ' '; printTypeInt(Out, CS->getOperand(0)->getType(), TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CS->getOperand(0), TypeTable, Machine); for (unsigned i = 1; i < N; i++) { Out << ", "; printTypeInt(Out, CS->getOperand(i)->getType(), TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CS->getOperand(i), TypeTable, Machine); } + Out << ' '; } - Out << " }"; + Out << '}'; if (CS->getType()->isPacked()) Out << '>'; return; @@ -821,10 +827,12 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, "Number of operands for a PackedConst must be > 0"); Out << "< "; printTypeInt(Out, ETy, TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CP->getOperand(0), TypeTable, Machine); for (unsigned i = 1, e = CP->getNumOperands(); i != e; ++i) { Out << ", "; printTypeInt(Out, ETy, TypeTable); + Out << ' '; WriteAsOperandInternal(Out, CP->getOperand(i), TypeTable, Machine); } Out << " >"; @@ -849,6 +857,7 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, for (User::const_op_iterator OI=CE->op_begin(); OI != CE->op_end(); ++OI) { printTypeInt(Out, (*OI)->getType(), TypeTable); + Out << ' '; WriteAsOperandInternal(Out, *OI, TypeTable, Machine); if (OI+1 != CE->op_end()) Out << ", "; @@ -880,7 +889,6 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, static void WriteAsOperandInternal(raw_ostream &Out, const Value *V, std::map &TypeTable, SlotTracker *Machine) { - Out << ' '; if (V->hasName()) { PrintLLVMName(Out, V); return; @@ -952,8 +960,10 @@ void llvm::WriteAsOperand(raw_ostream &Out, const Value *V, bool PrintType, if (Context) fillTypeNameTable(Context, TypeNames); - if (PrintType) + if (PrintType) { printTypeInt(Out, V->getType(), TypeNames); + Out << ' '; + } WriteAsOperandInternal(Out, V, TypeNames, 0); } @@ -1108,8 +1118,8 @@ void AssemblyWriter::writeOperand(const Value *Operand, bool PrintType) { Out << ""; } else { if (PrintType) { - Out << ' '; printType(Operand->getType()); + Out << ' '; } WriteAsOperandInternal(Out, Operand, TypeNames, &Machine); } @@ -1120,12 +1130,12 @@ void AssemblyWriter::writeParamOperand(const Value *Operand, if (Operand == 0) { Out << ""; } else { - Out << ' '; // Print the type printType(Operand->getType()); // Print parameter attributes list if (Attrs != ParamAttr::None) Out << ' ' << ParamAttr::getAsString(Attrs); + Out << ' '; // Print the operand WriteAsOperandInternal(Out, Operand, TypeNames, &Machine); } @@ -1239,8 +1249,10 @@ void AssemblyWriter::printGlobal(const GlobalVariable *GV) { Out << (GV->isConstant() ? "constant " : "global "); printType(GV->getType()->getElementType()); - if (GV->hasInitializer()) + if (GV->hasInitializer()) { + Out << ' '; writeOperand(GV->getInitializer(), false); + } if (unsigned AddressSpace = GV->getType()->getAddressSpace()) Out << " addrspace(" << AddressSpace << ") "; @@ -1474,10 +1486,10 @@ void AssemblyWriter::printBasicBlock(const BasicBlock *BB) { if (PI == PE) { Out << " No predecessors!"; } else { - Out << " preds ="; + Out << " preds = "; writeOperand(*PI, false); for (++PI; PI != PE; ++PI) { - Out << ','; + Out << ", "; writeOperand(*PI, false); } } @@ -1559,23 +1571,25 @@ void AssemblyWriter::printInstruction(const Instruction &I) { // Special case conditional branches to swizzle the condition out to the front if (isa(I) && I.getNumOperands() > 1) { + Out << ' '; writeOperand(I.getOperand(2), true); - Out << ','; + Out << ", "; writeOperand(Operand, true); - Out << ','; + Out << ", "; writeOperand(I.getOperand(1), true); } else if (isa(I)) { // Special case switch statement to get formatting nice and correct... + Out << ' '; writeOperand(Operand , true); - Out << ','; + Out << ", "; writeOperand(I.getOperand(1), true); Out << " ["; for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; op += 2) { Out << "\n\t\t"; writeOperand(I.getOperand(op ), true); - Out << ','; + Out << ", "; writeOperand(I.getOperand(op+1), true); } Out << "\n\t]"; @@ -1586,16 +1600,18 @@ void AssemblyWriter::printInstruction(const Instruction &I) { for (unsigned op = 0, Eop = I.getNumOperands(); op < Eop; op += 2) { if (op) Out << ", "; - Out << '['; - writeOperand(I.getOperand(op ), false); Out << ','; + Out << "[ "; + writeOperand(I.getOperand(op ), false); Out << ", "; writeOperand(I.getOperand(op+1), false); Out << " ]"; } } else if (const ExtractValueInst *EVI = dyn_cast(&I)) { + Out << ' '; writeOperand(I.getOperand(0), true); for (const unsigned *i = EVI->idx_begin(), *e = EVI->idx_end(); i != e; ++i) Out << ", " << *i; } else if (const InsertValueInst *IVI = dyn_cast(&I)) { - writeOperand(I.getOperand(0), true); Out << ','; + Out << ' '; + writeOperand(I.getOperand(0), true); Out << ", "; writeOperand(I.getOperand(1), true); for (const unsigned *i = IVI->idx_begin(), *e = IVI->idx_end(); i != e; ++i) Out << ", " << *i; @@ -1622,10 +1638,12 @@ void AssemblyWriter::printInstruction(const Instruction &I) { // only do this if the first argument is a pointer to a nonvararg function, // and if the return type is not a pointer to a function. // + Out << ' '; if (!FTy->isVarArg() && (!isa(RetTy) || !isa(cast(RetTy)->getElementType()))) { - Out << ' '; printType(RetTy); + printType(RetTy); + Out << ' '; writeOperand(Operand, false); } else { writeOperand(Operand, true); @@ -1633,10 +1651,10 @@ void AssemblyWriter::printInstruction(const Instruction &I) { Out << '('; for (unsigned op = 1, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 1) - Out << ','; + Out << ", "; writeParamOperand(I.getOperand(op), PAL.getParamAttrs(op)); } - Out << " )"; + Out << ')'; if (PAL.getParamAttrs(0) != ParamAttr::None) Out << ' ' << ParamAttr::getAsString(PAL.getParamAttrs(0)); } else if (const InvokeInst *II = dyn_cast(&I)) { @@ -1650,9 +1668,9 @@ void AssemblyWriter::printInstruction(const Instruction &I) { case CallingConv::C: break; // default case CallingConv::Fast: Out << " fastcc"; break; case CallingConv::Cold: Out << " coldcc"; break; - case CallingConv::X86_StdCall: Out << "x86_stdcallcc "; break; - case CallingConv::X86_FastCall: Out << "x86_fastcallcc "; break; - case CallingConv::X86_SSECall: Out << "x86_ssecallcc "; break; + case CallingConv::X86_StdCall: Out << " x86_stdcallcc"; break; + case CallingConv::X86_FastCall: Out << " x86_fastcallcc"; break; + case CallingConv::X86_SSECall: Out << " x86_ssecallcc"; break; default: Out << " cc" << II->getCallingConv(); break; } @@ -1666,40 +1684,47 @@ void AssemblyWriter::printInstruction(const Instruction &I) { Out << ' '; printType(RetTy); writeOperand(Operand, false); } else { + Out << ' '; writeOperand(Operand, true); } Out << '('; for (unsigned op = 3, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 3) - Out << ','; + Out << ", "; writeParamOperand(I.getOperand(op), PAL.getParamAttrs(op-2)); } - Out << " )"; + Out << ')'; if (PAL.getParamAttrs(0) != ParamAttr::None) Out << ' ' << ParamAttr::getAsString(PAL.getParamAttrs(0)); - Out << "\n\t\t\tto"; + Out << "\n\t\t\tto "; writeOperand(II->getNormalDest(), true); - Out << " unwind"; + Out << " unwind "; writeOperand(II->getUnwindDest(), true); } else if (const AllocationInst *AI = dyn_cast(&I)) { Out << ' '; printType(AI->getType()->getElementType()); if (AI->isArrayAllocation()) { - Out << ','; + Out << ", "; writeOperand(AI->getArraySize(), true); } if (AI->getAlignment()) { Out << ", align " << AI->getAlignment(); } } else if (isa(I)) { - if (Operand) writeOperand(Operand, true); // Work with broken code + if (Operand) { + Out << ' '; + writeOperand(Operand, true); // Work with broken code + } Out << " to "; printType(I.getType()); } else if (isa(I)) { - if (Operand) writeOperand(Operand, true); // Work with broken code + if (Operand) { + Out << ' '; + writeOperand(Operand, true); // Work with broken code + } Out << ", "; printType(I.getType()); } else if (Operand) { // Print the normal way... @@ -1729,8 +1754,9 @@ void AssemblyWriter::printInstruction(const Instruction &I) { printType(TheType); } + Out << ' '; for (unsigned i = 0, E = I.getNumOperands(); i != E; ++i) { - if (i) Out << ','; + if (i) Out << ", "; writeOperand(I.getOperand(i), PrintAllTypes); } } diff --git a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll index a3da5232bb8..48f4cfbf78e 100644 --- a/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll +++ b/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll @@ -2,7 +2,7 @@ ; not a child of the loopentry.6 loop. ; ; RUN: llvm-as < %s | opt -analyze -loops | \ -; RUN: grep {^ Loop Containing: %loopentry.7} +; RUN: grep {^ Loop Containing: %loopentry.7} define void @getAndMoveToFrontDecode() { br label %endif.2 diff --git a/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll b/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll index 237ba9b98c6..b38db50c4c3 100644 --- a/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll +++ b/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | grep {Loop bb: 100 iterations} +; RUN: -scalar-evolution-max-iterations=0 | grep {Loop bb: 100 iterations} ; PR1533 @array = weak global [101 x i32] zeroinitializer, align 32 ; <[100 x i32]*> [#uses=1] diff --git a/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll b/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll index e725852cea1..d4452f4f3eb 100644 --- a/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll +++ b/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop bb: ( -1 + ( -1 \\* %x) + %y) iterations!} +; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop bb: (-1 + (-1 \\* %x) + %y) iterations!} ; PR1597 define i32 @f(i32 %x, i32 %y) { diff --git a/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll b/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll index 292ea99b6b5..74e826847b3 100644 --- a/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll +++ b/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop loop: ( 100 + ( -100 smax %n)) iterations!} +; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop loop: (100 + (-100 smax %n)) iterations!} ; PR2002 define void @foo(i8 %n) { diff --git a/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll b/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll index 307439f7b86..bb352a55a3b 100644 --- a/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll +++ b/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution -disable-output \ ; RUN: -scalar-evolution-max-iterations=0 | \ -; RUN: grep -F "( -1 + ( -1 * %j)) iterations" +; RUN: grep -F "(-1 + (-1 * %j)) iterations" ; PR2607 define i32 @_Z1aj(i32 %j) nounwind { diff --git a/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll b/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll index 5947912cafe..a1025ddda09 100644 --- a/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll +++ b/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution -disable-output \ ; RUN: -scalar-evolution-max-iterations=0 | \ -; RUN: grep -F "( -2147483632 + ( 2147483632 smax ( -1 + ( -1 * %x)) smax ( -1 + ( -1 * %y)))) iterations" +; RUN: grep -F "(-2147483632 + (2147483632 smax (-1 + (-1 * %x)) smax (-1 + (-1 * %y)))) iterations" ; PR2607 define i32 @b(i32 %x, i32 %y) { diff --git a/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll b/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll index 04cd289a7a9..f8e1cfcd7fb 100644 --- a/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll +++ b/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution -disable-output \ -; RUN: -scalar-evolution-max-iterations=0 | grep -F "Exits: 20028" +; RUN: -scalar-evolution-max-iterations=0 | grep -F "Exits: 20028" ; PR2621 define i32 @a() nounwind { diff --git a/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll b/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll index dbbc4eca200..fbd249fbc04 100644 --- a/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll +++ b/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution -disable-output \ -; RUN: -scalar-evolution-max-iterations=0 | grep -F "Exits: -19168" +; RUN: -scalar-evolution-max-iterations=0 | grep -F "Exits: -19168" ; PR2621 define i32 @a() nounwind { diff --git a/test/Analysis/ScalarEvolution/avoid-smax.ll b/test/Analysis/ScalarEvolution/avoid-smax.ll index fe4b86f21ed..a8c5aba73de 100644 --- a/test/Analysis/ScalarEvolution/avoid-smax.ll +++ b/test/Analysis/ScalarEvolution/avoid-smax.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop bb3: ( -1 + %n) iterations!} +; RUN: llvm-as < %s | opt -scalar-evolution -analyze | grep {Loop bb3: (-1 + %n) iterations!} ; We don't want to use a max in the trip count expression in ; this testcase. diff --git a/test/Analysis/ScalarEvolution/smax.ll b/test/Analysis/ScalarEvolution/smax.ll index fdb3c26c9b7..4818ee97f25 100644 --- a/test/Analysis/ScalarEvolution/smax.ll +++ b/test/Analysis/ScalarEvolution/smax.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s | opt -analyze -scalar-evolution | grep smax | count 2 ; RUN: llvm-as < %s | opt -analyze -scalar-evolution | grep \ -; RUN: {%. smax %. smax %.} +; RUN: {%. smax %. smax %.} ; PR1614 define i32 @x(i32 %a, i32 %b, i32 %c) { -- 2.34.1