6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix a 4x slowdown in llc -asm-verbose caused by the use of

Browse Source 
WriteAsOperand in more places.

Now that more things are using WriteAsOperand, its behavior of
constructing a TypePrinting object and populating it with strings for all
the numbered types in the Module on each call is a significant bottleneck.
Fancier solutions could be pursued here, but for now, just bypass the
TypePrinting overhead in obvious cases.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78906 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2009-08-13 15:27:57 +00:00
parent 8db5cce021
commit d6c0f65b53
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/VMCore/AsmWriter.cpp
View File

@@ -819,7 +819,7 @@ void SlotTracker::CreateMetadataSlot(const MDNode *N) {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
static void WriteAsOperandInternal(raw_ostream &Out, const Value *V, static void WriteAsOperandInternal(raw_ostream &Out, const Value *V,
TypePrinting &TypePrinter, TypePrinting *TypePrinter,
SlotTracker *Machine); SlotTracker *Machine);
@@ -881,7 +881,7 @@ static void WriteMDNodes(formatted_raw_ostream &Out, TypePrinting &TypePrinter,
else { else {
TypePrinter.print((*NI)->getType(), Out); TypePrinter.print((*NI)->getType(), Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, *NI, TypePrinter, &Machine); WriteAsOperandInternal(Out, *NI, &TypePrinter, &Machine);
} }
if (++NI != NE) if (++NI != NE)
Out << ", "; Out << ", ";
@@ -1035,12 +1035,12 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV,
TypePrinter.print(ETy, Out); TypePrinter.print(ETy, Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CA->getOperand(0), WriteAsOperandInternal(Out, CA->getOperand(0),
TypePrinter, Machine); &TypePrinter, Machine);
for (unsigned i = 1, e = CA->getNumOperands(); i != e; ++i) { for (unsigned i = 1, e = CA->getNumOperands(); i != e; ++i) {
Out << ", "; Out << ", ";
TypePrinter.print(ETy, Out); TypePrinter.print(ETy, Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CA->getOperand(i), TypePrinter, Machine); WriteAsOperandInternal(Out, CA->getOperand(i), &TypePrinter, Machine);
} }
} }
Out << ']'; Out << ']';
@@ -1058,14 +1058,14 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV,
TypePrinter.print(CS->getOperand(0)->getType(), Out); TypePrinter.print(CS->getOperand(0)->getType(), Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CS->getOperand(0), TypePrinter, Machine); WriteAsOperandInternal(Out, CS->getOperand(0), &TypePrinter, Machine);
for (unsigned i = 1; i < N; i++) { for (unsigned i = 1; i < N; i++) {
Out << ", "; Out << ", ";
TypePrinter.print(CS->getOperand(i)->getType(), Out); TypePrinter.print(CS->getOperand(i)->getType(), Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CS->getOperand(i), TypePrinter, Machine); WriteAsOperandInternal(Out, CS->getOperand(i), &TypePrinter, Machine);
} }
Out << ' '; Out << ' ';
} }
@@ -1083,12 +1083,12 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV,
Out << '<'; Out << '<';
TypePrinter.print(ETy, Out); TypePrinter.print(ETy, Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CP->getOperand(0), TypePrinter, Machine); WriteAsOperandInternal(Out, CP->getOperand(0), &TypePrinter, Machine);
for (unsigned i = 1, e = CP->getNumOperands(); i != e; ++i) { for (unsigned i = 1, e = CP->getNumOperands(); i != e; ++i) {
Out << ", "; Out << ", ";
TypePrinter.print(ETy, Out); TypePrinter.print(ETy, Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, CP->getOperand(i), TypePrinter, Machine); WriteAsOperandInternal(Out, CP->getOperand(i), &TypePrinter, Machine);
} }
Out << '>'; Out << '>';
return; return;
@@ -1119,7 +1119,7 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV,
for (User::const_op_iterator OI=CE->op_begin(); OI != CE->op_end(); ++OI) { for (User::const_op_iterator OI=CE->op_begin(); OI != CE->op_end(); ++OI) {
TypePrinter.print((*OI)->getType(), Out); TypePrinter.print((*OI)->getType(), Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, *OI, TypePrinter, Machine); WriteAsOperandInternal(Out, *OI, &TypePrinter, Machine);
if (OI+1 != CE->op_end()) if (OI+1 != CE->op_end())
Out << ", "; Out << ", ";
} }
@@ -1148,7 +1148,7 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV,
/// the whole instruction that generated it. /// the whole instruction that generated it.
/// ///
static void WriteAsOperandInternal(raw_ostream &Out, const Value *V, static void WriteAsOperandInternal(raw_ostream &Out, const Value *V,
TypePrinting &TypePrinter, TypePrinting *TypePrinter,
SlotTracker *Machine) { SlotTracker *Machine) {
if (V->hasName()) { if (V->hasName()) {
PrintLLVMName(Out, V); PrintLLVMName(Out, V);
@@ -1157,7 +1157,8 @@ static void WriteAsOperandInternal(raw_ostream &Out, const Value *V,
const Constant *CV = dyn_cast<Constant>(V); const Constant *CV = dyn_cast<Constant>(V);
if (CV && !isa<GlobalValue>(CV)) { if (CV && !isa<GlobalValue>(CV)) {
WriteConstantInt(Out, CV, TypePrinter, Machine); assert(TypePrinter && "Constants require TypePrinting!");
WriteConstantInt(Out, CV, *TypePrinter, Machine);
return; return;
} }
@@ -1203,10 +1204,10 @@ static void WriteAsOperandInternal(raw_ostream &Out, const Value *V,
} else { } else {
Slot = Machine->getLocalSlot(V); Slot = Machine->getLocalSlot(V);
} }
delete Machine;
} else { } else {
Slot = -1; Slot = -1;
} }
delete Machine;
} }
if (Slot != -1) if (Slot != -1)
@@ -1227,6 +1228,14 @@ void llvm::WriteAsOperand(std::ostream &Out, const Value *V, bool PrintType,
void llvm::WriteAsOperand(raw_ostream &Out, const Value *V, void llvm::WriteAsOperand(raw_ostream &Out, const Value *V,
bool PrintType, const Module *Context) { bool PrintType, const Module *Context) {
// Fast path: Don't construct and populate a TypePrinting object if we
// won't be needing any types printed.
if (!PrintType && !isa<Constant>(V)) {
WriteAsOperandInternal(Out, V, 0, 0);
return;
}
if (Context == 0) Context = getModuleFromVal(V); if (Context == 0) Context = getModuleFromVal(V);
TypePrinting TypePrinter; TypePrinting TypePrinter;
@@ -1237,7 +1246,7 @@ void llvm::WriteAsOperand(raw_ostream &Out, const Value *V,
Out << ' '; Out << ' ';
} }
WriteAsOperandInternal(Out, V, TypePrinter, 0); WriteAsOperandInternal(Out, V, &TypePrinter, 0);
} }
namespace { namespace {
@@ -1307,7 +1316,7 @@ void AssemblyWriter::writeOperand(const Value *Operand, bool PrintType) {
TypePrinter.print(Operand->getType(), Out); TypePrinter.print(Operand->getType(), Out);
Out << ' '; Out << ' ';
} }
WriteAsOperandInternal(Out, Operand, TypePrinter, &Machine); WriteAsOperandInternal(Out, Operand, &TypePrinter, &Machine);
} }
} }
@@ -1323,7 +1332,7 @@ void AssemblyWriter::writeParamOperand(const Value *Operand,
Out << ' ' << Attribute::getAsString(Attrs); Out << ' ' << Attribute::getAsString(Attrs);
Out << ' '; Out << ' ';
// Print the operand // Print the operand
WriteAsOperandInternal(Out, Operand, TypePrinter, &Machine); WriteAsOperandInternal(Out, Operand, &TypePrinter, &Machine);
} }
} }
@@ -1450,7 +1459,7 @@ static void PrintVisibility(GlobalValue::VisibilityTypes Vis,
} }
void AssemblyWriter::printGlobal(const GlobalVariable *GV) { void AssemblyWriter::printGlobal(const GlobalVariable *GV) {
WriteAsOperandInternal(Out, GV, TypePrinter, &Machine); WriteAsOperandInternal(Out, GV, &TypePrinter, &Machine);
Out << " = "; Out << " = ";
if (!GV->hasInitializer() && GV->hasExternalLinkage()) if (!GV->hasInitializer() && GV->hasExternalLinkage())
@@ -1503,7 +1512,7 @@ void AssemblyWriter::printAlias(const GlobalAlias *GA) {
TypePrinter.print(F->getFunctionType(), Out); TypePrinter.print(F->getFunctionType(), Out);
Out << "* "; Out << "* ";
WriteAsOperandInternal(Out, F, TypePrinter, &Machine); WriteAsOperandInternal(Out, F, &TypePrinter, &Machine);
} else if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(Aliasee)) { } else if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(Aliasee)) {
TypePrinter.print(GA->getType(), Out); TypePrinter.print(GA->getType(), Out);
Out << ' '; Out << ' ';
@@ -1581,7 +1590,7 @@ void AssemblyWriter::printFunction(const Function *F) {
Out << Attribute::getAsString(Attrs.getRetAttributes()) << ' '; Out << Attribute::getAsString(Attrs.getRetAttributes()) << ' ';
TypePrinter.print(F->getReturnType(), Out); TypePrinter.print(F->getReturnType(), Out);
Out << ' '; Out << ' ';
WriteAsOperandInternal(Out, F, TypePrinter, &Machine); WriteAsOperandInternal(Out, F, &TypePrinter, &Machine);
Out << '('; Out << '(';
Machine.incorporateFunction(F); Machine.incorporateFunction(F);