[PATCH] D102949: [AIX][AsmPrinter] Print Symbol in comments for TOC load

[Jinsong Ji via Phabricator via llvm-commits]

jsji updated this revision to Diff 347165.
jsji added a comment.
Herald added a subscriber: arichardson.

Update update_llc_test tests as well.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D102949/new/

https://reviews.llvm.org/D102949

Files:
  llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  llvm/test/CodeGen/PowerPC/aix-overflow-toc.py
  llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.generated.expected
  llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.nogenerated.expected


Index: llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.nogenerated.expected
===================================================================
--- llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.nogenerated.expected
+++ llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.nogenerated.expected
@@ -142,7 +142,7 @@
 ; AIX:       # %bb.0:
 ; AIX-NEXT:    stw 31, -4(1)
 ; AIX-NEXT:    stwu 1, -48(1)
-; AIX-NEXT:    lwz 4, L..C0(2)
+; AIX-NEXT:    lwz 4, L..C0(2) # @x
 ; AIX-NEXT:    mr 31, 1
 ; AIX-NEXT:    li 3, 0
 ; AIX-NEXT:    stw 3, 40(31)
Index: llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.generated.expected
===================================================================
--- llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.generated.expected
+++ llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.generated.expected
@@ -164,7 +164,7 @@
 ; AIX:       # %bb.0:
 ; AIX-NEXT:    stw 31, -4(1)
 ; AIX-NEXT:    stwu 1, -48(1)
-; AIX-NEXT:    lwz 4, L..C0(2)
+; AIX-NEXT:    lwz 4, L..C0(2) # @x
 ; AIX-NEXT:    mr 31, 1
 ; AIX-NEXT:    li 3, 0
 ; AIX-NEXT:    stw 3, 40(31)
Index: llvm/test/CodeGen/PowerPC/aix-overflow-toc.py
===================================================================
--- llvm/test/CodeGen/PowerPC/aix-overflow-toc.py
+++ llvm/test/CodeGen/PowerPC/aix-overflow-toc.py
@@ -28,27 +28,27 @@
 print("}")
 
 # 32-bit assembly check
-# ASM32:  lwz 4, L..C0(2)
-# ASM32:  lwz 4, L..C1(2)
+# ASM32:  lwz 4, L..C0(2) # @a0
+# ASM32:  lwz 4, L..C1(2) # @a1
 
-# ASM32:  lwz 4, L..C8191(2)
-# ASM32:  lwz 4, L..C8192-65536(2)
-# ASM32:  lwz 4, L..C8193-65536(2)
+# ASM32:  lwz 4, L..C8191(2) # @a8191
+# ASM32:  lwz 4, L..C8192-65536(2) # @a8192
+# ASM32:  lwz 4, L..C8193-65536(2) # @a8193
 
-# ASM32:  lwz 4, L..C12288-65536(2)
-# ASM32:  lwz 4, L..C12289-65536(2)
+# ASM32:  lwz 4, L..C12288-65536(2) # @a12288
+# ASM32:  lwz 4, L..C12289-65536(2) # @a12289
 
 # 64-bit assembly check
-# ASM64:  ld 4, L..C0(2)
-# ASM64:  ld 4, L..C1(2)
+# ASM64:  ld 4, L..C0(2) # @a0
+# ASM64:  ld 4, L..C1(2) # @a1
 
-# ASM64:  ld 4, L..C4095(2)
-# ASM64:  ld 4, L..C4096-65536(2)
-# ASM64:  ld 4, L..C4097-65536(2)
+# ASM64:  ld 4, L..C4095(2) # @a4095
+# ASM64:  ld 4, L..C4096-65536(2) # @a4096
+# ASM64:  ld 4, L..C4097-65536(2) # @a4097
 
-# ASM64:  ld 4, L..C12287-65536(2)
-# ASM64:  ld 4, L..C12288-131072(2)
-# ASM64:  ld 4, L..C12289-131072(2)
+# ASM64:  ld 4, L..C12287-65536(2) # @a12287
+# ASM64:  ld 4, L..C12288-131072(2) # @a12288
+# ASM64:  ld 4, L..C12289-131072(2) # @a12289
 
 # DIS32:   0: 80 82 00 00   lwz 4, 0(2)
 # DIS32:  00000002:  R_TOC  (idx: 24591) a0[TC]
Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
===================================================================
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -846,6 +846,10 @@
           "This pseudo should only be selected for 32-bit small code model.");
       Exp = getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK);
       TmpInst.getOperand(1) = MCOperand::createExpr(Exp);
+
+      // Print MO for better readability
+      if (isVerbose())
+        OutStreamer->GetCommentOS() << MO << '\n';
       EmitToStreamer(*OutStreamer, TmpInst);
       return;
     }
@@ -912,6 +916,10 @@
     const MCExpr *Exp = MCSymbolRefExpr::create(TOCEntry, VKExpr, OutContext);
     TmpInst.getOperand(1) = MCOperand::createExpr(
         IsAIX ? getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK) : Exp);
+
+    // Print MO for better readability
+    if (isVerbose() && IsAIX)
+      OutStreamer->GetCommentOS() << MO << '\n';
     EmitToStreamer(*OutStreamer, TmpInst);
     return;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D102949.347165.patch
Type: text/x-patch
Size: 3857 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210522/849b16b8/attachment.bin>