[llvm] r299153 - Temporarily revert "[PPC] In PPCBoolRetToInt change the bool value to i64 if the target is ppc64" as it's causing test failures, I've given Carrot a testcase offline.
Eric Christopher via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 30 19:16:55 PDT 2017
Author: echristo
Date: Thu Mar 30 21:16:54 2017
New Revision: 299153
URL: http://llvm.org/viewvc/llvm-project?rev=299153&view=rev
Log:
Temporarily revert "[PPC] In PPCBoolRetToInt change the bool value to i64 if the target is ppc64" as it's causing test failures, I've given Carrot a testcase offline.
This reverts commit r298955.
Removed:
llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest-2.ll
Modified:
llvm/trunk/lib/Target/PowerPC/PPC.h
llvm/trunk/lib/Target/PowerPC/PPCBoolRetToInt.cpp
llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest.ll
Modified: llvm/trunk/lib/Target/PowerPC/PPC.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPC.h?rev=299153&r1=299152&r2=299153&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPC.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPC.h Thu Mar 30 21:16:54 2017
@@ -44,7 +44,7 @@ namespace llvm {
FunctionPass *createPPCQPXLoadSplatPass();
FunctionPass *createPPCISelDag(PPCTargetMachine &TM);
FunctionPass *createPPCTLSDynamicCallPass();
- FunctionPass *createPPCBoolRetToIntPass(PPCTargetMachine *TM);
+ FunctionPass *createPPCBoolRetToIntPass();
FunctionPass *createPPCExpandISELPass();
void LowerPPCMachineInstrToMCInst(const MachineInstr *MI, MCInst &OutMI,
AsmPrinter &AP, bool isDarwin);
Modified: llvm/trunk/lib/Target/PowerPC/PPCBoolRetToInt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCBoolRetToInt.cpp?rev=299153&r1=299152&r2=299153&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCBoolRetToInt.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCBoolRetToInt.cpp Thu Mar 30 21:16:54 2017
@@ -7,15 +7,15 @@
//
//===----------------------------------------------------------------------===//
//
-// This file implements converting i1 values to i32/i64 if they could be more
+// This file implements converting i1 values to i32 if they could be more
// profitably allocated as GPRs rather than CRs. This pass will become totally
// unnecessary if Register Bank Allocation and Global Instruction Selection ever
// go upstream.
//
-// Presently, the pass converts i1 Constants, and Arguments to i32/i64 if the
+// Presently, the pass converts i1 Constants, and Arguments to i32 if the
// transitive closure of their uses includes only PHINodes, CallInsts, and
// ReturnInsts. The rational is that arguments are generally passed and returned
-// in GPRs rather than CRs, so casting them to i32/i64 at the LLVM IR level will
+// in GPRs rather than CRs, so casting them to i32 at the LLVM IR level will
// actually save casts at the Machine Instruction level.
//
// It might be useful to expand this pass to add bit-wise operations to the list
@@ -33,7 +33,6 @@
//===----------------------------------------------------------------------===//
#include "PPC.h"
-#include "PPCTargetMachine.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallVector.h"
@@ -88,19 +87,17 @@ class PPCBoolRetToInt : public FunctionP
return Defs;
}
- // Translate a i1 value to an equivalent i32/i64 value:
- Value *translate(Value *V) {
- Type *IntTy = ST->isPPC64() ? Type::getInt64Ty(V->getContext())
- : Type::getInt32Ty(V->getContext());
-
+ // Translate a i1 value to an equivalent i32 value:
+ static Value *translate(Value *V) {
+ Type *Int32Ty = Type::getInt32Ty(V->getContext());
if (auto *C = dyn_cast<Constant>(V))
- return ConstantExpr::getZExt(C, IntTy);
+ return ConstantExpr::getZExt(C, Int32Ty);
if (auto *P = dyn_cast<PHINode>(V)) {
// Temporarily set the operands to 0. We'll fix this later in
// runOnUse.
- Value *Zero = Constant::getNullValue(IntTy);
+ Value *Zero = Constant::getNullValue(Int32Ty);
PHINode *Q =
- PHINode::Create(IntTy, P->getNumIncomingValues(), P->getName(), P);
+ PHINode::Create(Int32Ty, P->getNumIncomingValues(), P->getName(), P);
for (unsigned i = 0; i < P->getNumOperands(); ++i)
Q->addIncoming(Zero, P->getIncomingBlock(i));
return Q;
@@ -112,7 +109,7 @@ class PPCBoolRetToInt : public FunctionP
auto InstPt =
A ? &*A->getParent()->getEntryBlock().begin() : I->getNextNode();
- return new ZExtInst(V, IntTy, "", InstPt);
+ return new ZExtInst(V, Int32Ty, "", InstPt);
}
typedef SmallPtrSet<const PHINode *, 8> PHINodeSet;
@@ -180,11 +177,7 @@ class PPCBoolRetToInt : public FunctionP
public:
static char ID;
- PPCBoolRetToInt() : FunctionPass(ID), TM(nullptr) {
- initializePPCBoolRetToIntPass(*PassRegistry::getPassRegistry());
- }
-
- PPCBoolRetToInt(TargetMachine *&TM) : FunctionPass(ID), TM(TM) {
+ PPCBoolRetToInt() : FunctionPass(ID) {
initializePPCBoolRetToIntPass(*PassRegistry::getPassRegistry());
}
@@ -192,10 +185,6 @@ class PPCBoolRetToInt : public FunctionP
if (skipFunction(F))
return false;
- if (!TM)
- return false;
- ST = ((PPCTargetMachine*)TM)->getSubtargetImpl(F);
-
PHINodeSet PromotablePHINodes = getPromotablePHINodes(F);
B2IMap Bool2IntMap;
bool Changed = false;
@@ -216,7 +205,7 @@ class PPCBoolRetToInt : public FunctionP
return Changed;
}
- bool runOnUse(Use &U, const PHINodeSet &PromotablePHINodes,
+ static bool runOnUse(Use &U, const PHINodeSet &PromotablePHINodes,
B2IMap &BoolToIntMap) {
auto Defs = findAllDefs(U);
@@ -273,20 +262,13 @@ class PPCBoolRetToInt : public FunctionP
AU.addPreserved<DominatorTreeWrapperPass>();
FunctionPass::getAnalysisUsage(AU);
}
-
-private:
- const PPCSubtarget *ST;
- TargetMachine *TM;
};
} // end anonymous namespace
char PPCBoolRetToInt::ID = 0;
-INITIALIZE_TM_PASS(PPCBoolRetToInt, "bool-ret-to-int",
- "Convert i1 constants to i32/i64 if they are returned",
- false, false)
-
-FunctionPass *llvm::createPPCBoolRetToIntPass(PPCTargetMachine *TM) {
- TargetMachine *pTM = TM;
- return new PPCBoolRetToInt(pTM);
-}
+INITIALIZE_PASS(PPCBoolRetToInt, "bool-ret-to-int",
+ "Convert i1 constants to i32 if they are returned",
+ false, false)
+
+FunctionPass *llvm::createPPCBoolRetToIntPass() { return new PPCBoolRetToInt(); }
Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp?rev=299153&r1=299152&r2=299153&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp Thu Mar 30 21:16:54 2017
@@ -323,7 +323,7 @@ TargetPassConfig *PPCTargetMachine::crea
void PPCPassConfig::addIRPasses() {
if (TM->getOptLevel() != CodeGenOpt::None)
- addPass(createPPCBoolRetToIntPass(&getPPCTargetMachine()));
+ addPass(createPPCBoolRetToIntPass());
addPass(createAtomicExpandPass(&getPPCTargetMachine()));
// For the BG/Q (or if explicitly requested), add explicit data prefetch
Removed: llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest-2.ll?rev=299152&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest-2.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest-2.ll (removed)
@@ -1,20 +0,0 @@
-; RUN: llc -mtriple=powerpc64le-linux-gnu -mcpu=pwr8 < %s | FileCheck %s
-
-; https://bugs.llvm.org/show_bug.cgi?id=32442
-; Don't generate zero extension for the return value.
-; CHECK-NOT: clrldi
-
-define zeroext i1 @foo(i32 signext %i, i32* %p) {
-entry:
- %cmp = icmp eq i32 %i, 0
- br i1 %cmp, label %return, label %if.end
-
-if.end:
- store i32 %i, i32* %p, align 4
- br label %return
-
-return:
- %retval = phi i1 [ true, %if.end ], [ false, %entry ]
- ret i1 %retval
-}
-
Modified: llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest.ll?rev=299153&r1=299152&r2=299153&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/BoolRetToIntTest.ll Thu Mar 30 21:16:54 2017
@@ -31,14 +31,14 @@ for.body:
br i1 %call, label %cleanup.loopexit, label %for.cond
cleanup.loopexit: ; preds = %for.body, %for.cond
-; CHECK: [[PHI:%.+]] = phi i64 [ 1, %for.body ], [ 0, %for.cond ]
+; CHECK: [[PHI:%.+]] = phi i32 [ 1, %for.body ], [ 0, %for.cond ]
%cleanup.dest.slot.0.ph = phi i1 [ true, %for.body ], [ false, %for.cond ]
br label %cleanup
cleanup: ; preds = %cleanup.loopexit, %entry
-; CHECK: = phi i64 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
+; CHECK: = phi i32 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
%cleanup.dest.slot.0 = phi i1 [ false, %entry ], [ %cleanup.dest.slot.0.ph, %cleanup.loopexit ]
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: ret i1 [[REG]]
ret i1 %cleanup.dest.slot.0
}
@@ -78,14 +78,14 @@ for.body:
br i1 %call, label %cleanup.loopexit, label %for.cond
cleanup.loopexit: ; preds = %for.body, %for.cond
-; CHECK: [[PHI:%.+]] = phi i64 [ 1, %for.body ], [ 0, %for.cond ]
+; CHECK: [[PHI:%.+]] = phi i32 [ 1, %for.body ], [ 0, %for.cond ]
%cleanup.dest.slot.0.ph = phi i1 [ true, %for.body ], [ false, %for.cond ]
br label %cleanup
cleanup: ; preds = %cleanup.loopexit, %entry
-; CHECK: = phi i64 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
+; CHECK: = phi i32 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
%cleanup.dest.slot.0 = phi i1 [ false, %entry ], [ %cleanup.dest.slot.0.ph, %cleanup.loopexit ]
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: call void %cont(i1 [[REG]]
tail call void %cont(i1 %cleanup.dest.slot.0)
ret void
@@ -112,17 +112,17 @@ for.body:
br i1 %call, label %cleanup.loopexit, label %for.cond
cleanup.loopexit: ; preds = %for.body, %for.cond
-; CHECK: [[PHI:%.+]] = phi i64 [ 1, %for.body ], [ 0, %for.cond ]
+; CHECK: [[PHI:%.+]] = phi i32 [ 1, %for.body ], [ 0, %for.cond ]
%cleanup.dest.slot.0.ph = phi i1 [ true, %for.body ], [ false, %for.cond ]
br label %cleanup
cleanup: ; preds = %cleanup.loopexit, %entry
-; CHECK: = phi i64 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
+; CHECK: = phi i32 [ 0, %entry ], [ [[PHI]], %cleanup.loopexit ]
%cleanup.dest.slot.0 = phi i1 [ false, %entry ], [ %cleanup.dest.slot.0.ph, %cleanup.loopexit ]
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: call void %cont(i1 [[REG]]
tail call void %cont(i1 %cleanup.dest.slot.0)
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: ret i1 [[REG]]
ret i1 %cleanup.dest.slot.0
}
@@ -136,7 +136,7 @@ foo:
br label %cleanup
cleanup:
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: ret i1 [[REG]]
%result = phi i1 [ false, %foo ], [ %operand, %entry ]
ret i1 %result
@@ -186,7 +186,7 @@ foo:
; CHECK-LABEL: cleanup
cleanup:
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: ret i1 [[REG]]
%result = phi i1 [ %bar, %foo], [ %operand, %entry ]
ret i1 %result
@@ -198,8 +198,8 @@ declare zeroext i1 @return_i1()
define zeroext i1 @call_test() {
; CHECK: [[REG:%.+]] = call i1
%result = call i1 @return_i1()
-; CHECK: [[REG:%.+]] = zext i1 {{%.+}} to i64
-; CHECK: [[REG:%.+]] = trunc i64 {{%.+}} to i1
+; CHECK: [[REG:%.+]] = zext i1 {{%.+}} to i32
+; CHECK: [[REG:%.+]] = trunc i32 {{%.+}} to i1
; CHECK: ret i1 [[REG]]
ret i1 %result
}
More information about the llvm-commits
mailing list