<div dir="ltr">Hi Sanjay,<div><br></div><div>Our internal random builders have found a failing testcase that bisects to this commit. Could you please take a look?</div><div><br></div><div>To reproduce: opt -instcombine test.ll -disable-output</div><div>opt: /work/llvm-test/slave2/continuous/build/llvm/include/llvm/Support/Casting.h:237: typename cast_retty<X, Y *>::ret_type llvm::cast(Y *) [X = llvm::ConstantInt, Y = llvm::Constant]: Assertion `isa<X>(Val) && "cast<Ty>() argument of incompatible type!"' failed.<br></div><div><br></div><div>The testcase is available at <a href="http://llvm.org/pr27756">http://llvm.org/pr27756</a> .</div><div><br></div><div>Cheers,</div><div><br></div><div>James</div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, 13 May 2016 at 16:16 Sanjay Patel via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: spatel<br>
Date: Fri May 13 10:10:46 2016<br>
New Revision: 269426<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269426&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=269426&view=rev</a><br>
Log:<br>
[InstCombine] canonicalize* LE/GE vector integer comparisons to LT/GT (PR26701, PR26819)<br>
<br>
*We don't currently handle the edge case constants (min/max values), so it's not a complete<br>
canonicalization.<br>
<br>
To fully solve the motivating bugs, we need to enhance this to recognize a zero vector<br>
too because that's a ConstantAggregateZero which is a ConstantData, not a ConstantVector<br>
or a ConstantDataVector.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D17859" rel="noreferrer" target="_blank">http://reviews.llvm.org/D17859</a><br>
<br>
<br>
<br>
Added:<br>
llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp<br>
llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=269426&r1=269425&r2=269426&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=269426&r1=269425&r2=269426&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Fri May 13 10:10:46 2016<br>
@@ -3125,11 +3125,64 @@ static ICmpInst *canonicalizeCmpWithCons<br>
assert(!Op1C->isMinValue(true)); // A >=s MIN -> TRUE<br>
return new ICmpInst(ICmpInst::ICMP_SGT, Op0, Builder.getInt(Op1Val - 1));<br>
default:<br>
- break;<br>
+ return nullptr;<br>
}<br>
}<br>
<br>
- // TODO: Handle vectors.<br>
+ // The usual vector types are ConstantDataVector. Exotic vector types are<br>
+ // ConstantVector. They both derive from Constant.<br>
+ if (isa<ConstantDataVector>(Op1) || isa<ConstantVector>(Op1)) {<br>
+ Constant *Op1C = cast<Constant>(Op1);<br>
+ Type *Op1Type = Op1->getType();<br>
+ unsigned NumElts = Op1Type->getVectorNumElements();<br>
+<br>
+ // Set the new comparison predicate and splat a vector of 1 or -1 to<br>
+ // increment or decrement the vector constants. But first, check that no<br>
+ // elements of the constant vector would overflow/underflow when we<br>
+ // increment/decrement the constants.<br>
+ //<br>
+ // TODO? If the edge cases for vectors were guaranteed to be handled as they<br>
+ // are for scalar, we could remove the min/max checks here. However, to do<br>
+ // that, we would have to use insertelement/shufflevector to replace edge<br>
+ // values.<br>
+<br>
+ CmpInst::Predicate NewPred;<br>
+ Constant *OneOrNegOne = nullptr;<br>
+ switch (I.getPredicate()) {<br>
+ case ICmpInst::ICMP_ULE:<br>
+ for (unsigned i = 0; i != NumElts; ++i)<br>
+ if (cast<ConstantInt>(Op1C->getAggregateElement(i))->isMaxValue(false))<br>
+ return nullptr;<br>
+ NewPred = ICmpInst::ICMP_ULT;<br>
+ OneOrNegOne = ConstantInt::get(Op1Type, 1);<br>
+ break;<br>
+ case ICmpInst::ICMP_SLE:<br>
+ for (unsigned i = 0; i != NumElts; ++i)<br>
+ if (cast<ConstantInt>(Op1C->getAggregateElement(i))->isMaxValue(true))<br>
+ return nullptr;<br>
+ NewPred = ICmpInst::ICMP_SLT;<br>
+ OneOrNegOne = ConstantInt::get(Op1Type, 1);<br>
+ break;<br>
+ case ICmpInst::ICMP_UGE:<br>
+ for (unsigned i = 0; i != NumElts; ++i)<br>
+ if (cast<ConstantInt>(Op1C->getAggregateElement(i))->isMinValue(false))<br>
+ return nullptr;<br>
+ NewPred = ICmpInst::ICMP_UGT;<br>
+ OneOrNegOne = ConstantInt::get(Op1Type, -1);<br>
+ break;<br>
+ case ICmpInst::ICMP_SGE:<br>
+ for (unsigned i = 0; i != NumElts; ++i)<br>
+ if (cast<ConstantInt>(Op1C->getAggregateElement(i))->isMinValue(true))<br>
+ return nullptr;<br>
+ NewPred = ICmpInst::ICMP_SGT;<br>
+ OneOrNegOne = ConstantInt::get(Op1Type, -1);<br>
+ break;<br>
+ default:<br>
+ return nullptr;<br>
+ }<br>
+<br>
+ return new ICmpInst(NewPred, Op0, ConstantExpr::getAdd(Op1C, OneOrNegOne));<br>
+ }<br>
<br>
return nullptr;<br>
}<br>
<br>
Added: llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll?rev=269426&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll?rev=269426&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll (added)<br>
+++ llvm/trunk/test/Transforms/InstCombine/icmp-vec.ll Fri May 13 10:10:46 2016<br>
@@ -0,0 +1,124 @@<br>
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py<br>
+; RUN: opt < %s -instcombine -S | FileCheck %s<br>
+<br>
+; Canonicalize vector ge/le comparisons with constants to gt/lt.<br>
+<br>
+; Normal types are ConstantDataVectors. Test the constant values adjacent to the<br>
+; min/max values that we're not allowed to transform.<br>
+<br>
+define <2 x i1> @sge(<2 x i8> %x) {<br>
+; CHECK-LABEL: @sge(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt <2 x i8> %x, <i8 -128, i8 126><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sge <2 x i8> %x, <i8 -127, i8 -129><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @uge(<2 x i8> %x) {<br>
+; CHECK-LABEL: @uge(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp ugt <2 x i8> %x, <i8 -2, i8 0><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp uge <2 x i8> %x, <i8 -1, i8 1><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @sle(<2 x i8> %x) {<br>
+; CHECK-LABEL: @sle(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt <2 x i8> %x, <i8 127, i8 -127><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sle <2 x i8> %x, <i8 126, i8 128><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @ule(<2 x i8> %x) {<br>
+; CHECK-LABEL: @ule(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp ult <2 x i8> %x, <i8 -1, i8 1><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp ule <2 x i8> %x, <i8 254, i8 0><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+; Weird types are ConstantVectors, not ConstantDataVectors. For an i3 type:<br>
+; Signed min = -4<br>
+; Unsigned min = 0<br>
+; Signed max = 3<br>
+; Unsigned max = 7<br>
+<br>
+define <3 x i1> @sge_weird(<3 x i3> %x) {<br>
+; CHECK-LABEL: @sge_weird(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt <3 x i3> %x, <i3 -4, i3 2, i3 -1><br>
+; CHECK-NEXT: ret <3 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sge <3 x i3> %x, <i3 -3, i3 -5, i3 0><br>
+ ret <3 x i1> %cmp<br>
+}<br>
+<br>
+define <3 x i1> @uge_weird(<3 x i3> %x) {<br>
+; CHECK-LABEL: @uge_weird(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp ugt <3 x i3> %x, <i3 -2, i3 0, i3 1><br>
+; CHECK-NEXT: ret <3 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp uge <3 x i3> %x, <i3 -1, i3 1, i3 2><br>
+ ret <3 x i1> %cmp<br>
+}<br>
+<br>
+define <3 x i1> @sle_weird(<3 x i3> %x) {<br>
+; CHECK-LABEL: @sle_weird(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt <3 x i3> %x, <i3 3, i3 -3, i3 1><br>
+; CHECK-NEXT: ret <3 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sle <3 x i3> %x, <i3 2, i3 4, i3 0><br>
+ ret <3 x i1> %cmp<br>
+}<br>
+<br>
+define <3 x i1> @ule_weird(<3 x i3> %x) {<br>
+; CHECK-LABEL: @ule_weird(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp ult <3 x i3> %x, <i3 -1, i3 1, i3 2><br>
+; CHECK-NEXT: ret <3 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp ule <3 x i3> %x, <i3 6, i3 0, i3 1><br>
+ ret <3 x i1> %cmp<br>
+}<br>
+<br>
+; We can't do the transform if any constants are already at the limits.<br>
+<br>
+define <2 x i1> @sge_min(<2 x i3> %x) {<br>
+; CHECK-LABEL: @sge_min(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp sge <2 x i3> %x, <i3 -4, i3 1><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sge <2 x i3> %x, <i3 -4, i3 1><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @uge_min(<2 x i3> %x) {<br>
+; CHECK-LABEL: @uge_min(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp uge <2 x i3> %x, <i3 1, i3 0><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp uge <2 x i3> %x, <i3 1, i3 0><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @sle_max(<2 x i3> %x) {<br>
+; CHECK-LABEL: @sle_max(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp sle <2 x i3> %x, <i3 1, i3 3><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp sle <2 x i3> %x, <i3 1, i3 3><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
+define <2 x i1> @ule_max(<2 x i3> %x) {<br>
+; CHECK-LABEL: @ule_max(<br>
+; CHECK-NEXT: [[CMP:%.*]] = icmp ule <2 x i3> %x, <i3 -1, i3 1><br>
+; CHECK-NEXT: ret <2 x i1> [[CMP]]<br>
+;<br>
+ %cmp = icmp ule <2 x i3> %x, <i3 7, i3 1><br>
+ ret <2 x i1> %cmp<br>
+}<br>
+<br>
<br>
Modified: llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll?rev=269426&r1=269425&r2=269426&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll?rev=269426&r1=269425&r2=269426&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll (original)<br>
+++ llvm/trunk/test/Transforms/LoopVectorize/if-conversion.ll Fri May 13 10:10:46 2016<br>
@@ -73,7 +73,7 @@ for.end:<br>
;CHECK-LABEL: @reduction_func(<br>
;CHECK: load <4 x i32><br>
;CHECK: add <4 x i32><br>
-;CHECK: icmp sle <4 x i32><br>
+;CHECK: icmp slt <4 x i32><br>
;CHECK: select <4 x i1><br>
;CHECK: ret i32<br>
define i32 @reduction_func(i32* nocapture %A, i32 %n) nounwind uwtable readonly ssp {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>