This is an archive of the discontinued LLVM Phabricator instance.

Differential D102949

[AIX][AsmPrinter] Print Symbol in comments for TOC load
ClosedPublic

Authored by jsji on May 21 2021, 3:07 PM.

Details

Reviewers
jasonliu
hubert.reinterpretcast
shchenz
Group Reviewers
Restricted Project
Commits
rG882e4cbd7477: [AIX][AsmPrinter] Print Symbol in comments for TOC load
Summary

We are using TOCEntry symbols like LC..0 in TOC loads,
this is hard to read , at least requiring an additional step to figure
out the loaded symbols.

We should print out the name in comments.

Diff Detail

Event Timeline

jsji created this revision.May 21 2021, 3:07 PM
Herald added subscribers: kbarton, hiraditya, nemanjai. · View Herald TranscriptMay 21 2021, 3:07 PM
jsji requested review of this revision.May 21 2021, 3:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 21 2021, 3:07 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B105715: Diff 347134.May 21 2021, 3:37 PM
jsji updated this revision to Diff 347165.May 21 2021, 7:09 PM

Update update_llc_test tests as well.

Herald added a subscriber: arichardson. · View Herald TranscriptMay 21 2021, 7:09 PM
Harbormaster completed remote builds in B105738: Diff 347165.May 21 2021, 7:53 PM
shchenz accepted this revision.May 23 2021, 6:31 PM

Like this improvement. It will make the assembly be more clear. LGTM

This revision is now accepted and ready to land.May 23 2021, 6:31 PM
Closed by commit rG882e4cbd7477: [AIX][AsmPrinter] Print Symbol in comments for TOC load (authored by jsji). · Explain WhyMay 25 2021, 9:37 AM
This revision was automatically updated to reflect the committed changes.
jsji added a commit: rG882e4cbd7477: [AIX][AsmPrinter] Print Symbol in comments for TOC load.

Revision Contents

PathSize
llvm/
lib/
Target/
PowerPC/
8 lines
test/
CodeGen/
PowerPC/
30 lines
tools/
UpdateTestChecks/
update_llc_test_checks/
Inputs/
2 lines
2 lines

Diff 347165

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

