- remove getInstructionSeparator

- test improvements:
  - multi-insn packets
  - branch targets
  - endloops
  - inline relocations

Author: quic-areg

llvm/test/tools/llvm-objdump/ELF/Hexagon/branch-targets.yaml

@@ -0,0 +1,47 @@
+/// Checks that various hexagon scenarios are handled correctly:
+///  - branch targets
+///  - endloops
+///  - inline-relocs
+///  - multi-insn bundles
+
+{
+  r6 = sub(r1, r0)
+  r7 = and(r4, #0x0)
+  if (p1) jump:t target1
+  if (p2) jump:nt target2
+}
+
+{
+  r8 = r7
+  r9 = add(r8, #0)
+  r10 = memw(r9)
+} :endloop0
+
+{ jump ##sym }
+
+target1:
+  nop
+
+target2:
+  nop
+
+// RUN: llvm-mc %s --triple=hexagon -filetype=obj | llvm-objdump -d -r - | FileCheck %s
+
+//      CHECK: 00000000 <.text>:
+// CHECK-NEXT:        0:       12 51 00 5c     5c005112 {      if (p1) jump:t 0x24 <target1>
+// CHECK-NEXT:        4:       14 42 00 5c     5c004214        if (p2) jump:nt 0x28 <target2>
+// CHECK-NEXT:        8:       06 41 20 f3     f3204106        r6 = sub(r1,r0)
+// CHECK-NEXT:        c:       07 c0 04 76     7604c007        r7 = and(r4,#0x0) }
+// CHECK-NEXT:       10:       08 80 67 70     70678008 {      r8 = r7
+// CHECK-NEXT:       14:       09 40 08 b0     b0084009        r9 = add(r8,#0x0)
+// CHECK-NEXT:       18:       0a c0 89 91     9189c00a        r10 = memw(r9+#0x0) }  :endloop0
+// CHECK-NEXT:       1c:       00 40 00 00     00004000 {      immext(#0x0)
+// CHECK-NEXT:                         0000001c:  R_HEX_B32_PCREL_X    sym
+// CHECK-NEXT:       20:       00 c0 00 58     5800c000        jump 0x1c <.text+0x1c> }
+// CHECK-NEXT:                         00000020:  R_HEX_B22_PCREL_X    sym+0x4
+// CHECK-EMPTY:
+// CHECK-NEXT: 00000024 <target1>:
+// CHECK-NEXT:       24:       00 c0 00 7f     7f00c000 {      nop }
+// CHECK-NEXT:
+// CHECK-NEXT: 00000028 <target2>:
+// CHECK-NEXT:       28:       00 c0 00 7f     7f00c000 {      nop }

llvm/test/tools/llvm-objdump/ELF/Hexagon/hexagon-bundles.s

@@ -694,8 +694,6 @@ class PrettyPrinter {
       OS << "\t<unknown>";
   }
 
-  virtual std::string getInstructionSeparator() const { return "\n"; }
-
   virtual void emitPostInstructionInfo(formatted_raw_ostream &FOS,
                                        const MCAsmInfo &MAI,
                                        const MCSubtargetInfo &STI,
@@ -715,7 +713,7 @@ class PrettyPrinter {
         FOS << MAI.getCommentString() << ' ' << Comment;
       }
       LVP.printAfterInst(FOS);
-      FOS << getInstructionSeparator();
+      FOS << "\n";
     } while (!Comments.empty());
     FOS.flush();
   }
@@ -741,7 +739,7 @@ class HexagonPrettyPrinter : public PrettyPrinter {
     }
   }
 
-  std::string getInstructionSeparator() const override {
+  std::string getInstructionSeparator() const {
     SmallString<40> Separator;
     raw_svector_ostream OS(Separator);
     if (ShouldClosePacket) {
@@ -760,8 +758,11 @@ class HexagonPrettyPrinter : public PrettyPrinter {
   void emitPostInstructionInfo(formatted_raw_ostream &FOS, const MCAsmInfo &MAI,
                                const MCSubtargetInfo &STI, StringRef Comments,
                                LiveVariablePrinter &LVP) override {
-
-    PrettyPrinter::emitPostInstructionInfo(FOS, MAI, STI, Comments, LVP);
+    // Hexagon does not write anything to the comment stream, so we can just
+    // print the separator.
+    LVP.printAfterInst(FOS);
+    FOS << getInstructionSeparator();
+    FOS.flush();
     if (ShouldClosePacket)
       reset();
   }