Subzero: For filetype=asm, don't print a blank line for pseudo instrs.

Originally, for each non-deleted instruction, CfgNode::emit() would call the virtual Inst::emit() and then print a newline (also printing end-of-live-range info as necessary). This resulted in clumsy blank lines in the asm output, corresponding to non target specific pseudo instructions such as FakeDef, FakeUse, FakeKill. We change this so that CfgNode::emit() only prints a newline for an InstTarget subclass, or if any end-of-live-range text was printed. If a high-level instruction still wants to emit something in a comment, it's responsible for printing its own newline. BUG= none TEST= ./pydir/szbuild_spec2k.py -O2 --force -v --filetype=asm --sz=--asm-verbose=0 TEST= ./pydir/szbuild_spec2k.py -O2 --force -v --filetype=asm --sz=--asm-verbose=1 TEST= ./pydir/szbuild_spec2k.py -O2 --force -v --filetype=asm --target=arm32 R=kschimpf@google.com Review URL: https://codereview.chromium.org/1431353003 .

Subzero: For filetype=asm, don't print a blank line for pseudo instrs.
3e859b73 · Jim Stichnoth · f66a85b2 · 3e859b73 · 3e859b73 · 3e859b73
Commit 3e859b73 authored Nov 10, 2015 by Jim Stichnoth
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 11 deletions

IceCfgNode.cpp src/IceCfgNode.cpp +14 -9

IceInst.cpp src/IceInst.cpp +1 -0

IceInstARM32.cpp src/IceInstARM32.cpp +10 -2

No files found.
--- a/src/IceCfgNode.cpp
+++ b/src/IceCfgNode.cpp
@@ -954,11 +954,13 @@ void emitRegisterUsage(Ostream &Str, const Cfg *Func, const CfgNode *Node,
  Str << "\n";
 }
-void emitLiveRangesEnded(Ostream &Str, const Cfg *Func, const Inst *Instr,
+/// Returns true if some text was emitted - in which case the caller definitely
+/// needs to emit a newline character.
+bool emitLiveRangesEnded(Ostream &Str, const Cfg *Func, const Inst *Instr,
                         CfgVector<SizeT> &LiveRegCount) {
+  bool Printed = false;
  if (!BuildDefs::dump())
-    return;
+    return Printed;
-  bool First = true;
  Variable *Dest = Instr->getDest();
  // Normally we increment the live count for the dest register. But we
  // shouldn't if the instruction's IsDestRedefined flag is set, because this
@@ -976,14 +978,15 @@ void emitLiveRangesEnded(Ostream &Str, const Cfg *Func, const Inst *Instr,
        ShouldReport = false;
    }
    if (ShouldReport) {
-      if (First)
+      if (Printed)
-        Str << " \t# END=";
-      else
        Str << ",";
+      else
+        Str << " \t# END=";
      Var->emit(Func);
-      First = false;
+      Printed = true;
    }
  }
+  return Printed;
 }
 void updateStats(Cfg *Func, const Inst *I) {
@@ -1068,9 +1071,11 @@ void CfgNode::emit(Cfg *Func) const {
      continue;
    }
    I.emit(Func);
+    bool Printed = false;
    if (DecorateAsm)
-      emitLiveRangesEnded(Str, Func, &I, LiveRegCount);
+      Printed = emitLiveRangesEnded(Str, Func, &I, LiveRegCount);
-    Str << "\n";
+    if (Printed || llvm::isa<InstTarget>(&I))
+      Str << "\n";
    updateStats(Func, &I);
  }
  if (DecorateAsm) {

--- a/src/IceInst.cpp
+++ b/src/IceInst.cpp
@@ -896,6 +896,7 @@ void InstFakeDef::emit(const Cfg *Func) const {
  getDest()->emit(Func);
  Str << " = def.pseudo ";
  emitSources(Func);
+  Str << "\n";
 }
 void InstFakeDef::dump(const Cfg *Func) const {

--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -1088,6 +1088,7 @@ void InstARM32Pop::emit(const Cfg *Func) const {
    }
  }
  Ostream &Str = Func->getContext()->getStrEmit();
+  bool NeedNewline = false;
  if (IntegerCount != 0) {
    Str << "\t"
        << "pop"
@@ -1101,19 +1102,26 @@ void InstARM32Pop::emit(const Cfg *Func) const {
        PrintComma = true;
      }
    }
-    Str << "}\n";
+    Str << "}";
+    NeedNewline = true;
  }
  for (const Operand *Op : Dests) {
    if (isScalarIntegerType(Op->getType()))
      continue;
    startNextInst(Func);
+    if (NeedNewline) {
+      Str << "\n";
+      NeedNewline = false;
+    }
    Str << "\t"
        << "vpop"
        << "\t{";
    Op->emit(Func);
-    Str << "}\n";
+    Str << "}";
+    NeedNewline = true;
  }
+  assert(NeedNewline); // caller will add the newline
 }
 void InstARM32Pop::emitIAS(const Cfg *Func) const {