Skip to content

Commit

Permalink
Revert "[XCOFF][AIX] Peephole optimization for toc-data."
Browse files Browse the repository at this point in the history 
This reverts commit 5e28d30.

(cherry picked from commit cef56b9)
  • Loading branch information
@mandlebug @tru
mandlebug authored and tru committed Aug 22, 2023
1 parent 28874fe commit 5bd2c0c
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 119 deletions.
37 changes: 4 additions & 33 deletions llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7633,20 +7633,6 @@ void PPCDAGToDAGISel::PeepholePPC64() {
case PPC::ADDItocL:
Flags = PPCII::MO_TOC_LO;
break;
case PPC::ADDItoc:
case PPC::ADDItoc8:
if (RequiresMod4Offset) {
if (GlobalAddressSDNode *GA =
dyn_cast<GlobalAddressSDNode>(Base.getOperand(0))) {
const GlobalValue *GV = GA->getGlobal();
Align Alignment = GV->getPointerAlignment(CurDAG->getDataLayout());
// XMC_TD global that is underaligned being accessed with a DS form
// instruction.
if (Alignment < 4)
continue;
}
}
break;
}

SDValue ImmOpnd = Base.getOperand(1);
Expand Down Expand Up @@ -7741,27 +7727,12 @@ void PPCDAGToDAGISel::PeepholePPC64() {
}
}

const unsigned BaseOpcode = Base.getMachineOpcode();
// ADDItoc and ADDItoc8 are pseudos used exclusively by AIX small code
// model when a global is defined in the TOC.
const bool OpcodeIsAIXTocData =
BaseOpcode == PPC::ADDItoc || BaseOpcode == PPC::ADDItoc8;

if (FirstOp == 1) // Store
if (OpcodeIsAIXTocData)
(void)CurDAG->UpdateNodeOperands(N, N->getOperand(0),
Base.getOperand(0), Base.getOperand(1),
N->getOperand(3));
else
(void)CurDAG->UpdateNodeOperands(N, N->getOperand(0), ImmOpnd,
Base.getOperand(0), N->getOperand(3));
(void)CurDAG->UpdateNodeOperands(N, N->getOperand(0), ImmOpnd,
Base.getOperand(0), N->getOperand(3));
else // Load
if (OpcodeIsAIXTocData)
(void)CurDAG->UpdateNodeOperands(N, Base.getOperand(0),
Base.getOperand(1), N->getOperand(2));
else
(void)CurDAG->UpdateNodeOperands(N, ImmOpnd, Base.getOperand(0),
N->getOperand(2));
(void)CurDAG->UpdateNodeOperands(N, ImmOpnd, Base.getOperand(0),
N->getOperand(2));

if (UpdateHBase)
(void)CurDAG->UpdateNodeOperands(HBase.getNode(), HBase.getOperand(0),
Expand Down
4 changes: 0 additions & 4 deletions llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ static MCSymbol *GetSymbolFromOperand(const MachineOperand &MO,
Mangler::getNameWithPrefix(Name, MO.getSymbolName(), DL);
} else {
const GlobalValue *GV = MO.getGlobal();
if (const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GV))
if (GVar->hasAttribute("toc-data"))
return TM.getSymbol(GV);

TM.getNameWithPrefix(Name, GV, Mang);
}

Expand Down
69 changes: 31 additions & 38 deletions llvm/test/CodeGen/PowerPC/toc-data-const.ll
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -O0 < %s | FileCheck %s --check-prefixes=CHECK,CHECK32,NOOPT
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -O0 < %s | FileCheck %s --check-prefixes=CHECK,CHECK64,NOOPT

; RUN: llc -mtriple powerpc-ibm-aix-xcoff < %s | FileCheck %s --check-prefixes=CHECK,CHECK32,OPT
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff < %s | FileCheck %s --check-prefixes=CHECK,CHECK64,OPT
; RUN: llc -mtriple powerpc-ibm-aix-xcoff < %s | FileCheck %s --check-prefix CHECK
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff < %s | FileCheck %s --check-prefix CHECK

