Revert r255137.

This commit broke apple's internal bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255227 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/InstCombine/InstCombineCasts.cpp b/lib/Transforms/InstCombine/InstCombineCasts.cpp
index 2ce86436411b47fdc9662a9e4ab61a835eea83f8..4afe1bb243ffde2f9f44bcfd1675b19b15c29843 100644 (file)
--- a/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ b/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -1715,42 +1715,6 @@ static Value *optimizeIntegerToVectorInsertions(BitCastInst &CI,
   return Result;
 }
 
   return Result;
 }
 

-/// Given a bitcasted vector fed into an extract element instruction and then
-/// bitcasted again to a scalar type, eliminate at least one bitcast by changing
-/// the vector type of the extractelement instruction.
-/// Example:
-///   bitcast (extractelement (bitcast <2 x float> %X to <2 x i32>), 1) to float
-///    --->
-///   extractelement <2 x float> %X, i32 1
-static Instruction *foldBitCastExtElt(BitCastInst &BitCast, InstCombiner &IC,
-                                      const DataLayout &DL) {
-  Type *DestType = BitCast.getType();
-  if (DestType->isVectorTy())
-    return nullptr;
-
-  // TODO: Create and use a pattern matcher for ExtractElementInst.
-  auto *ExtElt = dyn_cast<ExtractElementInst>(BitCast.getOperand(0));
-  if (!ExtElt || !ExtElt->hasOneUse())
-    return nullptr;
-
-  Value *InnerBitCast = nullptr;
-  if (!match(ExtElt->getOperand(0), m_BitCast(m_Value(InnerBitCast))))
-    return nullptr;
-
-  // If the element type of the vector doesn't match the result type,
-  // bitcast it to a vector type that we can extract from.
-  VectorType *VecType = cast<VectorType>(InnerBitCast->getType());
-  if (VecType->getElementType() != DestType) {
-    unsigned VecWidth = VecType->getPrimitiveSizeInBits();
-    unsigned DestWidth = DestType->getPrimitiveSizeInBits();
-    unsigned NumElts = VecWidth / DestWidth;
-    VecType = VectorType::get(DestType, NumElts);
-    InnerBitCast = IC.Builder->CreateBitCast(InnerBitCast, VecType, "bc");
-  }
-
-  return ExtractElementInst::Create(InnerBitCast, ExtElt->getOperand(1));
-}
-

 static Instruction *foldVecTruncToExtElt(Value *VecInput, Type *DestTy,
                                          unsigned ShiftAmt, InstCombiner &IC,
                                          const DataLayout &DL) {
 static Instruction *foldVecTruncToExtElt(Value *VecInput, Type *DestTy,
                                          unsigned ShiftAmt, InstCombiner &IC,
                                          const DataLayout &DL) {


@@ -1922,9 +1886,6 @@ Instruction *InstCombiner::visitBitCast(BitCastInst &CI) {
     }
   }
 
     }
   }
 

-  if (Instruction *I = foldBitCastExtElt(CI, *this, DL))
-    return I;
-

   if (SrcTy->isPointerTy())
     return commonPointerCastTransforms(CI);
   return commonCastTransforms(CI);
   if (SrcTy->isPointerTy())
     return commonPointerCastTransforms(CI);
   return commonCastTransforms(CI);

diff --git a/test/Transforms/InstCombine/bitcast.ll b/test/Transforms/InstCombine/bitcast.ll
index 5adb7c790fa773a6681cda9d03cedaad9c99fcc1..2a8194e53032af3e17b8ec5c8f605e75064f5ade 100644 (file)
--- a/test/Transforms/InstCombine/bitcast.ll
+++ b/test/Transforms/InstCombine/bitcast.ll
@@ -64,7 +64,7 @@ define float @test3(<2 x float> %A, <2 x i64> %B) {
 ; CHECK-NEXT:  ret float %add
 }
 
 ; CHECK-NEXT:  ret float %add
 }
 

-; Both bitcasts are unnecessary; change the extractelement.
+; TODO: Both bitcasts are unnecessary; change the extractelement.

 
 define float @bitcast_extelt1(<2 x float> %A) {
   %bc1 = bitcast <2 x float> %A to <2 x i32>
 
 define float @bitcast_extelt1(<2 x float> %A) {
   %bc1 = bitcast <2 x float> %A to <2 x i32>


@@ -73,11 +73,13 @@ define float @bitcast_extelt1(<2 x float> %A) {
   ret float %bc2
 
 ; CHECK-LABEL: @bitcast_extelt1(
   ret float %bc2
 
 ; CHECK-LABEL: @bitcast_extelt1(

-; CHECK-NEXT:  %bc2 = extractelement <2 x float> %A, i32 0
+; CHECK-NEXT:  %bc1 = bitcast <2 x float> %A to <2 x i32>
+; CHECK-NEXT:  %ext = extractelement <2 x i32> %bc1, i32 0
+; CHECK-NEXT:  %bc2 = bitcast i32 %ext to float

 ; CHECK-NEXT:  ret float %bc2
 }
 
 ; CHECK-NEXT:  ret float %bc2
 }
 

-; Second bitcast can be folded into the first.
+; TODO: Second bitcast can be folded into the first.

 
 define i64 @bitcast_extelt2(<4 x float> %A) {
   %bc1 = bitcast <4 x float> %A to <2 x double>
 
 define i64 @bitcast_extelt2(<4 x float> %A) {
   %bc1 = bitcast <4 x float> %A to <2 x double>


@@ -86,26 +88,12 @@ define i64 @bitcast_extelt2(<4 x float> %A) {
   ret i64 %bc2
 
 ; CHECK-LABEL: @bitcast_extelt2(
   ret i64 %bc2
 
 ; CHECK-LABEL: @bitcast_extelt2(

-; CHECK-NEXT:  %bc = bitcast <4 x float> %A to <2 x i64>
-; CHECK-NEXT:  %bc2 = extractelement <2 x i64> %bc, i32 1
+; CHECK-NEXT:  %bc1 = bitcast <4 x float> %A to <2 x double>
+; CHECK-NEXT:  %ext = extractelement <2 x double> %bc1, i32 1
+; CHECK-NEXT:  %bc2 = bitcast double %ext to i64

 ; CHECK-NEXT:  ret i64 %bc2
 }
 
 ; CHECK-NEXT:  ret i64 %bc2
 }
 

-; TODO: This should return %A. 
-
-define <2 x i32> @bitcast_extelt3(<2 x i32> %A) {
-  %bc1 = bitcast <2 x i32> %A to <1 x i64>
-  %ext = extractelement <1 x i64> %bc1, i32 0
-  %bc2 = bitcast i64 %ext to <2 x i32>
-  ret <2 x i32> %bc2
-
-; CHECK-LABEL: @bitcast_extelt3(
-; CHECK-NEXT:  %bc1 = bitcast <2 x i32> %A to <1 x i64>
-; CHECK-NEXT:  %ext = extractelement <1 x i64> %bc1, i32 0
-; CHECK-NEXT:  %bc2 = bitcast i64 %ext to <2 x i32>
-; CHECK-NEXT:  ret <2 x i32> %bc2
-}
-

 define <2 x i32> @test4(i32 %A, i32 %B){
   %tmp38 = zext i32 %A to i64
   %tmp32 = zext i32 %B to i64
 define <2 x i32> @test4(i32 %A, i32 %B){
   %tmp38 = zext i32 %A to i64
   %tmp32 = zext i32 %B to i64