commit b020c54e786362aed66e6cc44c6de348ce704b74
author Jacques Pienaar <jpienaar@google.com> Sun Jul 15 00:06:54 2018 -0700
committer jpienaar <jpienaar@google.com> Fri Mar 29 12:34:07 2019 -0700
tree 756cb83e3df1029b1e42082620a2032a5bcaf8ce
parent 3e59f08e9bb3afa489c1acf81b0e6afee6f0d080

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

lib/IR/AsmPrinter.cpp

diff --git a/lib/IR/AsmPrinter.cpp b/lib/IR/AsmPrinter.cpp
index 0103e6a..2dd2a3b 100644
--- a/lib/IR/AsmPrinter.cpp
+++ b/lib/IR/AsmPrinter.cpp
@@ -117,8 +117,6 @@
         [&]() { os << ", "; });
     os << '}';
   }
-
-  os << '\n';
 }
 
 //===----------------------------------------------------------------------===//
@@ -174,10 +172,13 @@
   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 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(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::dump() const {
   print(llvm::errs());
+  llvm::errs() << "\n";
 }
 
 void AffineMap::dump() const { print(llvm::errs()); }
@@ -417,6 +421,7 @@
 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);

lib/IR/StandardOps.cpp

diff --git a/lib/IR/StandardOps.cpp b/lib/IR/StandardOps.cpp
index 01d91bb..d1ddf65 100644
--- a/lib/IR/StandardOps.cpp
+++ b/lib/IR/StandardOps.cpp
@@ -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 @@
 }
 
 void DimOp::print(raw_ostream &os) const {
-  os << "dim xxx, " << getIndex() << " : sometype\n";
+  os << "dim xxx, " << getIndex() << " : sometype";
 }
 
 const char *DimOp::verify() const {