From acc8f2d938dbf00c79c34f4541a5a05662964797 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Tue, 23 Aug 2011 20:11:10 +0000 Subject: [PATCH] Revert "Address Duncan's CR request:" This reverts commit 20a05be15ea5271ab6185b83200fa88263362400. (svn rev 138340) Conflicts: test/Transforms/InstCombine/bitcast.ll git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138366 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Constant.h | 3 --- lib/Analysis/ConstantFolding.cpp | 13 +++++++--- lib/VMCore/Constants.cpp | 24 +++--------------- test/Transforms/InstCombine/bitcast.ll | 34 ++++---------------------- 4 files changed, 17 insertions(+), 57 deletions(-) diff --git a/include/llvm/Constant.h b/include/llvm/Constant.h index 8ae585d48b8..601b37bb64e 100644 --- a/include/llvm/Constant.h +++ b/include/llvm/Constant.h @@ -51,9 +51,6 @@ public: /// isNullValue - Return true if this is the value that would be returned by /// getNullValue. bool isNullValue() const; - /// isAllOnesValue - Return true if this is the value that would be returned by - /// getAllOnesValue. - bool isAllOnesValue() const; /// isNegativeZeroValue - Return true if the value is what would be returned /// by getZeroValueForNegation. diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp index 0eacaf80378..7a8c703040c 100644 --- a/lib/Analysis/ConstantFolding.cpp +++ b/lib/Analysis/ConstantFolding.cpp @@ -45,9 +45,15 @@ using namespace llvm; /// ConstantExpr if unfoldable. static Constant *FoldBitCast(Constant *C, Type *DestTy, const TargetData &TD) { - // Catch the obvious splat cases. - if (C->isNullValue()) return Constant::getNullValue(DestTy); - if (C->isAllOnesValue()) return Constant::getAllOnesValue(DestTy); + + ConstantVector *CV = dyn_cast(C); + IntegerType *IntVTy = dyn_cast(DestTy); + // When casting vectors to scalar integers, catch the + // obvious splat cases. + if (IntVTy && CV) { + if (CV->isNullValue()) return ConstantInt::getNullValue(IntVTy); + if (CV->isAllOnesValue()) return ConstantInt::getAllOnesValue(IntVTy); + } // The code below only handles casts to vectors currently. VectorType *DestVTy = dyn_cast(DestTy); @@ -62,7 +68,6 @@ static Constant *FoldBitCast(Constant *C, Type *DestTy, } // If this is a bitcast from constant vector -> vector, fold it. - ConstantVector *CV = dyn_cast(C); if (CV == 0) return ConstantExpr::getBitCast(C, DestTy); diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index 8b41ab75e25..2f22cda5ba4 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -62,21 +62,6 @@ bool Constant::isNullValue() const { return isa(this) || isa(this); } -bool Constant::isAllOnesValue() const { - // Check for -1 integers - if (const ConstantInt *CI = dyn_cast(this)) - return CI->isAllOnesValue(); - - // +0.0 is null. - if (const ConstantFP *CFP = dyn_cast(this)) - return CFP->getValueAPF().bitcastToAPInt().isAllOnesValue(); - - // Check for constant vectors - if (const ConstantVector *CV = dyn_cast(this)) - return CV->isAllOnesValue(); - - return false; -} // Constructor to create a '0' constant of arbitrary type... Constant *Constant::getNullValue(Type *Ty) { switch (Ty->getTypeID()) { @@ -141,7 +126,7 @@ Constant *Constant::getAllOnesValue(Type *Ty) { SmallVector Elts; VectorType *VTy = cast(Ty); Elts.resize(VTy->getNumElements(), getAllOnesValue(VTy->getElementType())); - assert(Elts[0] && "Invalid AllOnes value!"); + assert(Elts[0] && "Not a vector integer type!"); return cast(ConstantVector::get(Elts)); } @@ -1079,16 +1064,13 @@ bool ConstantVector::isAllOnesValue() const { // Check out first element. const Constant *Elt = getOperand(0); const ConstantInt *CI = dyn_cast(Elt); - const ConstantFP *CF = dyn_cast(Elt); - + if (!CI || !CI->isAllOnesValue()) return false; // Then make sure all remaining elements point to the same value. for (unsigned I = 1, E = getNumOperands(); I < E; ++I) if (getOperand(I) != Elt) return false; - // First value is all-ones. - return (CI && CI->isAllOnesValue()) || - (CF && CF->isAllOnesValue()); + return true; } /// getSplatValue - If this is a splat constant, where all of the diff --git a/test/Transforms/InstCombine/bitcast.ll b/test/Transforms/InstCombine/bitcast.ll index 8f6ae7d8352..3458c7b95b4 100644 --- a/test/Transforms/InstCombine/bitcast.ll +++ b/test/Transforms/InstCombine/bitcast.ll @@ -11,7 +11,7 @@ define i32 @test1(i64 %a) { %t3 = xor <2 x i32> %t1, %t2 %t4 = extractelement <2 x i32> %t3, i32 0 ret i32 %t4 - + ; CHECK: @test1 ; CHECK: ret i32 0 } @@ -30,7 +30,7 @@ define float @test2(<2 x float> %A, <2 x i32> %B) { %add = fadd float %tmp24, %tmp4 ret float %add - + ; CHECK: @test2 ; CHECK-NEXT: %tmp24 = extractelement <2 x float> %A, i32 0 ; CHECK-NEXT: bitcast <2 x i32> %B to <2 x float> @@ -55,7 +55,7 @@ define float @test3(<2 x float> %A, <2 x i64> %B) { %add = fadd float %tmp24, %tmp4 ret float %add - + ; CHECK: @test3 ; CHECK-NEXT: %tmp24 = extractelement <2 x float> %A, i32 1 ; CHECK-NEXT: bitcast <2 x i64> %B to <4 x float> @@ -75,7 +75,7 @@ define <2 x i32> @test4(i32 %A, i32 %B){ ; CHECK: @test4 ; CHECK-NEXT: insertelement <2 x i32> undef, i32 %A, i32 0 ; CHECK-NEXT: insertelement <2 x i32> {{.*}}, i32 %B, i32 1 - ; CHECK-NEXT: ret <2 x i32> + ; CHECK-NEXT: ret <2 x i32> } @@ -92,7 +92,7 @@ define <2 x float> @test5(float %A, float %B) { ; CHECK: @test5 ; CHECK-NEXT: insertelement <2 x float> undef, float %A, i32 0 ; CHECK-NEXT: insertelement <2 x float> {{.*}}, float %B, i32 1 - ; CHECK-NEXT: ret <2 x float> + ; CHECK-NEXT: ret <2 x float> } define <2 x float> @test6(float %A){ @@ -113,27 +113,3 @@ define i64 @ISPC0(i64 %in) { ; CHECK: @ISPC0 ; CHECK: ret i64 0 } - - -define i64 @Vec2(i64 %in) { - %out = and i64 %in, xor (i64 bitcast (<4 x i16> to i64), i64 0) - ret i64 %out -; CHECK: @Vec2 -; CHECK: ret i64 0 -} - -define i64 @All11(i64 %in) { - %out = and i64 %in, xor (i64 bitcast (<2 x float> bitcast (i64 -1 to <2 x float>) to i64), i64 -1) - ret i64 %out -; CHECK: @All11 -; CHECK: ret i64 0 -} - - -define i32 @All111(i32 %in) { - %out = and i32 %in, xor (i32 bitcast (<1 x float> bitcast (i32 -1 to <1 x float>) to i32), i32 -1) - ret i32 %out -; CHECK: @All111 -; CHECK: ret i32 0 -} -