; RUN: llc -filetype=obj -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s -o %t32.o
; RUN: llvm-readobj %t32.o --syms --relocs | FileCheck %s --check-prefix=OBJ32
Expand All @@ -26,31 +23,27 @@ define ptr @retptr() {

attributes #0 = { "toc-data" }

; CHECK-LABEL: .read:
; NOOPT: la 3, i1[TD](2)
; NOOPT: lwz 3, 0(3)
; OPT: lwz 3, i1[TD](2)
; CHECK: .read:
; CHECK: la 3, i1[TD](2)

; CHECK-LABEL: .retptr:
; CHECK: la 3, i2[TD](2)
; CHECK-NEXT: blr
; CHECK: .retptr:
; CHECK: la 3, i2[TD](2)

; CHECK-DAG: .toc
; CHECK: .extern i1[TD]
; CHECK32: .csect i2[TD],2
; CHECK64: .csect i2[TD],3
; CHECK: .csect i2[TD]

; OBJ32: Relocations [
; OBJ32-NEXT: Section (index: 1) .text {
; OBJ32-NEXT: 0x2 R_TOC i1(1) 0xF
; OBJ32-NEXT: 0x22 R_TOC i2(15) 0xF
; OBJ32-NEXT: 0x26 R_TOC i2(15) 0xF
; OBJ32-NEXT: }
; OBJ32-NEXT: Section (index: 2) .data {
; OBJ32-NEXT: 0x40 R_POS .read(5) 0x1F
; OBJ32-NEXT: 0x44 R_POS TOC(13) 0x1F
; OBJ32-NEXT: 0x4C R_POS .retptr(7) 0x1F
; OBJ32-NEXT: 0x50 R_POS TOC(13) 0x1F
; OBJ32-NEXT: 0x58 R_POS i1(1) 0x1F
; OBJ32-NEXT: 0x44 R_POS .read(5) 0x1F
; OBJ32-NEXT: 0x48 R_POS TOC(13) 0x1F
; OBJ32-NEXT: 0x50 R_POS .retptr(7) 0x1F
; OBJ32-NEXT: 0x54 R_POS TOC(13) 0x1F
; OBJ32-NEXT: 0x5C R_POS i1(1) 0x1F
; OBJ32-NEXT: }
; OBJ32-NEXT: ]

Expand All @@ -77,7 +70,7 @@ attributes #0 = { "toc-data" }
; OBJ32: Symbol {
; OBJ32: Index: 13
; OBJ32-NEXT: Name: TOC
; OBJ32-NEXT: Value (RelocatableAddress): 0x58
; OBJ32-NEXT: Value (RelocatableAddress): 0x5C
; OBJ32-NEXT: Section: .data
; OBJ32-NEXT: Type: 0x0
; OBJ32-NEXT: StorageClass: C_HIDEXT (0x6B)
Expand All @@ -97,7 +90,7 @@ attributes #0 = { "toc-data" }
; OBJ32: Symbol {
; OBJ32: Index: 15
; OBJ32-NEXT: Name: i2
; OBJ32-NEXT: Value (RelocatableAddress): 0x58
; OBJ32-NEXT: Value (RelocatableAddress): 0x5C
; OBJ32-NEXT: Section: .data
; OBJ32-NEXT: Type: 0x0
; OBJ32-NEXT: StorageClass: C_EXT (0x2)
Expand All @@ -118,14 +111,14 @@ attributes #0 = { "toc-data" }
; OBJ64: Relocations [
; OBJ64-NEXT: Section (index: 1) .text {
; OBJ64-NEXT: 0x2 R_TOC i1(1) 0xF
; OBJ64-NEXT: 0x22 R_TOC i2(15) 0xF
; OBJ64-NEXT: 0x26 R_TOC i2(15) 0xF
; OBJ64-NEXT: }
; OBJ64-NEXT: Section (index: 2) .data {
; OBJ64-NEXT: 0x40 R_POS .read(5) 0x3F
; OBJ64-NEXT: 0x48 R_POS TOC(13) 0x3F
; OBJ64-NEXT: 0x58 R_POS .retptr(7) 0x3F
; OBJ64-NEXT: 0x60 R_POS TOC(13) 0x3F
; OBJ64-NEXT: 0x70 R_POS i1(1) 0x3F
; OBJ64-NEXT: 0x48 R_POS .read(5) 0x3F
; OBJ64-NEXT: 0x50 R_POS TOC(13) 0x3F
; OBJ64-NEXT: 0x60 R_POS .retptr(7) 0x3F
; OBJ64-NEXT: 0x68 R_POS TOC(13) 0x3F
; OBJ64-NEXT: 0x78 R_POS i1(1) 0x3F
; OBJ64-NEXT: }
; OBJ64-NEXT: ]

Expand All @@ -151,7 +144,7 @@ attributes #0 = { "toc-data" }
; OBJ64: Symbol {
; OBJ64: Index: 13
; OBJ64-NEXT: Name: TOC
; OBJ64-NEXT: Value (RelocatableAddress): 0x70
; OBJ64-NEXT: Value (RelocatableAddress): 0x78
; OBJ64-NEXT: Section: .data
; OBJ64-NEXT: Type: 0x0
; OBJ64-NEXT: StorageClass: C_HIDEXT (0x6B)
Expand All @@ -170,7 +163,7 @@ attributes #0 = { "toc-data" }
; OBJ64: Symbol {
; OBJ64: Index: 15
; OBJ64-NEXT: Name: i2
; OBJ64-NEXT: Value (RelocatableAddress): 0x70
; OBJ64-NEXT: Value (RelocatableAddress): 0x78
; OBJ64-NEXT: Section: .data
; OBJ64-NEXT: Type: 0x0
; OBJ64-NEXT: StorageClass: C_EXT (0x2)
Expand All @@ -188,15 +181,15 @@ attributes #0 = { "toc-data" }
; OBJ64-NEXT: }

; DIS32: 00000000 <.read>:
; DIS32-NEXT: 0: 80 62 00 00 lwz 3, 0(2)
; DIS32-NEXT: 0: 38 62 00 00 addi 3, 2, 0
; DIS32-NEXT: 00000002: R_TOC i1
; DIS32: 00000020 <.retptr>:
; DIS32-NEXT: 20: 38 62 00 00 addi 3, 2, 0
; DIS32-NEXT: 00000022: R_TOC i2
; DIS32: 00000024 <.retptr>:
; DIS32-NEXT: 24: 38 62 00 00 addi 3, 2, 0
; DIS32-NEXT: 00000026: R_TOC i2

; DIS64: 0000000000000000 <.read>:
; DIS64-NEXT: 0: 80 62 00 00 lwz 3, 0(2)
; DIS64-NEXT: 0: 38 62 00 00 addi 3, 2, 0
; DIS64-NEXT: 0000000000000002: R_TOC i1
; DIS64: 0000000000000020 <.retptr>:
; DIS64-NEXT: 20: 38 62 00 00 addi 3, 2, 0
; DIS64-NEXT: 0000000000000022: R_TOC i2
; DIS64: 0000000000000024 <.retptr>:
; DIS64-NEXT: 24: 38 62 00 00 addi 3, 2, 0
; DIS64-NEXT: 0000000000000026: R_TOC i2
16 changes: 0 additions & 16 deletions llvm/test/CodeGen/PowerPC/toc-data-peephole-aligment.ll
View file

This file was deleted.

54 changes: 26 additions & 28 deletions llvm/test/CodeGen/PowerPC/toc-data.ll
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s \
; RUN: -stop-before=ppc-vsx-copy | FileCheck %s --check-prefixes=CHECK32,OPT32
; RUN: -stop-before=ppc-vsx-copy | FileCheck %s --check-prefix CHECK32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs < %s \
; RUN: -stop-before=ppc-vsx-copy | FileCheck %s --check-prefix CHECK64
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s --check-prefixes=TEST32,ASMOPT32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s --check-prefixes=TEST64,ASMOPT64
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s --check-prefix TEST32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s --check-prefix TEST64

; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s \
; RUN: -stop-before=ppc-vsx-copy -O0 | FileCheck %s --check-prefixes=CHECK32,NOOPT32
; RUN: -stop-before=ppc-vsx-copy -O0 | FileCheck %s --check-prefix CHECK32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs < %s \
; RUN: -stop-before=ppc-vsx-copy -O0 | FileCheck %s --check-prefix CHECK64-NOOPT
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs -O0 < %s | FileCheck %s --check-prefixes=TEST32,ASMNOOPT32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs -O0 < %s | FileCheck %s --check-prefixes=TEST64,ASMNOOPT64
; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs -O0 < %s | FileCheck %s --check-prefix TEST32
; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs -O0 < %s | FileCheck %s --check-prefix TEST64

@i = dso_local global i32 0, align 4 #0
@d = dso_local local_unnamed_addr global double 3.141590e+00, align 8
Expand All @@ -24,27 +24,26 @@ define dso_local void @write_int(i32 signext %in) {
ret void
}
; CHECK32: name: write_int
; NOOPT32: %[[SCRATCH:[0-9]+]]:gprc_and_gprc_nor0 = ADDItoc @i, $r2
; NOOPT32-NEXT: STW %{{[0-9]+}}, 0, killed %[[SCRATCH]] :: (store (s32) into @i)
; OPT32: STW %{{[0-9]+}}, @i, $r2 :: (store (s32) into @i)
; CHECK32: %[[SCRATCH:[0-9]+]]:gprc_and_gprc_nor0 = ADDItoc @i, $r2
; CHECK32-NEXT: STW %{{[0-9]+}}, 0, killed %[[SCRATCH]] :: (store (s32) into @i)

; TEST32: .write_int:
; ASMNOOPT32: la 4, i[TD](2)
; ASMNOOPT32-NEXT: stw 3, 0(4)
; ASMOPT32: stw 3, i[TD](2)
; TEST32: la 4, i[TD](2)
; TEST32-NEXT: stw 3, 0(4)

; CHECK64: name: write_int
; CHECK64: STW8 %{{[0-9]+}}, @i, $x2 :: (store (s32) into @i)
; CHECK64: %[[SCRATCH:[0-9]+]]:g8rc_and_g8rc_nox0 = ADDItoc8 @i, $x2
; CHECK64-NEXT: STW8 %{{[0-9]+}}, 0, killed %[[SCRATCH]] :: (store (s32) into @i)

; CHECK64-NOOPT: name: write_int
; CHECK64-NOOPT: %[[SUBREG:[0-9]+]]:gprc = COPY %{{[0-9]}}.sub_32
; CHECK64-NOOPT: %[[ADDR:[0-9]+]]:g8rc_and_g8rc_nox0 = ADDItoc8 @i, $x2 :: (load (s64) from got)
; CHECK64-NOOPT: STW %[[SUBREG]], 0, killed %[[ADDR]] :: (store (s32) into @i)

; TEST64: .write_int:
; ASMNOOPT64: la 4, i[TD](2)
; ASMNOOPT64-NEXT: stw 3, 0(4)
; ASMOPT64: stw 3, i[TD](2)
; TEST64: la 4, i[TD](2)
; TEST64-NEXT: stw 3, 0(4)


define dso_local i64 @read_ll() {
entry:
Expand Down Expand Up @@ -78,26 +77,25 @@ define dso_local float @read_float() {
ret float %0
}
; CHECK32: name: read_float
; NOOPT32: %[[SCRATCH:[0-9]+]]:gprc_and_gprc_nor0 = ADDItoc @f, $r2
; NOOPT32: %{{[0-9]+}}:f4rc = LFS 0, killed %[[SCRATCH]] :: (dereferenceable load (s32) from @f)
; OPT32: %{{[0-9]+}}:f4rc = LFS @f, $r2 :: (dereferenceable load (s32) from @f)
; CHECK32: %[[SCRATCH:[0-9]+]]:gprc_and_gprc_nor0 = ADDItoc @f, $r2
; CHECK32: %{{[0-9]+}}:f4rc = LFS 0, killed %[[SCRATCH]] :: (dereferenceable load (s32) from @f)

; TEST32: .read_float:
; ASMNOOPT32: la 3, f[TD](2)
; ASMNOOPT32-NEXT: lfs 1, 0(3)
; ASMOPT32: lfs 1, f[TD](2)
; TEST32: .read_float:
; TEST32: la 3, f[TD](2)
; TEST32-NEXT: lfs 1, 0(3)

; CHECK64: name: read_float
; CHECK64: %{{[0-9]+}}:f4rc = LFS @f, $x2 :: (dereferenceable load (s32) from @f)
; CHECK64: %[[SCRATCH:[0-9]+]]:g8rc_and_g8rc_nox0 = ADDItoc8 @f, $x2
; CHECK64: %{{[0-9]+}}:f4rc = LFS 0, killed %[[SCRATCH]] :: (dereferenceable load (s32) from @f)

; CHECK64-NOOPT: name: read_float
; CHECK64-NOOPT: %[[SCRATCH:[0-9]+]]:g8rc_and_g8rc_nox0 = ADDItoc8 @f, $x2
; CHECK64-NOOPT: %{{[0-9]+}}:f4rc = LFS 0, killed %[[SCRATCH]]

; TEST64: .read_float:
; ASMNOOPT64: la 3, f[TD](2)
; ASMNOOPT64-NEXT: lfs 1, 0(3)
; ASMOPT64: lfs 1, f[TD](2)
; TEST64: .read_float:
; TEST64: la 3, f[TD](2)
; TEST64-NEXT: lfs 1, 0(3)


define dso_local void @write_double(double %in) {
entry:
Expand Down

0 comments on commit 5bd2c0c

Please sign in to comment.