[llvm-branch-commits] [llvm-branch] r168839 - in /llvm/branches/release_32: ./ lib/Transforms/Vectorize/BBVectorize.cpp test/Transforms/BBVectorize/simple.ll

[Hal Finkel]

Author: hfinkel
Date: Wed Nov 28 18:38:51 2012
New Revision: 168839

URL: http://llvm.org/viewvc/llvm-project?rev=168839&view=rev
Log:
Merge in r168765 (BBVectorize bug fix)

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Transforms/Vectorize/BBVectorize.cpp
    llvm/branches/release_32/test/Transforms/BBVectorize/simple.ll

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 28 18:38:51 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167912,167942,167948,167966,168001,168035,168181,168186,168189,168196-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167912,167942,167948,167966,168001,168035,168181,168186,168189,168196-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512,168765

Modified: llvm/branches/release_32/lib/Transforms/Vectorize/BBVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Transforms/Vectorize/BBVectorize.cpp?rev=168839&r1=168838&r2=168839&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Transforms/Vectorize/BBVectorize.cpp (original)
+++ llvm/branches/release_32/lib/Transforms/Vectorize/BBVectorize.cpp Wed Nov 28 18:38:51 2012
@@ -2903,6 +2903,7 @@
         K->mutateType(getVecTypeForPair(L->getType(), H->getType()));
 
       combineMetadata(K, H);
+      K->intersectOptionalDataWith(H);
 
       for (unsigned o = 0; o < NumOperands; ++o)
         K->setOperand(o, ReplacedOperands[o]);

Modified: llvm/branches/release_32/test/Transforms/BBVectorize/simple.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/test/Transforms/BBVectorize/simple.ll?rev=168839&r1=168838&r2=168839&view=diff
==============================================================================
--- llvm/branches/release_32/test/Transforms/BBVectorize/simple.ll (original)
+++ llvm/branches/release_32/test/Transforms/BBVectorize/simple.ll Wed Nov 28 18:38:51 2012
@@ -173,3 +173,27 @@
 ; CHECK: ret double %R
 }
 
+; Basic depth-3 chain (subclass data)
+define i64 @test8(i64 %A1, i64 %A2, i64 %B1, i64 %B2) {
+; CHECK: @test8
+; CHECK: %X1.v.i1.1 = insertelement <2 x i64> undef, i64 %B1, i32 0
+; CHECK: %X1.v.i1.2 = insertelement <2 x i64> %X1.v.i1.1, i64 %B2, i32 1
+; CHECK: %X1.v.i0.1 = insertelement <2 x i64> undef, i64 %A1, i32 0
+; CHECK: %X1.v.i0.2 = insertelement <2 x i64> %X1.v.i0.1, i64 %A2, i32 1
+	%X1 = sub nsw i64 %A1, %B1
+	%X2 = sub i64 %A2, %B2
+; CHECK: %X1 = sub <2 x i64> %X1.v.i0.2, %X1.v.i1.2
+	%Y1 = mul i64 %X1, %A1
+	%Y2 = mul i64 %X2, %A2
+; CHECK: %Y1 = mul <2 x i64> %X1, %X1.v.i0.2
+	%Z1 = add i64 %Y1, %B1
+	%Z2 = add i64 %Y2, %B2
+; CHECK: %Z1 = add <2 x i64> %Y1, %X1.v.i1.2
+	%R  = mul i64 %Z1, %Z2
+; CHECK: %Z1.v.r1 = extractelement <2 x i64> %Z1, i32 0
+; CHECK: %Z1.v.r2 = extractelement <2 x i64> %Z1, i32 1
+; CHECK: %R = mul i64 %Z1.v.r1, %Z1.v.r2
+	ret i64 %R
+; CHECK: ret i64 %R
+}
+