From 488fd4e6255d6216f2a678d9ac6a184f4e449695 Mon Sep 17 00:00:00 2001 From: Strahinja Petrovic Date: Mon, 17 Sep 2018 11:03:40 +0000 Subject: [PATCH] [PowerPC] Fix label address calculation for ppc64 This patch fixes calculating address of label for non-pic ppc64. Differential Revision: https://reviews.llvm.org/D50965 llvm-svn: 342368 --- llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 3 ++- llvm/test/CodeGen/PowerPC/ppc-label2.ll | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 llvm/test/CodeGen/PowerPC/ppc-label2.ll diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index 5dee7b1..dba69a1 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -2705,7 +2705,8 @@ SDValue PPCTargetLowering::LowerBlockAddress(SDValue Op, // 64-bit SVR4 ABI code is always position-independent. // The actual BlockAddress is stored in the TOC. - if (Subtarget.isSVR4ABI() && isPositionIndependent()) { + if (Subtarget.isSVR4ABI() && + (Subtarget.isPPC64() || isPositionIndependent())) { if (Subtarget.isPPC64()) setUsesTOCBasePtr(DAG); SDValue GA = DAG.getTargetBlockAddress(BA, PtrVT, BASDN->getOffset()); diff --git a/llvm/test/CodeGen/PowerPC/ppc-label2.ll b/llvm/test/CodeGen/PowerPC/ppc-label2.ll new file mode 100644 index 0000000..8c69e4e --- /dev/null +++ b/llvm/test/CodeGen/PowerPC/ppc-label2.ll @@ -0,0 +1,21 @@ +; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=pic | FileCheck --check-prefix=CHECK-PIC32 %s +; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=static | FileCheck --check-prefix=CHECK-STATIC32 %s +; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=pic | FileCheck --check-prefix=CHECK-PPC64 %s +; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=static | FileCheck --check-prefix=CHECK-PPC64 %s + + +define dso_local i64 @foo() { +entry: + br label %__here + +__here: ; preds = %entry + ret i64 ptrtoint (i8* blockaddress(@foo, %__here) to i64) +} + +; CHECK-PIC32: lwz {{r[0-9]+}}, .LC0-.LTOC(r30) +; CHECK-PIC32-NOT: li {{r[0-9]+}}, .Ltmp1-.L1$pb@l +; CHECK-PIC32-NOT: addis 4, 30, .Ltmp1-.L1$pb@ha +; CHECK-STATIC32: li {{r[0-9]+}}, .Ltmp0@l +; CHECK-STATIC32-NEXT: addis {{r[0-9]+}}, {{r[0-9]+}}, .Ltmp0@ha +; CHECK-PPC64: addis r3, r2, .LC0@toc@ha +; CHECK-PPC64-NEXT: ld r3, .LC0@toc@l(r3) \ No newline at end of file -- 2.7.4