From 01fa7701e6ddaba68ed9e093c9cb637138cc2698 Mon Sep 17 00:00:00 2001 From: Hal Finkel Date: Wed, 3 Dec 2014 00:19:17 +0000 Subject: [PATCH] [PowerPC] Fix readcyclecounter to be custom expanded for all 32-bit targets We need to use the custom expansion of readcyclecounter on all 32-bit targets (even those with 64-bit registers). This should fix the ppc64 buildbot. llvm-svn: 223182 --- llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 8 +++----- llvm/test/CodeGen/PowerPC/ppc32-cyclecounter.ll | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index 3668a87..d913f3b 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -599,12 +599,10 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM) } } - if (Subtarget.has64BitSupport()) { + if (Subtarget.has64BitSupport()) setOperationAction(ISD::PREFETCH, MVT::Other, Legal); - setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, Legal); - } else { - setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, Custom); - } + + setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, isPPC64 ? Legal : Custom); if (!isPPC64) { setOperationAction(ISD::ATOMIC_LOAD, MVT::i64, Expand); diff --git a/llvm/test/CodeGen/PowerPC/ppc32-cyclecounter.ll b/llvm/test/CodeGen/PowerPC/ppc32-cyclecounter.ll index 75d24c3..9e2cd0b 100644 --- a/llvm/test/CodeGen/PowerPC/ppc32-cyclecounter.ll +++ b/llvm/test/CodeGen/PowerPC/ppc32-cyclecounter.ll @@ -1,6 +1,7 @@ target datalayout = "E-m:e-p:32:32-i64:64-n32" target triple = "powerpc" -; RUN: llc < %s | FileCheck %s +; RUN: llc -mcpu=ppc < %s | FileCheck %s +; RUN: llc -mcpu=pwr7 < %s | FileCheck %s define i64 @test1() nounwind { entry: -- 2.7.4