diff options
| author | Nadav Rotem <nrotem@apple.com> | 2013-07-15 22:52:48 +0000 |
|---|---|---|
| committer | Nadav Rotem <nrotem@apple.com> | 2013-07-15 22:52:48 +0000 |
| commit | 1c1d6c166627733e880546387bca5070d8aaa993 (patch) | |
| tree | 5a12c8bbeeb9caa473a744e33c394206b7e64e5d | |
| parent | 3f99ade67a432adf6488a3d56e142675a158b7e9 (diff) | |
| download | bcm5719-llvm-1c1d6c166627733e880546387bca5070d8aaa993.tar.gz bcm5719-llvm-1c1d6c166627733e880546387bca5070d8aaa993.zip | |
PR16628: Fix a bug in the code that merges compares.
Compares return i1 but they compare different types.
llvm-svn: 186359
| -rw-r--r-- | llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/SLPVectorizer/X86/pr16628.ll | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 5449f39fe93..3090aa81f1e 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -703,9 +703,11 @@ void BoUpSLP::buildTree_rec(ArrayRef<Value *> VL, unsigned Depth) { case Instruction::FCmp: { // Check that all of the compares have the same predicate. CmpInst::Predicate P0 = dyn_cast<CmpInst>(VL0)->getPredicate(); + Type *ComparedTy = cast<Instruction>(VL[0])->getOperand(0)->getType(); for (unsigned i = 1, e = VL.size(); i < e; ++i) { CmpInst *Cmp = cast<CmpInst>(VL[i]); - if (Cmp->getPredicate() != P0) { + if (Cmp->getPredicate() != P0 || + Cmp->getOperand(0)->getType() != ComparedTy) { newTreeEntry(VL, false); DEBUG(dbgs() << "SLP: Gathering cmp with different predicate.\n"); return; diff --git a/llvm/test/Transforms/SLPVectorizer/X86/pr16628.ll b/llvm/test/Transforms/SLPVectorizer/X86/pr16628.ll new file mode 100644 index 00000000000..3f9d775eeeb --- /dev/null +++ b/llvm/test/Transforms/SLPVectorizer/X86/pr16628.ll @@ -0,0 +1,27 @@ +; RUN: opt < %s -basicaa -slp-vectorizer -dce -S -mtriple=x86_64-apple-macosx10.8.0 -mcpu=corei7 + +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.9.0" + +@c = common global i32 0, align 4 +@a = common global i16 0, align 2 +@b = common global i16 0, align 2 + +; Function Attrs: nounwind ssp uwtable +define void @f() { +entry: + %call = tail call i32 (...)* @g() + %0 = load i32* @c, align 4 + %lnot = icmp eq i32 %0, 0 + %lnot.ext = zext i1 %lnot to i32 + %1 = load i16* @a, align 2 + %lnot2 = icmp eq i16 %1, 0 + %lnot.ext3 = zext i1 %lnot2 to i32 + %or = or i32 %lnot.ext3, %lnot.ext + %cmp = icmp eq i32 %call, %or + %conv4 = zext i1 %cmp to i16 + store i16 %conv4, i16* @b, align 2 + ret void +} + +declare i32 @g(...) |
