diff options
| author | Nadav Rotem <nrotem@apple.com> | 2013-04-20 22:29:43 +0000 |
|---|---|---|
| committer | Nadav Rotem <nrotem@apple.com> | 2013-04-20 22:29:43 +0000 |
| commit | 4f38e16b89895b795ece58742195d0d95cbd4187 (patch) | |
| tree | 7181103758dc192afc9fe39ab9930046f8b177bb | |
| parent | f7af1987ddcec768d8608d608ce187115510b21d (diff) | |
| download | external_llvm-4f38e16b89895b795ece58742195d0d95cbd4187.zip external_llvm-4f38e16b89895b795ece58742195d0d95cbd4187.tar.gz external_llvm-4f38e16b89895b795ece58742195d0d95cbd4187.tar.bz2 | |
Fix PR15800. Do not try to vectorize vectors and structs.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179960 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Vectorize/SLPVectorizer.cpp | 11 | ||||
| -rw-r--r-- | test/Transforms/SLPVectorizer/X86/vector.ll | 14 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/Transforms/Vectorize/SLPVectorizer.cpp b/lib/Transforms/Vectorize/SLPVectorizer.cpp index 207d607..9a4784f 100644 --- a/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -157,7 +157,8 @@ unsigned SLPVectorizer::collectStores(BasicBlock *BB, BoUpSLP &R) { continue; // Check that the pointer points to scalars. - if (SI->getValueOperand()->getType()->isAggregateType()) + Type *Ty = SI->getValueOperand()->getType(); + if (Ty->isAggregateType() || Ty->isVectorTy()) return 0; // Find the base of the GEP. @@ -180,6 +181,14 @@ bool SLPVectorizer::tryToVectorizePair(Value *A, Value *B, BoUpSLP &R) { bool SLPVectorizer::tryToVectorizeList(ArrayRef<Value *> VL, BoUpSLP &R) { DEBUG(dbgs()<<"SLP: Vectorizing a list of length = " << VL.size() << ".\n"); + + // Check that all of the parts are scalar. + for (int i = 0, e = VL.size(); i < e; ++i) { + Type *Ty = VL[i]->getType(); + if (Ty->isAggregateType() || Ty->isVectorTy()) + return 0; + } + int Cost = R.getTreeCost(VL); int ExtrCost = R.getScalarizationCost(VL); DEBUG(dbgs()<<"SLP: Cost of pair:" << Cost << diff --git a/test/Transforms/SLPVectorizer/X86/vector.ll b/test/Transforms/SLPVectorizer/X86/vector.ll new file mode 100644 index 0000000..02a1897 --- /dev/null +++ b/test/Transforms/SLPVectorizer/X86/vector.ll @@ -0,0 +1,14 @@ +; RUN: opt < %s -slp-vectorizer -S -mtriple=x86_64-apple-macosx10.8.0 -mcpu=corei7-avx | FileCheck %s + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.8.0" + +; Make sure that we are not crashing or changing the code. +;CHECK: test +;CHECK: icmp +;CHECK: ret +define void @test(<4 x i32> %in, <4 x i32> %in2) { + %k = icmp eq <4 x i32> %in, %in2 + ret void +} + |