From 3e527cd823a4b7aced5e24ce3b2bae69accd86b5 Mon Sep 17 00:00:00 2001 From: Mikael Holmen Date: Mon, 1 Apr 2019 14:06:45 +0000 Subject: [PATCH] Revert "[InstCombine] Handle vector gep with scalar argument in evaluateInDifferentElementOrder" This reverts commit 75216a6dbcfe5fb55039ef06a07e419fa875f4a5. I'll recommit with a better commit message with reference to the phabricator review. llvm-svn: 357387 --- llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp | 9 +-------- llvm/test/Transforms/InstCombine/vec_gep_scalar_arg.ll | 16 ---------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 llvm/test/Transforms/InstCombine/vec_gep_scalar_arg.ll diff --git a/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp b/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp index 665064c..49c29fe 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp @@ -1171,14 +1171,7 @@ static Value *evaluateInDifferentElementOrder(Value *V, ArrayRef Mask) { SmallVector NewOps; bool NeedsRebuild = (Mask.size() != I->getType()->getVectorNumElements()); for (int i = 0, e = I->getNumOperands(); i != e; ++i) { - Value *V; - // Recursively call evaluateInDifferentElementOrder on vector arguments - // as well. E.g. GetElementPtr may have scalar operands even if the - // return value is a vector, so we need to examine the operand type. - if (I->getOperand(i)->getType()->isVectorTy()) - V = evaluateInDifferentElementOrder(I->getOperand(i), Mask); - else - V = I->getOperand(i); + Value *V = evaluateInDifferentElementOrder(I->getOperand(i), Mask); NewOps.push_back(V); NeedsRebuild |= (V != I->getOperand(i)); } diff --git a/llvm/test/Transforms/InstCombine/vec_gep_scalar_arg.ll b/llvm/test/Transforms/InstCombine/vec_gep_scalar_arg.ll deleted file mode 100644 index 33ed7cb..0000000 --- a/llvm/test/Transforms/InstCombine/vec_gep_scalar_arg.ll +++ /dev/null @@ -1,16 +0,0 @@ -; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -instcombine -S < %s | FileCheck %s - -define <4 x i16*> @PR41270([4 x i16]* %x) { -; CHECK-LABEL: @PR41270( -; CHECK-NEXT: [[TMP1:%.*]] = insertelement <4 x [4 x i16]*> undef, [4 x i16]* [[X:%.*]], i32 0 -; CHECK-NEXT: [[TMP2:%.*]] = getelementptr inbounds [4 x i16], <4 x [4 x i16]*> [[TMP1]], i64 0, i64 3 -; CHECK-NEXT: ret <4 x i16*> [[TMP2]] -; - %ins = insertelement <4 x [4 x i16]*> undef, [4 x i16]* %x, i32 0 - %splat = shufflevector <4 x [4 x i16]*> %ins, <4 x [4 x i16]*> undef, <4 x i32> zeroinitializer - %t2 = getelementptr inbounds [4 x i16], <4 x [4 x i16]*> %splat, i32 0, i32 3 - %t3 = extractelement <4 x i16*> %t2, i32 3 - %ins2 = insertelement <4 x i16*> undef, i16* %t3, i32 0 - ret <4 x i16*> %ins2 -} -- 2.7.4