OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

Move newline printed with op to function/basic block printer. 

Allows printing the instruction to string without trailing newline. Making it easier to reuse print to annotate instructions during lowering. And removes need for newline in the print functions of ops.

PiperOrigin-RevId: 204630791
This commit is contained in:
Jacques Pienaar 2018-07-15 00:06:54 -07:00 committed by jpienaar
parent c4f35a6605
commit 1d0d9968ee
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mlir/lib/IR/AsmPrinter.cpp
View File

@ -117,8 +117,6 @@ void FunctionState::printOperation(const Operation *op) {
[&]() { os << ", "; });
os << '}';
}
os << '\n';
}
//===----------------------------------------------------------------------===//
@ -174,10 +172,13 @@ void CFGFunctionState::print(const BasicBlock *block) {
os << "bb" << getBBID(block) << ":\n";
// TODO Print arguments.
for (auto &inst : block->getOperations())
for (auto &inst : block->getOperations()) {
print(&inst);
os << "\n";
}
print(block->getTerminator());
os << "\n";
}
void CFGFunctionState::print(const Instruction *inst) {
@ -196,10 +197,10 @@ void CFGFunctionState::print(const OperationInst *inst) {
}
void CFGFunctionState::print(const BranchInst *inst) {
os << " br bb" << getBBID(inst->getDest()) << "\n";
os << " br bb" << getBBID(inst->getDest());
}
void CFGFunctionState::print(const ReturnInst *inst) {
os << " return\n";
os << " return";
}
//===----------------------------------------------------------------------===//
@ -248,8 +249,10 @@ void MLFunctionState::print() {
void MLFunctionState::print(const StmtBlock *block) {
numSpaces += indentWidth;
for (auto &stmt : block->getStatements())
for (auto &stmt : block->getStatements()) {
print(&stmt);
os << "\n";
}
numSpaces -= indentWidth;
}
@ -297,6 +300,7 @@ void Instruction::print(raw_ostream &os) const {
void Instruction::dump() const {
print(llvm::errs());
llvm::errs() << "\n";
}
void AffineMap::dump() const { print(llvm::errs()); }
@ -417,6 +421,7 @@ void Statement::print(raw_ostream &os) const {
void Statement::dump() const {
print(llvm::errs());
}
void Function::print(raw_ostream &os) const {
switch (getKind()) {
case Kind::ExtFunc: return cast<ExtFunction>(this)->print(os);

4
mlir/lib/IR/StandardOps.cpp
View File

@ -21,7 +21,7 @@
using namespace mlir;
void AddFOp::print(raw_ostream &os) const {
os << "addf xx, yy : sometype\n";
os << "addf xx, yy : sometype";
}
// Return an error message on failure.
@ -33,7 +33,7 @@ const char *AddFOp::verify() const {
}
void DimOp::print(raw_ostream &os) const {
os << "dim xxx, " << getIndex() << " : sometype\n";
os << "dim xxx, " << getIndex() << " : sometype";
}
const char *DimOp::verify() const {