Show First 20 Lines • Show All 840 Lines • ▼ Show 20 Lines case PPC::LWZtoc: {
// references into the toc section. The displacement value will be generated // references into the toc section. The displacement value will be generated
// relative to the toc-base. // relative to the toc-base.
if (IsAIX) { if (IsAIX) {
assert( assert(
TM.getCodeModel() == CodeModel::Small && TM.getCodeModel() == CodeModel::Small &&
"This pseudo should only be selected for 32-bit small code model."); "This pseudo should only be selected for 32-bit small code model.");
Exp = getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK); Exp = getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK);
TmpInst.getOperand(1) = MCOperand::createExpr(Exp); TmpInst.getOperand(1) = MCOperand::createExpr(Exp);
// Print MO for better readability
if (isVerbose())
OutStreamer->GetCommentOS() << MO << '\n';
EmitToStreamer(*OutStreamer, TmpInst); EmitToStreamer(*OutStreamer, TmpInst);
return; return;
} }
// Create an explicit subtract expression between the local symbol and // Create an explicit subtract expression between the local symbol and
// '.LTOC' to manifest the toc-relative offset. // '.LTOC' to manifest the toc-relative offset.
const MCExpr *PB = MCSymbolRefExpr::create( const MCExpr *PB = MCSymbolRefExpr::create(
OutContext.getOrCreateSymbol(Twine(".LTOC")), OutContext); OutContext.getOrCreateSymbol(Twine(".LTOC")), OutContext);
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines case PPC::LDtoc: {
// synthesize later. // synthesize later.
MCSymbol *TOCEntry = lookUpOrCreateTOCEntry(MOSymbol, VK); MCSymbol *TOCEntry = lookUpOrCreateTOCEntry(MOSymbol, VK);
MCSymbolRefExpr::VariantKind VKExpr = MCSymbolRefExpr::VariantKind VKExpr =
IsAIX ? MCSymbolRefExpr::VK_None : MCSymbolRefExpr::VK_PPC_TOC; IsAIX ? MCSymbolRefExpr::VK_None : MCSymbolRefExpr::VK_PPC_TOC;
const MCExpr *Exp = MCSymbolRefExpr::create(TOCEntry, VKExpr, OutContext); const MCExpr *Exp = MCSymbolRefExpr::create(TOCEntry, VKExpr, OutContext);
TmpInst.getOperand(1) = MCOperand::createExpr( TmpInst.getOperand(1) = MCOperand::createExpr(
IsAIX ? getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK) : Exp); IsAIX ? getTOCEntryLoadingExprForXCOFF(MOSymbol, Exp, VK) : Exp);
// Print MO for better readability
if (isVerbose() && IsAIX)
OutStreamer->GetCommentOS() << MO << '\n';
EmitToStreamer(*OutStreamer, TmpInst); EmitToStreamer(*OutStreamer, TmpInst);
return; return;
} }
case PPC::ADDIStocHA: { case PPC::ADDIStocHA: {
assert((IsAIX && !IsPPC64 && TM.getCodeModel() == CodeModel::Large) && assert((IsAIX && !IsPPC64 && TM.getCodeModel() == CodeModel::Large) &&
"This pseudo should only be selected for 32-bit large code model on" "This pseudo should only be selected for 32-bit large code model on"
" AIX."); " AIX.");
▲ Show 20 Lines • Show All 1,620 Lines • Show Last 20 Lines

llvm/test/CodeGen/PowerPC/aix-overflow-toc.py

Show All 22 Lines
print("define void @foo() {") print("define void @foo() {")
print("entry:") print("entry:")
for x in range(0, numentries): for x in range(0, numentries):
print("store i32 1, i32* @a%d, align 4" % (x)) print("store i32 1, i32* @a%d, align 4" % (x))
print("ret void") print("ret void")
print("}") print("}")
# 32-bit assembly check # 32-bit assembly check
# ASM32: lwz 4, L..C0(2) # ASM32: lwz 4, L..C0(2) # @a0
# ASM32: lwz 4, L..C1(2) # ASM32: lwz 4, L..C1(2) # @a1
# ASM32: lwz 4, L..C8191(2) # ASM32: lwz 4, L..C8191(2) # @a8191
# ASM32: lwz 4, L..C8192-65536(2) # ASM32: lwz 4, L..C8192-65536(2) # @a8192
# ASM32: lwz 4, L..C8193-65536(2) # ASM32: lwz 4, L..C8193-65536(2) # @a8193
# ASM32: lwz 4, L..C12288-65536(2) # ASM32: lwz 4, L..C12288-65536(2) # @a12288
# ASM32: lwz 4, L..C12289-65536(2) # ASM32: lwz 4, L..C12289-65536(2) # @a12289
# 64-bit assembly check # 64-bit assembly check
# ASM64: ld 4, L..C0(2) # ASM64: ld 4, L..C0(2) # @a0
# ASM64: ld 4, L..C1(2) # ASM64: ld 4, L..C1(2) # @a1
# ASM64: ld 4, L..C4095(2) # ASM64: ld 4, L..C4095(2) # @a4095
# ASM64: ld 4, L..C4096-65536(2) # ASM64: ld 4, L..C4096-65536(2) # @a4096
# ASM64: ld 4, L..C4097-65536(2) # ASM64: ld 4, L..C4097-65536(2) # @a4097
# ASM64: ld 4, L..C12287-65536(2) # ASM64: ld 4, L..C12287-65536(2) # @a12287
# ASM64: ld 4, L..C12288-131072(2) # ASM64: ld 4, L..C12288-131072(2) # @a12288
# ASM64: ld 4, L..C12289-131072(2) # ASM64: ld 4, L..C12289-131072(2) # @a12289
# DIS32: 0: 80 82 00 00 lwz 4, 0(2) # DIS32: 0: 80 82 00 00 lwz 4, 0(2)
# DIS32: 00000002: R_TOC (idx: 24591) a0[TC] # DIS32: 00000002: R_TOC (idx: 24591) a0[TC]
# DIS32: c: 80 82 00 04 lwz 4, 4(2) # DIS32: c: 80 82 00 04 lwz 4, 4(2)
# DIS32: 0000000e: R_TOC (idx: 24593) a1[TC] # DIS32: 0000000e: R_TOC (idx: 24593) a1[TC]
# DIS32: fffc: 80 82 7f fc lwz 4, 32764(2) # DIS32: fffc: 80 82 7f fc lwz 4, 32764(2)
# DIS32: 0000fffe: R_TOC (idx: 40973) a8191[TC] # DIS32: 0000fffe: R_TOC (idx: 40973) a8191[TC]
Show All 9 Lines

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.generated.expected

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Lines
; AIX-NEXT: addi 1, 1, 48 ; AIX-NEXT: addi 1, 1, 48
; AIX-NEXT: lwz 31, -4(1) ; AIX-NEXT: lwz 31, -4(1)
; AIX-NEXT: blr ; AIX-NEXT: blr
; ;
; AIX-LABEL: main: ; AIX-LABEL: main:
; AIX: # %bb.0: ; AIX: # %bb.0:
; AIX-NEXT: stw 31, -4(1) ; AIX-NEXT: stw 31, -4(1)
; AIX-NEXT: stwu 1, -48(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: mr 31, 1
; AIX-NEXT: li 3, 0 ; AIX-NEXT: li 3, 0
; AIX-NEXT: stw 3, 40(31) ; AIX-NEXT: stw 3, 40(31)
; AIX-NEXT: li 3, 1 ; AIX-NEXT: li 3, 1
; AIX-NEXT: li 5, 2 ; AIX-NEXT: li 5, 2
; AIX-NEXT: li 6, 3 ; AIX-NEXT: li 6, 3
; AIX-NEXT: li 7, 4 ; AIX-NEXT: li 7, 4
; AIX-NEXT: stw 3, 36(31) ; AIX-NEXT: stw 3, 36(31)
Show All 14 Lines

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ppc_generated_funcs.ll.nogenerated.expected

Show First 20 Lines • Show All 136 Lines • ▼ Show 20 Lines
; CHECK-NEXT: lwz 31, 28(1) ; CHECK-NEXT: lwz 31, 28(1)
; CHECK-NEXT: addi 1, 1, 32 ; CHECK-NEXT: addi 1, 1, 32
; CHECK-NEXT: blr ; CHECK-NEXT: blr
; ;
; AIX-LABEL: main: ; AIX-LABEL: main:
; AIX: # %bb.0: ; AIX: # %bb.0:
; AIX-NEXT: stw 31, -4(1) ; AIX-NEXT: stw 31, -4(1)
; AIX-NEXT: stwu 1, -48(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: mr 31, 1
; AIX-NEXT: li 3, 0 ; AIX-NEXT: li 3, 0
; AIX-NEXT: stw 3, 40(31) ; AIX-NEXT: stw 3, 40(31)
; AIX-NEXT: li 3, 1 ; AIX-NEXT: li 3, 1
; AIX-NEXT: li 5, 2 ; AIX-NEXT: li 5, 2
; AIX-NEXT: li 6, 3 ; AIX-NEXT: li 6, 3
; AIX-NEXT: li 7, 4 ; AIX-NEXT: li 7, 4
; AIX-NEXT: stw 3, 36(31) ; AIX-NEXT: stw 3, 36(31)
Show All 36 Lines