diff --git a/llvm/include/llvm/MC/MCObjectFileInfo.h b/llvm/include/llvm/MC/MCObjectFileInfo.h --- a/llvm/include/llvm/MC/MCObjectFileInfo.h +++ b/llvm/include/llvm/MC/MCObjectFileInfo.h @@ -173,7 +173,7 @@ MCSection *StackSizesSection = nullptr; mutable DenseMap StackSizesUniquing; - // ELF specific sections. + // ELF and XCOFF pecific sections. MCSection *DataRelROSection = nullptr; MCSection *MergeableConst4Section = nullptr; MCSection *MergeableConst8Section = nullptr; diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -1879,7 +1879,16 @@ if (Kind.isBSS()) return DataSection; - if (Kind.isReadOnly() && !Kind.isMergeableConst()) + if (Kind.isMergeableConst4() && MergeableConst4Section) + return MergeableConst4Section; + if (Kind.isMergeableConst8() && MergeableConst8Section) + return MergeableConst8Section; + if (Kind.isMergeableConst16() && MergeableConst16Section) + return MergeableConst16Section; + if (Kind.isMergeableConst32() && MergeableConst32Section) + return MergeableConst32Section; + + if (Kind.isReadOnly()) return ReadOnlySection; report_fatal_error("XCOFF other section types not yet implemented."); diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -786,6 +786,22 @@ ReadOnlySection = Ctx->getXCOFFSection( ".rodata", XCOFF::StorageMappingClass::XMC_RO, XCOFF::XTY_SD, XCOFF::C_HIDEXT, SectionKind::getReadOnly()); + + MergeableConst4Section = Ctx->getXCOFFSection( + ".rodata.cst4", XCOFF::StorageMappingClass::XMC_RO, XCOFF::XTY_SD, + XCOFF::C_HIDEXT, SectionKind::getReadOnly()); + + MergeableConst8Section = Ctx->getXCOFFSection( + ".rodata.cst8", XCOFF::StorageMappingClass::XMC_RO, XCOFF::XTY_SD, + XCOFF::C_HIDEXT, SectionKind::getReadOnly()); + + MergeableConst16Section = Ctx->getXCOFFSection( + ".rodata.cst16", XCOFF::StorageMappingClass::XMC_RO, XCOFF::XTY_SD, + XCOFF::C_HIDEXT, SectionKind::getReadOnly()); + + MergeableConst32Section = Ctx->getXCOFFSection( + ".rodata.cst32", XCOFF::StorageMappingClass::XMC_RO, XCOFF::XTY_SD, + XCOFF::C_HIDEXT, SectionKind::getReadOnly()); } void MCObjectFileInfo::InitMCObjectFileInfo(const Triple &TheTriple, bool PIC, diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp --- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -1770,8 +1770,7 @@ SectionKind GVKind = getObjFileLowering().getKindForGlobal(GV, TM); if ((!GVKind.isCommon() && !GVKind.isBSS() && !GVKind.isData() && !GVKind.isReadOnly()) || - GVKind.isMergeable2ByteCString() || GVKind.isMergeable4ByteCString() || - GVKind.isMergeableConst()) + GVKind.isMergeable2ByteCString() || GVKind.isMergeable4ByteCString()) report_fatal_error("Encountered a global variable kind that is " "not supported yet."); diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll new file mode 100644 --- /dev/null +++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll @@ -0,0 +1,228 @@ +;This file tests the codegen of mergeable const in AIX assembly +; RUN: llc -verify-machineinstrs -mcpu=pwr9 -mtriple powerpc-ibm-aix-xcoff < %s | FileCheck %s +; RUN: llc -verify-machineinstrs -mcpu=pwr9 -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s +; RUN: llvm-objdump -D %t.o | FileCheck --check-prefix=CHECKOBJ %s +; RUN llvm-readobj -syms %t.o | FileCheck --check-prefix=CHECKSYM %s + + +%struct.Merge_cnst32 = type { i64, i32, i64, i32 } +%struct.Merge_cnst16 = type { i64, i32 } +%struct.Merge_cnst8 = type { i32, i32 } +%struct.Merge_cnst4 = type { i16, i8 } + +@__const.main.cnst32 = private unnamed_addr constant %struct.Merge_cnst32 { i64 4611686018427387954, i32 0, i64 0, i32 0 }, align 8 +@__const.main.cnst16 = private unnamed_addr constant %struct.Merge_cnst16 { i64 4611686018427387926, i32 0 }, align 8 +@__const.main.cnst8 = private unnamed_addr constant %struct.Merge_cnst8 { i32 1073741832, i32 0 }, align 4 +@__const.main.cnst4 = private unnamed_addr constant %struct.Merge_cnst4 { i16 16392, i8 0 }, align 2 + +; Function Attrs: noinline nounwind optnone +define i32 @main() #0 { +entry: + ret i32 0 +} + + +;CHECK: .csect .rodata.cst32[RO] +;CHECK-NEXT: .align 3 +;CHECK-NEXT: .L__const.main.cnst32: +;CHECK-NEXT: .llong 4611686018427387954 # 0x4000000000000032 +;CHECK-NEXT: .long 0 # 0x0 +;CHECK-NEXT: .space 4 +;CHECK-NEXT: .llong 0 # 0x0 +;CHECK-NEXT: .long 0 # 0x0 +;CHECK-NEXT: .space 4 +;CHECK-NEXT: .csect .rodata.cst16[RO] +;CHECK-NEXT: .align 3 +;CHECK-NEXT: .L__const.main.cnst16: +;CHECK-NEXT: .llong 4611686018427387926 # 0x4000000000000016 +;CHECK-NEXT: .long 0 # 0x0 +;CHECK-NEXT: .space 4 +;CHECK-NEXT: .csect .rodata.cst8[RO] +;CHECK-NEXT: .align 2 +;CHECK-NEXT: .L__const.main.cnst8: +;CHECK-NEXT: .long 1073741832 # 0x40000008 +;CHECK-NEXT: .long 0 # 0x0 +;CHECK-NEXT: .csect .rodata.cst4[RO] +;CHECK-NEXT: .align 1 +;CHECK-NEXT: .L__const.main.cnst4: +;CHECK-NEXT: .short 16392 # 0x4008 +;CHECK-NEXT: .byte 0 # 0x0 +;CHECK-NEXT: .space 1 + +;CHECKOBJ: 00000000 .text: +;CHECKOBJ-NEXT: 0: 38 60 00 00 li 3, 0 +;CHECKOBJ-NEXT: 4: 4e 80 00 20 blr{{[[:space:]] *}} +;CHECKOBJ-NEXT: 00000008 .rodata.cst32: +;CHECKOBJ-NEXT: 8: 40 00 00 00 bdnzf 0, .+0 +;CHECKOBJ-NEXT: c: 00 00 00 32 +;CHECKOBJ-NEXT: ...{{[[:space:]] *}} +;CHECKOBJ-NEXT: 00000028 .rodata.cst16: +;CHECKOBJ-NEXT: 28: 40 00 00 00 bdnzf 0, .+0 +;CHECKOBJ-NEXT: 2c: 00 00 00 16 +;CHECKOBJ-NEXT: ...{{[[:space:]] *}} +;CHECKOBJ-NEXT: 00000038 .rodata.cst8: +;CHECKOBJ-NEXT: 38: 40 00 00 08 bdnzf 0, .+8 +;CHECKOBJ-NEXT: 3c: 00 00 00 00 {{[[:space:]] *}} +;CHECKOBJ-NEXT: 00000040 .rodata.cst4: +;CHECKOBJ-NEXT: 40: 40 08 00 00 bdnzf 8, .+0 + +;CHECKSYM: Symbol { +;CHECKSYM-NEXT: Index: 4 +;CHECKSYM-NEXT: Name: .rodata.cst32 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x8 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 5 +;CHECKSYM-NEXT: SectionLen: 32 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 3 +;CHECKSYM-NEXT: SymbolType: XTY_SD (0x1) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 6 +;CHECKSYM-NEXT: Name: .L__const.main.cnst32 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x8 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 7 +;CHECKSYM-NEXT: ContainingCsectSymbolIndex: 4 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 0 +;CHECKSYM-NEXT: SymbolType: XTY_LD (0x2) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 8 +;CHECKSYM-NEXT: Name: .rodata.cst16 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x28 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 9 +;CHECKSYM-NEXT: SectionLen: 16 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 3 +;CHECKSYM-NEXT: SymbolType: XTY_SD (0x1) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 10 +;CHECKSYM-NEXT: Name: .L__const.main.cnst16 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x28 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 11 +;CHECKSYM-NEXT: ContainingCsectSymbolIndex: 8 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 0 +;CHECKSYM-NEXT: SymbolType: XTY_LD (0x2) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 12 +;CHECKSYM-NEXT: Name: .rodata.cst8 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x38 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 13 +;CHECKSYM-NEXT: SectionLen: 8 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 2 +;CHECKSYM-NEXT: SymbolType: XTY_SD (0x1) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 14 +;CHECKSYM-NEXT: Name: .L__const.main.cnst8 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x38 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 15 +;CHECKSYM-NEXT: ContainingCsectSymbolIndex: 12 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 0 +;CHECKSYM-NEXT: SymbolType: XTY_LD (0x2) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 16 +;CHECKSYM-NEXT: Name: .rodata.cst4 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x40 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 17 +;CHECKSYM-NEXT: SectionLen: 4 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 1 +;CHECKSYM-NEXT: SymbolType: XTY_SD (0x1) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: Symbol { +;CHECKSYM-NEXT: Index: 18 +;CHECKSYM-NEXT: Name: .L__const.main.cnst4 +;CHECKSYM-NEXT: Value (RelocatableAddress): 0x40 +;CHECKSYM-NEXT: Section: .text +;CHECKSYM-NEXT: Type: 0x0 +;CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B) +;CHECKSYM-NEXT: NumberOfAuxEntries: 1 +;CHECKSYM-NEXT: CSECT Auxiliary Entry { +;CHECKSYM-NEXT: Index: 19 +;CHECKSYM-NEXT: ContainingCsectSymbolIndex: 16 +;CHECKSYM-NEXT: ParameterHashIndex: 0x0 +;CHECKSYM-NEXT: TypeChkSectNum: 0x0 +;CHECKSYM-NEXT: SymbolAlignmentLog2: 0 +;CHECKSYM-NEXT: SymbolType: XTY_LD (0x2) +;CHECKSYM-NEXT: StorageMappingClass: XMC_RO (0x1) +;CHECKSYM-NEXT: StabInfoIndex: 0x0 +;CHECKSYM-NEXT: StabSectNum: 0x0 +;CHECKSYM-NEXT: } +;CHECKSYM-NEXT: }